diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java
index 97a6f12..1215155 100755
--- a/emailcommon/src/com/android/emailcommon/provider/Account.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Account.java
@@ -70,7 +70,7 @@
     // Whether or not the user has asked for notifications of new mail in this account
     public final static int FLAGS_NOTIFY_NEW_MAIL = 1<<0;
     // Whether or not the user has asked for vibration notifications with all new mail
-    public final static int FLAGS_VIBRATE_ALWAYS = 1<<1;
+    public final static int FLAGS_VIBRATE = 1<<1;
     // Bit mask for the account's deletion policy (see DELETE_POLICY_x below)
     public static final int FLAGS_DELETE_POLICY_MASK = 1<<2 | 1<<3;
     public static final int FLAGS_DELETE_POLICY_SHIFT = 2;
@@ -82,8 +82,6 @@
     // required by the server; in this state, the user MUST be alerted to the need to update
     // security settings.  Sync adapters SHOULD NOT attempt to sync when this flag is set.
     public static final int FLAGS_SECURITY_HOLD = 1<<5;
-    // Whether or not the user has asked for vibration notifications when the ringer is silent
-    public static final int FLAGS_VIBRATE_WHEN_SILENT = 1<<6;
     // Whether the account supports "smart forward" (i.e. the server appends the original
     // message along with any attachments to the outgoing message)
     public static final int FLAGS_SUPPORTS_SMART_FORWARD = 1<<7;
@@ -373,8 +371,7 @@
     /**
      * @return the flags for this account
      * @see #FLAGS_NOTIFY_NEW_MAIL
-     * @see #FLAGS_VIBRATE_ALWAYS
-     * @see #FLAGS_VIBRATE_WHEN_SILENT
+     * @see #FLAGS_VIBRATE
      */
     public int getFlags() {
         return mFlags;
@@ -383,8 +380,7 @@
     /**
      * Set the flags for this account
      * @see #FLAGS_NOTIFY_NEW_MAIL
-     * @see #FLAGS_VIBRATE_ALWAYS
-     * @see #FLAGS_VIBRATE_WHEN_SILENT
+     * @see #FLAGS_VIBRATE
      * @param newFlags the new value for the flags
      */
     public void setFlags(int newFlags) {
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index f9fe696..add9f53 100755
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -25,6 +25,7 @@
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Binder;
 import android.os.Environment;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -155,6 +156,7 @@
      */
     public static <T extends EmailContent> T restoreContentWithId(Context context,
             Class<T> klass, Uri contentUri, String[] contentProjection, long id) {
+        long token = Binder.clearCallingIdentity();
         Uri u = ContentUris.withAppendedId(contentUri, id);
         Cursor c = context.getContentResolver().query(u, contentProjection, null, null, null);
         if (c == null) throw new ProviderUnavailableException();
@@ -166,6 +168,7 @@
             }
         } finally {
             c.close();
+            Binder.restoreCallingIdentity(token);
         }
     }
 
diff --git a/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java b/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
index 15d1cca..55ae014 100644
--- a/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
+++ b/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
@@ -99,7 +99,7 @@
             KeyManager keyManager =
                     KeyChainKeyManager.fromAlias(context, hostAuth.mClientCertAlias);
             SSLCertificateSocketFactory underlying = SSLUtils.getSSLSocketFactory(
-                    hostAuth.shouldTrustAllServerCerts());
+                    hostAuth.shouldTrustAllServerCerts(), 0 /* no timeout */);
             underlying.setKeyManagers(new KeyManager[] { keyManager });
             registry.register(
                     new Scheme(schemeName, new SSLSocketFactory(underlying), hostAuth.mPort));
diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
index b21c68f..85b77c1 100644
--- a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
+++ b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
@@ -47,19 +47,20 @@
      * Optionally bypass all SSL certificate checks.
      *
      * @param insecure if true, bypass all SSL certificate checks
