diff --git a/res/values/strings.xml b/res/values/strings.xml
index 604575976..2053c81d7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -953,16 +953,12 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="account_settings_description_label">Account name</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_name_label">Your name</string>
-    <!-- On Settings screen, setting option name -->
-    <string name="account_settings_signature_label">Signature</string>
     <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
         for insertion in message body. [CHAR_LIMIT=24]-->
     <string name="account_settings_edit_quick_responses_label">Quick responses</string>
     <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
     <string name="account_settings_edit_quick_responses_summary">
         Edit text that you frequently insert when composing email</string>
-    <!-- On Settings screen, setting option name -->
-    <string name="account_settings_signature_hint">Append text to messages you send</string>
     <!-- On Settings screen, section heading -->
     <string name="account_settings_notifications">Notification settings</string>
     <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 672260340..98b08ec57 100755
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -32,10 +32,9 @@
 
     <EditTextPreference
         android:key="account_signature"
-        android:title="@string/account_settings_signature_label"
-        android:summary="@string/account_settings_signature_hint"
-        android:dialogTitle="@string/account_settings_signature_label"
-        android:inputType="textCapSentences|textMultiLine" />
+        android:title="@string/preferences_signature_title"
+        android:singleLine="false"
+        android:dialogTitle="@string/preferences_signature_dialog_title"  />
 
     <PreferenceScreen
         android:key="account_quick_responses"
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index bea92c82f..baa838f57 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -60,6 +60,7 @@ import com.android.mail.preferences.AccountPreferences;
 import com.android.mail.preferences.FolderPreferences;
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider;
+import com.android.mail.ui.settings.SettingsUtils;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.NotificationUtils;
 
@@ -363,6 +364,8 @@ public class AccountSettingsFragment extends EmailPreferenceFragment
                 signature = "";
             }
             mAccountSignature.setText(signature);
+            SettingsUtils.updatePreferenceSummary(mAccountSignature, signature,
+                    R.string.preferences_signature_summary_not_set);
             preferenceChanged(PREFERENCE_SIGNATURE, signature);
             return false;
         } else if (key.equals(PREFERENCE_NAME)) {
@@ -619,9 +622,13 @@ public class AccountSettingsFragment extends EmailPreferenceFragment
         mAccountName.setText(senderName);
         mAccountName.setOnPreferenceChangeListener(this);
 
+        final String accountSignature = mAccount.getSignature();
         mAccountSignature = (EditTextPreference) findPreference(PREFERENCE_SIGNATURE);
-        mAccountSignature.setText(mAccount.getSignature());
+        mAccountSignature.setText(accountSignature);
         mAccountSignature.setOnPreferenceChangeListener(this);
+        SettingsUtils.updatePreferenceSummary(mAccountSignature, accountSignature,
+                R.string.preferences_signature_summary_not_set);
+
 
         mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
         final String protocol = Account.getProtocol(mContext, mAccount.mId);