diff --git a/res/values/strings.xml b/res/values/strings.xml
index d30c56131..919a686f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -368,6 +368,10 @@ save attachment.</string>
     <!-- Title of the dialog box to show to/cc/bcc of the message.  [CHAR LIMIT=32] -->
     <string name="message_view_message_details_dialog_title">Message Details</string>
 
+    <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+    <string name="message_decode_error">Error while decoding message.</string>
+
     <!-- Title of the EML viewer activity. [CHAR LIMIT=32] -->
     <string name="eml_view_title">Viewing
             <xliff:g id="filename" example="test.eml">%s</xliff:g></string>
@@ -484,6 +488,10 @@ save attachment.</string>
     <string name="account_duplicate_dlg_message_fmt">
         This login is already in use for the account \"<xliff:g id="duplicate">%s</xliff:g>\".
     </string>
+    <!-- String that is displayed as error text for passwords with leading or trailing
+         spaces.  [CHAR LIMIT=none] -->
+    <string name="account_password_spaces_error">This password starts or ends with one or more
+        space characters. Many servers don\'t support passwords with spaces.</string>
 
     <!-- On check-settings screen, this is the initially-displayed message. -->
     <string name="account_setup_check_settings_retr_info_msg">
@@ -638,8 +646,8 @@ save attachment.</string>
     </string>
     <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none]
         -->
-    <string name="account_setup_options_background_attachments_label">Auto-download attachments
-        when connected via Wi-Fi</string>
+    <string name="account_setup_options_background_attachments_label">
+        Automatically download attachments when connected to Wi-Fi</string>
     <!-- Dialog title when "setup" could not finish -->
     <string name="account_setup_failed_dlg_title">Setup could not finish</string>
     <!-- In Account setup options screen, label for email check frequency selector -->
@@ -693,15 +701,16 @@ save attachment.</string>
          for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
     <string name="account_setup_security_required_title">Remote security administration</string>
     <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
-         for device lock PIN, or remote wipe.) and we ask the user permission before continuing. -->
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
     <string name="account_setup_security_policies_required_fmt">
          The server <xliff:g id="server">%s</xliff:g> requires that you allow it to remotely control
-         some security features of your phone.  Do you wish to finish setting up this account?
-         </string>
+         some security features of your Android device.  Do you want to finish setting up this
+         account?</string>
     <!-- Additional diagnostic text when validation failed due to required provisioning not
-         being supported -->
+         being supported [CHAR LIMIT=none] -->
     <string name="account_setup_failed_security_policies_unsupported">
-         This server requires security features your phone does not support.</string>
+         This server requires security features that your Android device does not support.</string>
     <!-- Warning given to users when they request disabling device administration (i.e. that their
          administered accounts will be deleted) [CHAR LIMIT=none] -->
     <string name="disable_admin_warning">WARNING: Deactivating the Email application\'s authority
@@ -716,10 +725,11 @@ save attachment.</string>
     <string name="security_notification_content_title">Update Security Settings</string>
     <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
     <string name="account_security_title">Device Security</string>
-    <!-- Additional diagnostic text when the email app asserts control of the phone. -->
+    <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
     <string name="account_security_policy_explanation_fmt">
          The server <xliff:g id="server">%s</xliff:g> requires that you allow it to remotely control
-         some security features of your phone.</string>
+         some security features of your Android device.</string>
 
     <!-- "Setup could not finish" dialog action button -->
     <string name="account_setup_failed_dlg_edit_details_action">Edit details</string>
@@ -762,7 +772,7 @@ save attachment.</string>
         Auto-download attachments</string>
     <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
     <string name="account_settings_background_attachments_summary">
-        Download files attached to recent messages when connected via Wi-Fi</string>
+        Automatically download attachments when connected to Wi-Fi</string>
     <string name="account_settings_notify_label">Email notifications</string>
     <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
         [CHAR LIMIT=50] -->
@@ -1003,5 +1013,7 @@ save attachment.</string>
     <string name="widget_starred">Starred</string>
     <!-- Shown when waiting for mail data to be loaded into the widget list view [CHAR LIMIT=20] -->
     <string name="widget_loading">Loading\u2026</string>
+    <!-- Shown when no accounts are configured [CHAR LIMIT=35] -->
+    <string name="widget_touch_to_configure">Touch to configure</string>
 
 </resources>