+     * @param timeout the timeout value in milliseconds or {@code 0} for an infinite timeout.
      */
     public synchronized static SSLCertificateSocketFactory getSSLSocketFactory(
-            boolean insecure) {
+            boolean insecure, int timeout) {
         if (insecure) {
             if (sInsecureFactory == null) {
                 sInsecureFactory = (SSLCertificateSocketFactory)
-                        SSLCertificateSocketFactory.getInsecure(0, null);
+                        SSLCertificateSocketFactory.getInsecure(timeout, null);
             }
             return sInsecureFactory;
         } else {
             if (sSecureFactory == null) {
                 sSecureFactory = (SSLCertificateSocketFactory)
-                        SSLCertificateSocketFactory.getDefault(0, null);
+                        SSLCertificateSocketFactory.getDefault(timeout, null);
             }
             return sSecureFactory;
         }
@@ -70,7 +71,7 @@
      * Apache HTTP stack.
      */
     public static SSLSocketFactory getHttpSocketFactory(boolean insecure, KeyManager keyManager) {
-        SSLCertificateSocketFactory underlying = getSSLSocketFactory(insecure);
+        SSLCertificateSocketFactory underlying = getSSLSocketFactory(insecure, 0 /* no timeout */);
         if (keyManager != null) {
             underlying.setKeyManagers(new KeyManager[] { keyManager });
         }
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index eed5b89..b5cc80e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Sinkroniseeropsies"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk as ongelees"</string>
     <string name="move_action" msgid="3059189775933985898">"Skuif"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Jonger"</string>
+    <string name="older_action" msgid="4504015635360605471">"Ouer"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Voeg Cc/Bcc by"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Heg lêer aan"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkroniseer e-pos"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkroniseer e-pos vir hierdie rekening"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreer"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreer ook wanneer e-pos aankom"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altyd"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Net wanneer stil"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreer"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Kies \'n luitoon"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Bedienerinstellings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Verwyder rekening"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c76dc85..d1bc33a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ኢሜይል አመሳስል"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ለእዚህ መለያ ኢሜይል አስምር"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"ንዘር"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"ኢሜይል ሲደርስ እንዲሁ ንዘር"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ዘወትር"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"ፀጥታ ሲሆን ብቻ"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"በፍፁም"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"ንዘር"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"የደወል ቅላጼ ምረጥ"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"የአገልጋይ ቅንብሮች"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"መለያ አስወግድ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cb41a1e..f914b9d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"مزامنة البريد الإلكتروني"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"مزامنة البريد الإلكتروني لهذا الحساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"اهتزاز"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"الاهتزاز أيضًا عند استلام بريد إلكتروني"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"دومًا"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط عندما يكون صامتًا"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"مطلقًا"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"اهتزاز"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"اختيار نغمة الرنين"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"إعدادات الخادم"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"إزالة الحساب"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c276ad9..ef29e79 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Сінхранізаваць электронную пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Сінхранізацыя электроннай пошты для гэтага ўліковага запісу"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібрацыя"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Таксама вібраваць пры атрыманні электроннага лiста"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Заўсёды"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Толькі ў рэжыме без гуку"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколі"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібрацыя"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Выбраць рынгтон"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Налады сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Выдаліць уліковы запіс"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 549fa8c..a288a25 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхрон на имейлите"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон на имейлите за този профил"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибриране"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Да вибрира и при нов имейл"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Винаги"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само при тих режим"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никога"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибриране"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Избор на мелодия"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки на сървъра"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Премахване на профил"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index eda9ca9..7f048c8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincr. miss. correu d\'aquest compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibra també quan arribi correu electrònic"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Només quan està en silenci"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibra"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Tria un to"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e4dd7c..af23d58 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizovat e-maily"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizovat e-mail pro tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrace"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Při příchodu e-mailu také vibrovat"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Pouze v tichém režimu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrace"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vybrat vyzvánění"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odebrat účet"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index eb23493..0b1a914 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-mails"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-mail for denne konto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også, når der kommer e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun ved lydløs"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vælg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern konto"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 32b1875..fcc668d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -70,7 +70,7 @@
     <item quantity="other" msgid="371256717624461324">"Nachrichten verschieben"</item>
   </plurals>
     <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Verschieben wird für POP3-Konten nicht unterstützt."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Verschieben nicht möglich, da mehrere Konten ausgewählt wurden."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Verschieben nicht möglich, weil mehrere Konten ausgewählt wurden."</string>
     <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Nachrichten im Postausgang und den Ordnern \"Entwürfe\" und \"Gesendet\" können nicht verschoben werden."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -183,7 +183,7 @@
     <string name="attachment_info_wifi_settings" msgid="96432970927503597">"WLAN-Einstellungen"</string>
     <string name="attachment_info_application_settings" msgid="4124655487276125596">"App-Einstellungen"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Anhang kann nicht geöffnet werden."</string>
-    <string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, da diese Art von Anhang möglicherweise schädliche Software enthält."</string>
+    <string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, weil diese Art von Anhang möglicherweise schädliche Software enthält."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"Dieser Anhang kann aufgrund der Sicherheitsrichtlinien dieses Kontos nicht gespeichert oder geöffnet werden."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Dieser Anhang ist zu groß, um ihn über ein Mobilfunknetz herunterzuladen. Sie können ihn herunterladen, sobald Sie das nächste Mal mit einem WLAN-Netzwerk verbunden sind."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Sie verfügen über keine App, mit der Sie diesen Anhang öffnen können. Laden Sie eine entsprechende App von Android Market herunter."</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-Mails synchr."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Immer"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Nur im Lautlos-Modus"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nie"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Klingelton auswählen"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servereinstellungen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto entfernen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b4ad068..74e74ae 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Δόνηση"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Δόνηση και κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Πάντα"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Μόνο στο αθόρυβο"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ποτέ"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Δόνηση"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Επιλέξτε ήχο κλήσης"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ρυθμίσεις διακομιστή"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Κατάργηση λογαριασμού"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 49f5442..d254454 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sync Email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sync email for this account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Also vibrate when email arrives"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Always"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Only when silent"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Never"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrate"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Choose ringtone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Server settings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remove account"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f8d855f..60ef315 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -53,8 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
-    <string name="newer_action" msgid="8950909456802330593">"Más nuevo"</string>
-    <string name="older_action" msgid="4504015635360605471">"Más ant."</string>
+    <string name="newer_action" msgid="8950909456802330593">"Nuevos"</string>
+    <string name="older_action" msgid="4504015635360605471">"Antiguos"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Agregar CC/CCO"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencioso"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 11dd9f2..1121964 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un mensaje"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencio"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibración"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ajustes del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f4523ba..2e01766 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sünkrooni meil"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Konto meili sünkroonimine"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreering"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreeri ka meilisõnumi saabumisel"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alati"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Ainult hääletus režiimis"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mitte kunagi"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vali helin"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serveri seaded"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto eemaldamine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 40f0f77..beecdb8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -185,7 +185,7 @@
     <string name="attachment_info_unknown" msgid="8342655396805943320">"پیوست باز نمی‌شود."</string>
     <string name="attachment_info_malware" msgid="6576029010855055528">"شما نمی‌توانید این فایل را ذخیره یا باز کنید زیرا این نوع پیوست ممکن است حاوی نرم‌افزار مخرب باشد."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"به دلیل خط‌مشی‌های امنیتی، این حساب را نمی‌توان ذخیره یا باز کرد."</string>
-    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"این پیوست برای دانلود از طریق شبکه تلفن همراه خیلی بزرگ است. می‌توانید دفعه دیگر که به یک شبکه Wi-Fi متصل می‌شوید، آنرا دانلود کنید."</string>
+    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"این پیوست برای دانلود از طریق شبکهٔ تلفن همراه خیلی بزرگ است. می‌توانید دفعه دیگر که به یک شبکه Wi-Fi متصل می‌شوید، آنرا دانلود کنید."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"هیچ برنامه نصب شده‌ای برای باز کردن این پیوست وجود ندارد. یک برنامه مناسب از Android Market نصب کنید."</string>
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"این پیوست یک برنامه است. باید قبل از نصب آن، منبع‌های ناشناس را در تنظیمات &gt; برنامه‌ها بررسی کنید."</string>
     <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"نمی‌توان برنامه‎ها را به طور مستقیم از ایمیل نصب کرد. ابتدا این برنامه را ذخیره کنید و سپس آنرا با استفاده از برنامه \"دانلودها\" نصب کنید."</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"همگام‌سازی ایمیل"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"همگام‌سازی ایمیل برای این حساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"لرزش"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"همچنین لرزش هنگام دریافت ایمیل"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"همیشه"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط هنگام ساکت بودن"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"هرگز"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"لرزش"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"انتخاب آهنگ زنگ"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"تنظیمات سرور"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"حذف حساب"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e0244cc..8130638 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronoi sähköposti"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronoi tämän tilin sähköpostit"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Käytä värinää, kun sähköpostiviesti saapuu"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Aina"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Vain äänettömässä tilassa"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ei koskaan"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Värinä"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Valitse soittoääni"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Palvelinasetukset"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Poista tili"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 543f03f..83e9e2d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. messagerie"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchroniser les e-mails pour ce compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreur"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer à la réception d\'un e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Toujours"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"En mode silencieux"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jamais"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreur"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Sélectionner une sonnerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 03acd70..faf4429 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"समन्वयन विकल्‍प"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"बिना पढ़ी के रूप में चिह्नित करें"</string>
     <string name="move_action" msgid="3059189775933985898">"ले जाएं"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"नया"</string>
+    <string name="older_action" msgid="4504015635360605471">"पुराना"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bcc जोड़ें"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc जोड़ें"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्‍न करें"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ईमेल समन्‍वयित करें"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"इस खाते के लिए ईमेल सिंक करें"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"कंपन"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"जब ईमेल आए, तो कंपन भी करें"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"हमेशा"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"केवल मौन होने पर"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"कभी नहीं"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"कंपन"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"रिंगटोन चुनें"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"सर्वर सेटिंग"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"खाता निकालें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 42a3e99..5c15db6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sink. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sink. e-pošte za ovaj račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibracija i kad stigne e-pošta"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Uvijek"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo ako je bešumno"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikad"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibracija"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Odaberite melodiju zvona"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Postavke poslužitelja"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ukloni račun"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5a77070..536081b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkroniz."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"A fiók e-mailjeinek szinkronizálása"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Rezgés e-mail érkezésekor is"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Mindig"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Csak néma üzemmódban"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Soha"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rezgés"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Válasszon csengőhangot"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Szerverbeállítások"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fiók törlése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a0aeeb2..876a64b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkronkan email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronkan email untuk akun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar ketika email tiba"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Selalu"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Hanya saat senyap"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Tidak pernah"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Setelan server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hapus akun"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6dad0c1..78c7952 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizza email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizza le email per questo account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrazione"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Attiva anche vibrazione all\'arrivo di email"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo in modalità silenziosa"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrazione"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Scegli suoneria"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Impostazioni server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Rimuovi account"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c9f1a52..4993d8e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"סנכרן דוא\"ל"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"סנכרן דוא\"ל בחשבון זה"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"רטט"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"הוסף גם רטט כשמגיע דוא\"ל"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"תמיד"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"במצב שקט בלבד"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"אף פעם"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"רטט"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"בחר רינגטון"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"הגדרות שרת"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"הסר חשבון"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ff80379..558ca89 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"メールを同期する"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"このアカウントのメールを同期"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"バイブレーション"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"メール受信: バイブレーションON"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"常に使用"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"マナーモード時のみ"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"使用しない"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"バイブレーション"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"着信音を選択"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"サーバー設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"アカウントを削除"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ed96d4c..302f19e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"이메일 동기화"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"이 계정의 이메일을 동기화합니다."</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"진동"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"이메일이 오면 진동도 함께 울림"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"항상"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"무음 시에만"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"안함"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"진동"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"벨소리 선택"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"서버 설정"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"계정 삭제"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c12e7e7..b2a0599 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinchron. el. paštą"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinchron. šios paskyros el. paštą"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Taip pat vibruoti, kai gaunamas el. laiškas"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Visada"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tik kai veikia tyliai"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niekada"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibruoti"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pasirinkti skambėjimo toną"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverio nustatymai"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Pašalinti paskyrą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 92e0f48..843453d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhronizēt e-pastu"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhronizēt e-pastu šim kontam"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Izmantot vibrozvanu, kad tiek saņemts e-pasta ziņojums"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vienmēr"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tikai klusuma režīmā"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nekad"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrozvans"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Izvēlēties zvana signālu"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servera iestatījumi"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konta noņemšana"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e9ee2de..effce35 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Segerakkan e-mel"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Segerakkan e-mel untuk akaun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar semasa e-mel diterima"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sentiasa"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apabila senyap sahaja"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jangan sekali-kali"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Tetapan pelayan"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alih keluar akaun"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 44941d2..d157c64 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-postmeldinger fra denne kontoen"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrering"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også når nye e-postmeldinger mottas"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun i stillemodus"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldri"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Velg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Innstillinger for tjener"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b7996b9..94b50de 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail synch."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-mail voor dit account synchroniseren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Trillen"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Ook trillen wanneer er e-mail binnenkomt"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altijd"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Alleen indien stil"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Trillen"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Beltoon kiezen"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Account verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c484fbf..9f1ce15 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opcje synchronizacji"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczytane"</string>
     <string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Nowsze"</string>
+    <string name="older_action" msgid="4504015635360605471">"Starsze"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ DW/UDW"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj DW/UDW"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizuj e-maile"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizuj wiadomości e-mail dla tego konta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Wibracje"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Wibracje także po otrzymaniu e-maila"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Zawsze"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tylko po wyciszeniu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nigdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Wibracje"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Wybierz dzwonek"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ustawienia serwera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Usuń konto"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index afc508b..b16c53d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chega e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando está em silêncio"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Escolher toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e6c7814..bf28ec3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chegar e-mails"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando estiver no silencioso"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Selecionar toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 428d07c..84a7d99 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -558,11 +558,6 @@
     <skip />
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Era vibrar sch\'in e-mail arriva"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Adina"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Mo sche silenzius"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <!-- no translation found for account_settings_ringtone (8229878374785575207) -->
     <skip />
     <string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 107c1a3..b3307de 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opţiuni de sincronizare"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
     <string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Mai noi"</string>
+    <string name="older_action" msgid="4504015635360605471">"Mai vechi"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adăugaţi Cc/Bcc"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincroniz. e-mailul"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincron. e-mail pt. acest cont"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrare şi la sosirea mesajelor de e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Întotdeauna"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Numai când profilul este Silenţios"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niciodată"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrare"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Alegeţi un ton de sonerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Setări server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminaţi contul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5072dad..17c7eec 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхр. почту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизировать почту этого аккаунта"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибросигнал"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибросигнал при получении сообщения"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Всегда"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Только в режиме без звука"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никогда"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибросигнал"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Выбрать рингтон"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 06abbd9..3d321ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrovať aj pri príchode e-mailu"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Iba v tichom režime"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrovať"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť vyzváňací tón"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e986652..2f9542d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhroniz. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhroniziraj e-pošto za ta račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibriraj tudi, ko prejmem e-pošto"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vedno"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo v tihem načinu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikoli"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibriranje"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Izberite melodijo zvonjenja"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavitve strežnika"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrani račun"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e60095f..70e9124 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхронизуј е-пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизуј е-пошту за овај налог"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибрација"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибрирај и када стигне порука е-поште"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Увек"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само у нечујном режиму"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никад"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибрација"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Изабери мелодију звона"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Подешавања сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Уклони налог"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f755b38..3aef2c4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronisera e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronisera e-post för det här kontot"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrera"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrerar även vid inkommande e-post"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Bara vid tyst"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrera"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Välj ringsignal"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinställningar"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ta bort konto"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6515cc0..896d20a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Pia tetema barua pepe inapofika"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Kila wakati"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kukiwa kimya tu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Katu"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Tetema"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chagua toni ya mlio"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Mipangilio ya seva"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ondoa akaunti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d9d659b..0b6e1e7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ซิงค์อีเมล"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ซิงค์อีเมลสำหรับบัญชีนี้"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"สั่น"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"สั่นเมื่อมีอีเมลเข้า"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"เฉพาะเมื่อปิดเสียง"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่ต้องเลย"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"สั่น"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"เลือกเสียงเรียกเข้า"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"ลบบัญชี"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6a1ec3b..47766ec 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"I-sync ang email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"I-sync ang email sa account na ito"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"I-vibrate rin kapag dumating ang email"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Palagi"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kapag tahimik lang"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hindi kailanman"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"I-vibrate"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pumili ng ringtone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Mga setting ng server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alisin ang account"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8d75772..6a575bd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-postayı senk. et"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Bu hesaba ilişkin e-postaları senkronize et"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Titreşim"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"E-posta geldiğinde aynı zamanda titret"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Her zaman"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Yalnızca sessizken"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hiçbir zaman"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Titreşim"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zil sesi seçin"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Sunucu ayarları"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hesabı kaldır"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f2973e7..a35be39 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Параметри синхронізації"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
     <string name="move_action" msgid="3059189775933985898">"Переміст."</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Новіші"</string>
+    <string name="older_action" msgid="4504015635360605471">"Старіші"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+Копія/прихована"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копія/прихов. копія"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхроніз. ел.пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон. ел. пошту для обл. запису"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібросигнал"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Також вібрув., коли надійде лист"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Завжди"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Лише в беззвуч. реж."</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколи"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібросигнал"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Вибрати сигнал дзвінка"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Налашт-ня сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Видал. обл. зап."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8ae405e..1e778bb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Tùy chọn đồng bộ hóa"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
     <string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Mới hơn"</string>
+    <string name="older_action" msgid="4504015635360605471">"Cũ hơn"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Thêm Cc/Bcc"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Đồng bộ hóa email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Đồng bộ hóa email cho tài khoản này"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Cũng rung khi email đến"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Luôn luôn"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Chỉ khi ở chế độ im lặng"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Chưa bao giờ"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rung"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chọn nhạc chuông"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xóa tài khoản"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1417747..053fd32 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -53,8 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"同步选项"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
     <string name="move_action" msgid="3059189775933985898">"移动"</string>
-    <string name="newer_action" msgid="8950909456802330593">"更晚"</string>
-    <string name="older_action" msgid="4504015635360605471">"更早"</string>
+    <string name="newer_action" msgid="8950909456802330593">"后一封邮件"</string>
+    <string name="older_action" msgid="4504015635360605471">"前一封邮件"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+抄送/密送"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"添加抄送/密送地址"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步电子邮件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户的电子邮件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"振动"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到电子邮件时也振动"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"始终"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"仅在静音时"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永不"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"振动"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"删除帐户"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bc693f9..32bb0b6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"同步處理選項"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
     <string name="move_action" msgid="3059189775933985898">"移動"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"較新"</string>
+    <string name="older_action" msgid="4504015635360605471">"較舊"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"新增副本/密件副本"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"新增副本/密件副本"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步處理電子郵件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步處理此帳戶的電子郵件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"震動"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到電子郵件時震動提醒"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"一律"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"靜音時才啟用"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永遠不要"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"震動"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"選擇鈴聲"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"伺服器設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"移除帳戶"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2fbd9df..cff871e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Vumelanisa i-imeyli"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Iyadlidliza futhi lapho i-imeyli ifika"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Njalo"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kuphela uma ithulile"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Akusoze"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Dlidliza"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Khetha ithoni yokukhala"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo Zeseva"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Khipha i-akhawunti"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c881e6e..33a1928 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -109,23 +109,6 @@
         <item>6</item>
     </string-array>
 
-    <!-- The vibrate notification modes -->
-    <string-array name="account_settings_vibrate_when_entries">
-        <!-- Always -->
-        <item>@string/account_settings_vibrate_when_always</item>
-        <!-- Only when the phone is in Silent mode -->
-        <item>@string/account_settings_vibrate_when_silent</item>
-        <!-- Never -->
-        <item>@string/account_settings_vibrate_when_never</item>
-    </string-array>
-
-    <!-- The vibrate notification values -->
-    <string-array translatable="false" name="account_settings_vibrate_when_values">
-        <item>always</item>
-        <item>silent</item>
-        <item>never</item>
-    </string-array>
-
     <!-- Auto-advance options (DO NOT change the order.  Code assumes this order)-->
     <string-array name="general_preference_auto_advance_entries">
         <!-- Move to newer -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 74280a4..c39ee4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -988,17 +988,6 @@
 
     <!-- On Settings screen, vibrate pop-up menu label -->
     <string name="account_settings_vibrate_when_label">Vibrate</string>
-    <!-- On Settings screen, vibrate pop-up menu summary text -->
-    <string name="account_settings_vibrate_when_summary">Also vibrate when email arrives</string>
-    <!-- On Settings screen, vibrate pop-up menu option "always" text -->
-    <string name="account_settings_vibrate_when_always">Always</string>
-    <!-- On Settings screen, vibrate pop-up menu option "silent" text -->
-    <string name="account_settings_vibrate_when_silent">Only when silent</string>
-    <!-- On Settings screen, vibrate pop-up menu option "never" text -->
-    <string name="account_settings_vibrate_when_never">Never</string>
-
-    <!-- Dialog title for the Vibrate dialog -->
-    <string name="account_settings_vibrate_when_dlg_title">Vibrate</string>
 
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_ringtone">Choose ringtone</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 009924e..3156219 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -138,6 +138,11 @@
         <item name="android:layout_height">match_parent</item>
     </style>
 
+    <style name="subject_action_bar_title_text" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+        <item name="android:textColor">#323232</item>
+        <item name="android:textSize">16dp</item>
+    </style>
+
     <style name="message_view_text">
         <item name="android:textSize">14dip</item>
         <item name="android:textColor">@color/text_secondary_color</item>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 7b6fa9b..66a71f3 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -107,16 +107,11 @@
             android:ringtoneType="notification"
             android:defaultValue="content://settings/system/notification_sound" />
 
-        <ListPreference
-            android:key="account_settings_vibrate_when"
-            android:layout="?android:attr/preferenceLayoutChild"
+        <CheckBoxPreference
+            android:key="account_settings_vibrate"
             android:dependency="account_notify"
-            android:defaultValue="never"
-            android:title="@string/account_settings_vibrate_when_label"
-            android:summary="@string/account_settings_vibrate_when_summary"
-            android:entries="@array/account_settings_vibrate_when_entries"
-            android:entryValues="@array/account_settings_vibrate_when_values"
-            android:dialogTitle="@string/account_settings_vibrate_when_dlg_title" />
+            android:defaultValue="false"
+            android:title="@string/account_settings_vibrate_when_label" />
 
     </PreferenceCategory>
 
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 073e1a4..529d721 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -463,7 +463,7 @@
             intent = Welcome.createOpenAccountInboxIntent(mContext, accountId);
         } else {
             intent = Welcome.createOpenMessageIntent(
-                    mContext, accountId, mailboxId, newestMessageId, false);
+                    mContext, accountId, mailboxId, newestMessageId);
         }
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK |
                 Intent.FLAG_ACTIVITY_TASK_ON_HOME);
@@ -668,16 +668,14 @@
     void setupSoundAndVibration(Notification.Builder builder, Account account) {
         final int flags = account.mFlags;
         final String ringtoneUri = account.mRingtoneUri;
-        final boolean vibrate = (flags & Account.FLAGS_VIBRATE_ALWAYS) != 0;
-        final boolean vibrateWhenSilent = (flags & Account.FLAGS_VIBRATE_WHEN_SILENT) != 0;
-        final boolean isRingerSilent = getRingerMode() != AudioManager.RINGER_MODE_NORMAL;
+        final boolean vibrate = (flags & Account.FLAGS_VIBRATE) != 0;
 
         int defaults = Notification.DEFAULT_LIGHTS;
-        if (vibrate || (vibrateWhenSilent && isRingerSilent)) {
+        if (vibrate) {
             defaults |= Notification.DEFAULT_VIBRATE;
         }
 
-        builder.setSound((ringtoneUri == null) ? null : Uri.parse(ringtoneUri))
+        builder.setSound(TextUtils.isEmpty(ringtoneUri) ? null : Uri.parse(ringtoneUri))
             .setDefaults(defaults);
     }
 
diff --git a/src/com/android/email/activity/ActionBarController.java b/src/com/android/email/activity/ActionBarController.java
index 4a5df7c..adb1b1b 100644
--- a/src/com/android/email/activity/ActionBarController.java
+++ b/src/com/android/email/activity/ActionBarController.java
@@ -24,7 +24,10 @@
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -62,6 +65,13 @@
     private static final int LOADER_ID_ACCOUNT_LIST
             = EmailActivity.ACTION_BAR_CONTROLLER_LOADER_ID_BASE + 0;
 
+    private static final int DISPLAY_TITLE_MULTIPLE_LINES = 0x20;
+    private static final int ACTION_BAR_MASK =
+            ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM
+                    | ActionBar.DISPLAY_SHOW_TITLE | DISPLAY_TITLE_MULTIPLE_LINES;
+    private static final int CUSTOM_ACTION_BAR_OPTIONS =
+            ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM;
+
     private final Context mContext;
     private final LoaderManager mLoaderManager;
     private final ActionBar mActionBar;
@@ -194,6 +204,8 @@
          * Called when the search box is closed.
          */
         public void onSearchExit();
+
+        public void onUpPressed();
     }
 
     public ActionBarController(Context context, LoaderManager loaderManager,
@@ -208,7 +220,7 @@
         mAccountsSelectorAdapter = new AccountSelectorAdapter(mContext);
 
         // Configure action bar.
-        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM);
+        enterCustomActionBarMode();
 
         // Prepare the custom view
         mActionBar.setCustomView(R.layout.action_bar_custom_view);
@@ -235,6 +247,16 @@
                 }
             }
         });
+        // this other click listener handles clicks that ought to be aliased to "up"
+        // only one or the other listener should be active at any time
+        mActionBarCustomView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallback.onUpPressed();
+            }
+        });
+        // pick a sane default. later enabled in updateTitle().
+        mActionBarCustomView.setClickable(false);
     }
 
     private void initSearchViews() {
@@ -410,6 +432,7 @@
     private void updateTitle() {
         mAccountsSelectorAdapter.swapCursor(mCursor);
 
+        enterCustomActionBarMode();
         if (mCursor == null) {
             // Initial load not finished.
             mActionBarCustomView.setVisibility(View.GONE);
@@ -449,19 +472,27 @@
         UiUtilities.setVisibilitySafe(mSearchContainer, View.GONE);
 
         if (mTitleMode == Callback.TITLE_MODE_MESSAGE_SUBJECT) {
-            mAccountSpinnerLine1View.setSingleLine(false);
-            mAccountSpinnerLine1View.setMaxLines(2);
-            mAccountSpinnerLine1View.setText(mCallback.getMessageSubject());
-            mAccountSpinnerLine2View.setVisibility(View.GONE);
-
-            mAccountSpinnerCountView.setVisibility(View.GONE);
-
+            // Use two line title action bar mode
+            enterMultiLineTitleActionBarMode();
+            String subject = mCallback.getMessageSubject();
+            if (subject == null) {
+                subject = "";
+            }
+            final SpannableString title = new SpannableString(subject);
+            final SpannableStringBuilder builder = new SpannableStringBuilder();
+            title.setSpan(new TextAppearanceSpan(mContext, R.style.subject_action_bar_title_text),
+                    0, subject.length(), 0);
+            builder.append(title);
+            mActionBar.setTitle(builder);
+            mActionBar.setSubtitle(null);
+        } else if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_ALL_FOLDERS_LABEL) {
+            enterSingleLineTitleActionBarMode();
+            mActionBar.setTitle(mAllFoldersLabel);
+            mActionBar.setSubtitle(mCursor.getAccountDisplayName());
         } else {
             // Get mailbox name
             final String mailboxName;
-            if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_ALL_FOLDERS_LABEL) {
-                mailboxName = mAllFoldersLabel;
-            } else if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_MAILBOX) {
+            if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_MAILBOX) {
                 mailboxName = mCursor.getMailboxDisplayName();
             } else {
                 mailboxName = null;
@@ -490,16 +521,31 @@
         boolean spinnerEnabled =
             ((mTitleMode & TITLE_MODE_SPINNER_ENABLED) != 0) && mCursor.shouldEnableSpinner();
 
-
         setSpinnerEnabled(spinnerEnabled);
     }
 
+    private void enterCustomActionBarMode() {
+        mActionBar.setDisplayOptions(CUSTOM_ACTION_BAR_OPTIONS, ACTION_BAR_MASK);
+    }
+
+    private void enterMultiLineTitleActionBarMode() {
+        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE
+                | DISPLAY_TITLE_MULTIPLE_LINES, ACTION_BAR_MASK);
+    }
+
+    private void enterSingleLineTitleActionBarMode() {
+        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE,
+                ACTION_BAR_MASK);
+    }
+
     private void setSpinnerEnabled(boolean enabled) {
         if (enabled == mAccountSpinner.isEnabled()) {
             return;
         }
 
         mAccountSpinner.setEnabled(enabled);
+        mAccountSpinner.setClickable(enabled);
+        mActionBarCustomView.setClickable(!enabled);
         if (enabled) {
             mAccountSpinner.setBackgroundDrawable(mAccountSpinnerDefaultBackground);
         } else {
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index ebb3abd..f823b4b 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -57,7 +57,6 @@
     public static final String EXTRA_ACCOUNT_ID = "ACCOUNT_ID";
     public static final String EXTRA_MAILBOX_ID = "MAILBOX_ID";
     public static final String EXTRA_MESSAGE_ID = "MESSAGE_ID";
-    public static final String EXTRA_FROM_KEYGUARD = "FROM_KEYGUARD";
     public static final String EXTRA_QUERY_STRING = "QUERY_STRING";
 
     /** Loader IDs starting with this is safe to use from UIControllers. */
@@ -85,12 +84,10 @@
      *
      * @param accountId If -1, default account will be used.
      */
-    public static Intent createOpenAccountIntent(Activity fromActivity, long accountId,
-            boolean fromKeyguard) {
+    public static Intent createOpenAccountIntent(Activity fromActivity, long accountId) {
         Intent i = IntentUtilities.createRestartAppIntent(fromActivity, EmailActivity.class);
         if (accountId != -1) {
             i.putExtra(EXTRA_ACCOUNT_ID, accountId);
-            i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
         }
         return i;
     }
@@ -103,14 +100,13 @@
      * {@link Mailbox#QUERY_ALL_INBOXES}) don't work.
      */
     public static Intent createOpenMailboxIntent(Activity fromActivity, long accountId,
-            long mailboxId, boolean fromKeyguard) {
+            long mailboxId) {
         if (accountId == -1 || mailboxId == -1) {
             throw new IllegalArgumentException();
         }
         Intent i = IntentUtilities.createRestartAppIntent(fromActivity, EmailActivity.class);
         i.putExtra(EXTRA_ACCOUNT_ID, accountId);
         i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
-        i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
         return i;
     }
 
@@ -123,7 +119,7 @@
      * @param messageId must not be -1.
      */
     public static Intent createOpenMessageIntent(Activity fromActivity, long accountId,
-            long mailboxId, long messageId, boolean fromKeyguard) {
+            long mailboxId, long messageId) {
         if (accountId == -1 || mailboxId == -1 || messageId == -1) {
             throw new IllegalArgumentException();
         }
@@ -131,7 +127,6 @@
         i.putExtra(EXTRA_ACCOUNT_ID, accountId);
         i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
         i.putExtra(EXTRA_MESSAGE_ID, messageId);
-        i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
         return i;
     }
 
@@ -194,16 +189,6 @@
 
         super.onCreate(savedInstanceState);
         ActivityHelper.debugSetWindowFlags(this);
-
-        final Intent intent = getIntent();
-        boolean fromKeyguard = intent.getBooleanExtra(EXTRA_FROM_KEYGUARD, false);
-        if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
-            Log.d(Logging.LOG_TAG, "FLAG_DISMISS_KEYGUARD " + fromKeyguard);
-        }
-        if (fromKeyguard) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-        }
-
         setContentView(mUIController.getLayoutId());
 
         mUIController.onActivityViewReady();
@@ -224,6 +209,7 @@
         if (savedInstanceState != null) {
             mUIController.onRestoreInstanceState(savedInstanceState);
         } else {
+            final Intent intent = getIntent();
             final MessageListContext viewContext = MessageListContext.forIntent(this, intent);
             if (viewContext == null) {
                 // This might happen if accounts were deleted on another thread, and there aren't
@@ -329,16 +315,6 @@
         }
     }
 
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
-            Log.d(Logging.LOG_TAG, "FLAG_DISMISS_KEYGUARD onWindowFocusChanged " + hasFocus);
-        }
-        if (hasFocus) {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-        }
-    }
-
     /**
      * Force dismiss the error banner.
      */
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 0ac7301..1d51e3a 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -371,7 +371,9 @@
 
     private void setAccount(Account account) {
         if (account == null) {
-            throw new IllegalArgumentException();
+            Utility.showToast(this, R.string.widget_no_accounts);
+            Log.d(Logging.LOG_TAG, "The account has been deleted, force finish it");
+            finish();
         }
         mAccount = account;
         mFromView.setText(account.mEmailAddress);
diff --git a/src/com/android/email/activity/ShortcutPicker.java b/src/com/android/email/activity/ShortcutPicker.java
index d80ecf1..94d6f05 100644
--- a/src/com/android/email/activity/ShortcutPicker.java
+++ b/src/com/android/email/activity/ShortcutPicker.java
@@ -143,7 +143,7 @@
             // TODO if we add meta-mailboxes/accounts to the database, remove this special case
             if (account.mId == Account.ACCOUNT_ID_COMBINED_VIEW) {
                 shortcutIntent = Welcome.createOpenMessageIntent(
-                        myActivity, account.mId, mailboxId, Message.NO_MESSAGE, false);
+                        myActivity, account.mId, mailboxId, Message.NO_MESSAGE);
             } else {
                 String uuid = account.mCompatibilityUuid;
                 shortcutIntent = Welcome.createAccountShortcutIntent(myActivity, uuid, mailboxId);
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 2ce9357..05f8e53 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -253,6 +253,11 @@
         public void onSearchExit() {
             UIControllerOnePane.this.onSearchExit();
         }
+
+        @Override
+        public void onUpPressed() {
+            onBackPressed(false);
+        }
     }
 
     public UIControllerOnePane(EmailActivity activity) {
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index b73229f..58914e7 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -739,5 +739,10 @@
         public void onSearchExit() {
             UIControllerTwoPane.this.onSearchExit();
         }
+
+        @Override
+        public void onUpPressed() {
+            onBackPressed(false);
+        }
     }
 }
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index a2a0fa1..062ca22 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -86,7 +86,7 @@
      */
     private static final String EXTRA_DEBUG_PANE_MODE = "DEBUG_PANE_MODE";
 
-    private static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
+    public static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
 
     private final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
 
@@ -95,7 +95,6 @@
     private long mAccountId;
     private long mMailboxId;
     private long mMessageId;
-    private boolean mFromKeyguard;
     private String mAccountUuid;
 
     private MailboxFinder mInboxFinder;
@@ -125,15 +124,13 @@
      * Create an Intent to open a message.
      */
     public static Intent createOpenMessageIntent(Context context, long accountId,
-            long mailboxId, long messageId, boolean fromKeyguard) {
+            long mailboxId, long messageId) {
         final Uri.Builder b = IntentUtilities.createActivityIntentUrlBuilder(
                 VIEW_MAILBOX_INTENT_URL_PATH);
         IntentUtilities.setAccountId(b, accountId);
         IntentUtilities.setMailboxId(b, mailboxId);
         IntentUtilities.setMessageId(b, messageId);
-        Intent i = IntentUtilities.createRestartAppIntent(b.build());
-        i.putExtra(EmailActivity.EXTRA_FROM_KEYGUARD, fromKeyguard);
-        return i;
+        return IntentUtilities.createRestartAppIntent(b.build());
     }
 
     /**
@@ -192,7 +189,6 @@
         mAccountId = IntentUtilities.getAccountIdFromIntent(intent);
         mMailboxId = IntentUtilities.getMailboxIdFromIntent(intent);
         mMessageId = IntentUtilities.getMessageIdFromIntent(intent);
-        mFromKeyguard = intent.getBooleanExtra(EmailActivity.EXTRA_FROM_KEYGUARD, false);
         mAccountUuid = IntentUtilities.getAccountUuidFromIntent(intent);
         UiUtilities.setDebugPaneMode(getDebugPaneMode(intent));
 
@@ -380,12 +376,11 @@
     private void startEmailActivity() {
         final Intent i;
         if (mMessageId != Message.NO_MESSAGE) {
-            i = EmailActivity.createOpenMessageIntent(this, mAccountId, mMailboxId, mMessageId,
-                mFromKeyguard);
+            i = EmailActivity.createOpenMessageIntent(this, mAccountId, mMailboxId, mMessageId);
         } else if (mMailboxId != Mailbox.NO_MAILBOX) {
-            i = EmailActivity.createOpenMailboxIntent(this, mAccountId, mMailboxId, mFromKeyguard);
+            i = EmailActivity.createOpenMailboxIntent(this, mAccountId, mMailboxId);
         } else {
-            i = EmailActivity.createOpenAccountIntent(this, mAccountId, mFromKeyguard);
+            i = EmailActivity.createOpenAccountIntent(this, mAccountId);
         }
         startActivity(i);
         finish();
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 7e19076..02ef74c 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -78,7 +78,8 @@
     private static final String PREFERENCE_CATEGORY_DATA_USAGE = "data_usage";
     private static final String PREFERENCE_CATEGORY_NOTIFICATIONS = "account_notifications";
     private static final String PREFERENCE_NOTIFY = "account_notify";
-    private static final String PREFERENCE_VIBRATE_WHEN = "account_settings_vibrate_when";
+    private static final String PREFERENCE_VIBRATE = "account_settings_vibrate";
+    private static final String PREFERENCE_VIBRATE_OLD = "account_settings_vibrate_when";
     private static final String PREFERENCE_RINGTONE = "account_ringtone";
     private static final String PREFERENCE_CATEGORY_SERVER = "account_servers";
     private static final String PREFERENCE_INCOMING = "incoming";
@@ -88,11 +89,6 @@
     private static final String PREFERENCE_SYNC_EMAIL = "account_sync_email";
     private static final String PREFERENCE_DELETE_ACCOUNT = "delete_account";
 
-    // These strings must match account_settings_vibrate_when_* strings in strings.xml
-    private static final String PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS = "always";
-    private static final String PREFERENCE_VALUE_VIBRATE_WHEN_SILENT = "silent";
-    private static final String PREFERENCE_VALUE_VIBRATE_WHEN_NEVER = "never";
-
     private EditTextPreference mAccountDescription;
     private EditTextPreference mAccountName;
     private EditTextPreference mAccountSignature;
@@ -101,7 +97,7 @@
     private CheckBoxPreference mAccountBackgroundAttachments;
     private CheckBoxPreference mAccountDefault;
     private CheckBoxPreference mAccountNotify;
-    private ListPreference mAccountVibrateWhen;
+    private CheckBoxPreference mAccountVibrate;
     private RingtonePreference mAccountRingtone;
     private CheckBoxPreference mSyncContacts;
     private CheckBoxPreference mSyncCalendar;
@@ -175,6 +171,8 @@
         }
         super.onCreate(savedInstanceState);
 
+        upgradeVibrateSetting();
+
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.account_settings_preferences);
 
@@ -192,6 +190,20 @@
         mAccountDirty = false;
     }
 
+    /**
+     * Upgrades the old tri-state vibrate setting to the new boolean value.
+     */
+    private void upgradeVibrateSetting() {
+        final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences();
+
+        if (!sharedPreferences.contains(PREFERENCE_VIBRATE)) {
+            // Try to migrate the old one
+            final boolean vibrate =
+                    "always".equals(sharedPreferences.getString(PREFERENCE_VIBRATE_OLD, ""));
+            sharedPreferences.edit().putBoolean(PREFERENCE_VIBRATE, vibrate);
+        }
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
@@ -502,33 +514,21 @@
         prefs.edit().putString(PREFERENCE_RINGTONE, mAccount.getRingtone()).apply();
 
         // Set the vibrator value, or hide it on devices w/o a vibrator
-        mAccountVibrateWhen = (ListPreference) findPreference(PREFERENCE_VIBRATE_WHEN);
+        mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
         Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
         if (vibrator.hasVibrator()) {
             // Calculate the value to set based on the choices, and set the value.
-            final boolean vibrateAlways = 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE_ALWAYS);
-            final boolean vibrateWhenSilent =
-                    0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE_WHEN_SILENT);
-            final String vibrateSetting =
-                    vibrateAlways ? PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS :
-                        vibrateWhenSilent ? PREFERENCE_VALUE_VIBRATE_WHEN_SILENT :
-                            PREFERENCE_VALUE_VIBRATE_WHEN_NEVER;
-            mAccountVibrateWhen.setValue(vibrateSetting);
+            final boolean vibrate = 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE);
+            mAccountVibrate.setChecked(vibrate);
 
-            // Update the summary string.
-            final int index = mAccountVibrateWhen.findIndexOfValue(vibrateSetting);
-            mAccountVibrateWhen.setSummary(mAccountVibrateWhen.getEntries()[index]);
-
-            // When the value is changed, update the summary in addition to the setting.
-            mAccountVibrateWhen.setOnPreferenceChangeListener(
+            // When the value is changed, update the setting.
+            mAccountVibrate.setOnPreferenceChangeListener(
                     new Preference.OnPreferenceChangeListener() {
                         @Override
                         public boolean onPreferenceChange(Preference preference, Object newValue) {
-                            final String vibrateSetting = newValue.toString();
-                            final int index = mAccountVibrateWhen.findIndexOfValue(vibrateSetting);
-                            mAccountVibrateWhen.setSummary(mAccountVibrateWhen.getEntries()[index]);
-                            mAccountVibrateWhen.setValue(vibrateSetting);
-                            onPreferenceChanged(PREFERENCE_VIBRATE_WHEN, newValue);
+                            final boolean vibrateSetting = (Boolean) newValue;
+                            mAccountVibrate.setChecked(vibrateSetting);
+                            onPreferenceChanged(PREFERENCE_VIBRATE, newValue);
                             return false;
                         }
                     });
@@ -536,7 +536,7 @@
             // No vibrator present. Remove the preference altogether.
             PreferenceCategory notificationsCategory = (PreferenceCategory)
                     findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS);
-            notificationsCategory.removePreference(mAccountVibrateWhen);
+            notificationsCategory.removePreference(mAccountVibrate);
         }
 
         findPreference(PREFERENCE_INCOMING).setOnPreferenceClickListener(
@@ -639,7 +639,7 @@
         // Turn off all controlled flags - will turn them back on while checking UI elements
         int newFlags = mAccount.getFlags() &
                 ~(Account.FLAGS_NOTIFY_NEW_MAIL |
-                        Account.FLAGS_VIBRATE_ALWAYS | Account.FLAGS_VIBRATE_WHEN_SILENT |
+                        Account.FLAGS_VIBRATE |
                         Account.FLAGS_BACKGROUND_ATTACHMENTS);
 
         newFlags |= mAccountBackgroundAttachments.isChecked() ?
@@ -655,10 +655,8 @@
         if (mSyncWindow != null) {
             mAccount.setSyncLookback(Integer.parseInt(mSyncWindow.getValue()));
         }
-        if (mAccountVibrateWhen.getValue().equals(PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS)) {
-            newFlags |= Account.FLAGS_VIBRATE_ALWAYS;
-        } else if (mAccountVibrateWhen.getValue().equals(PREFERENCE_VALUE_VIBRATE_WHEN_SILENT)) {
-            newFlags |= Account.FLAGS_VIBRATE_WHEN_SILENT;
+        if (mAccountVibrate.isChecked()) {
+            newFlags |= Account.FLAGS_VIBRATE;
         }
         SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
         mAccount.setRingtone(prefs.getString(PREFERENCE_RINGTONE, null));
diff --git a/src/com/android/email/mail/transport/MailTransport.java b/src/com/android/email/mail/transport/MailTransport.java
index 751be50..3f4d7bc 100644
--- a/src/com/android/email/mail/transport/MailTransport.java
+++ b/src/com/android/email/mail/transport/MailTransport.java
@@ -167,7 +167,8 @@
         try {
             SocketAddress socketAddress = new InetSocketAddress(getHost(), getPort());
             if (canTrySslSecurity()) {
-                mSocket = SSLUtils.getSSLSocketFactory(canTrustAllCertificates()).createSocket();
+                mSocket = SSLUtils.getSSLSocketFactory(
+                        canTrustAllCertificates(), SOCKET_CONNECT_TIMEOUT).createSocket();
             } else {
                 mSocket = new Socket();
             }
@@ -203,8 +204,9 @@
     @Override
     public void reopenTls() throws MessagingException {
         try {
-            mSocket = SSLUtils.getSSLSocketFactory(canTrustAllCertificates())
-                    .createSocket(mSocket, getHost(), getPort(), true);
+            mSocket =
+                    SSLUtils.getSSLSocketFactory(canTrustAllCertificates(), SOCKET_CONNECT_TIMEOUT)
+                            .createSocket(mSocket, getHost(), getPort(), true);
             mSocket.setSoTimeout(SOCKET_READ_TIMEOUT);
             mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
             mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
@@ -281,20 +283,34 @@
      */
     @Override
     public void close() {
+        if (Email.DEBUG) {
+            Log.d(Logging.LOG_TAG, "*** " + mDebugLabel + " close " +
+                    getHost() + ":" + String.valueOf(getPort()));
+        }
+
         try {
             mIn.close();
         } catch (Exception e) {
             // May fail if the connection is already closed.
+            if (Email.DEBUG) {
+                Log.d(Logging.LOG_TAG, e.toString());
+            }
         }
         try {
             mOut.close();
         } catch (Exception e) {
             // May fail if the connection is already closed.
+            if (Email.DEBUG) {
+                Log.d(Logging.LOG_TAG, e.toString());
+            }
         }
         try {
             mSocket.close();
         } catch (Exception e) {
             // May fail if the connection is already closed.
+            if (Email.DEBUG) {
+                Log.d(Logging.LOG_TAG, e.toString());
+            }
         }
         mIn = null;
         mOut = null;
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 0f6731b..7ac09c7 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -110,10 +110,6 @@
 
         @Override
         public int onStartCommand(Intent intent, int flags, int startId) {
-            if (intent.getData() != null) {
-                // EmailWidget creates intents, so it knows how to handle them.
-                EmailWidget.processIntent(this, intent);
-            }
             return Service.START_NOT_STICKY;
         }
 
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index 4856305..49cfb96 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -221,57 +221,26 @@
      * @param baseUri the base uri for the command
      * @param args any arguments to the command
      */
-    private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String ... args) {
-        Intent intent = new Intent();
-        Builder builder = baseUri.buildUpon();
-        for (String arg: args) {
-            builder.appendPath(arg);
+    private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String messageId,
+            String mailboxId) {
+        Intent intent = null;
+        try {
+            intent = getOpenMessageIntent(mContext, Long.parseLong(messageId),
+                Long.parseLong(mailboxId));
+        } catch (NumberFormatException e) {
+            if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
+                Log.d(TAG, "#setFillInIntent(); invalid messageId: " + messageId +
+                    " or mailboxId: " + mailboxId);
+            }
         }
-        intent.setDataAndType(builder.build(), WIDGET_DATA_MIME_TYPE);
         views.setOnClickFillInIntent(viewId, intent);
     }
 
-    /**
-     * Called back by {@link com.android.email.provider.WidgetProvider.WidgetService} to
-     * handle intents created by remote views.
-     */
-    public static boolean processIntent(Context context, Intent intent) {
-        final Uri data = intent.getData();
-        if (data == null) {
-            return false;
-        }
-        List<String> pathSegments = data.getPathSegments();
-        // Our path segments are <command>, <arg1> [, <arg2>]
-        // First, a quick check of Uri validity
-        if (pathSegments.size() < 2) {
-            throw new IllegalArgumentException();
-        }
-        String command = pathSegments.get(0);
-        // Ignore unknown action names
-        try {
-            final long arg1 = Long.parseLong(pathSegments.get(1));
-            if (EmailWidget.COMMAND_NAME_VIEW_MESSAGE.equals(command)) {
-                // "view", <message id>, <mailbox id>
-                openMessage(context, Long.parseLong(pathSegments.get(2)), arg1);
-            }
-        } catch (NumberFormatException e) {
-            // Shouldn't happen as we construct all of the Uri's
-            return false;
-        }
-        return true;
-    }
-
-    private static void openMessage(final Context context, final long mailboxId,
-            final long messageId) {
-        EmailAsyncTask.runAsyncParallel(new Runnable() {
-            @Override
-            public void run() {
-                Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
-                if (mailbox == null) return;
-                context.startActivity(Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
-                        mailboxId, messageId, true));
-            }
-        });
+    private Intent getOpenMessageIntent(final Context context, final long messageId,
+            final long mailboxId) {
+        Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
+        return Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
+                        mailboxId, messageId);
     }
 
     private void setTextViewTextAndDesc(RemoteViews views, final int id, String text) {
@@ -317,7 +286,8 @@
 
         if (isCursorValid()) {
             // Show compose icon & message list
-            if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
+            if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW
+                || Account.restoreAccountWithId(mContext, mAccountId) == null) {
                 // Don't allow compose for "combined" view
                 views.setViewVisibility(R.id.widget_compose, View.INVISIBLE);
             } else {
@@ -344,8 +314,8 @@
         }
 
         // Use a bare intent for our template; we need to fill everything in
-        intent = new Intent(mContext, WidgetService.class);
-        PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, intent,
+        intent = new Intent(mContext, Welcome.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
         views.setPendingIntentTemplate(R.id.message_list, pendingIntent);
 
diff --git a/tests/src/com/android/email/NotificationControllerTest.java b/tests/src/com/android/email/NotificationControllerTest.java
index 8f36300..8ce1823 100644
--- a/tests/src/com/android/email/NotificationControllerTest.java
+++ b/tests/src/com/android/email/NotificationControllerTest.java
@@ -70,8 +70,8 @@
         // === Ringer mode change ===
         mRingerMode = AudioManager.RINGER_MODE_NORMAL;
 
-        // VIBRATE_ALWAYS, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
+        // VIBRATE, with a ringer tone
+        a1.mFlags = Account.FLAGS_VIBRATE;
 
         nb.setDefaults(0);
         nb.setSound(null);
@@ -83,19 +83,6 @@
         assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
         assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
 
-        // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
-
-        nb.setDefaults(0);
-        nb.setSound(null);
-        mTarget.setupSoundAndVibration(nb, a1);
-        n = nb.getNotification();
-
-        assertEquals(expectedRingtone, n.sound);
-        assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
-        assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
-        assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
         // No VIBRATE flags, with a ringer tone
         a1.mFlags = 0;
 
@@ -112,21 +99,8 @@
         // === Ringer mode change ===
         mRingerMode = AudioManager.RINGER_MODE_VIBRATE;
 
-        // VIBRATE_ALWAYS, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
-
-        nb.setDefaults(0);
-        nb.setSound(null);
-        mTarget.setupSoundAndVibration(nb, a1);
-        n = nb.getNotification();
-
-        assertEquals(expectedRingtone, n.sound);
-        assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
-        assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
-        assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
-        // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
+        // VIBRATE, with a ringer tone
+        a1.mFlags = Account.FLAGS_VIBRATE;
 
         nb.setDefaults(0);
         nb.setSound(null);
@@ -154,21 +128,8 @@
         // === Ringer mode change ===
         mRingerMode = AudioManager.RINGER_MODE_SILENT;
 
-        // VIBRATE_ALWAYS, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
-
-        nb.setDefaults(0);
-        nb.setSound(null);
-        mTarget.setupSoundAndVibration(nb, a1);
-        n = nb.getNotification();
-
-        assertEquals(expectedRingtone, n.sound);
-        assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
-        assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
-        assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
-        // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
+        // VIBRATE, with a ringer tone
+        a1.mFlags = Account.FLAGS_VIBRATE;
 
         nb.setDefaults(0);
         nb.setSound(null);