Choose thread icon more carefully

b/17298161

Choosing the avatar to draw as the thread icon follows this algorithm:

1) Prefer the sender of the first unread message.
2) If all messages are read, prefer the last sender that is not the
   current account.
3) If all messages were sent from the current account (e.g. user is
   emailing themselves), use the last sender (aka current account).

In the process of doing this work the last remaining dependency on
DividedImageCanvas was broken, so it could be removed at this time.

Tests confirming the new behavior have been added to SendersFormattingTests.

Change-Id: If8e066de8cb98f2f95b019a88a2fdadc2f9f5090
diff --git a/res/drawable-hdpi/ic_drawer_raw.png b/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-hdpi/ic_drawer_raw.png
rename to res/drawable-hdpi/ic_drawer.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_drawer_raw.png b/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-mdpi/ic_drawer_raw.png
rename to res/drawable-mdpi/ic_drawer.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_drawer_raw.png b/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-xhdpi/ic_drawer_raw.png
rename to res/drawable-xhdpi/ic_drawer.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_drawer_raw.png b/res/drawable-xxhdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_drawer_raw.png
rename to res/drawable-xxhdpi/ic_drawer.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_raw.png b/res/drawable-xxxhdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_drawer_raw.png
rename to res/drawable-xxxhdpi/ic_drawer.png
Binary files differ
diff --git a/res/drawable/ic_drawer.xml b/res/drawable/ic_drawer.xml
deleted file mode 100644
index d78f5f4..0000000
--- a/res/drawable/ic_drawer.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 Google Inc.
-     Licensed to The Android Open Source Project.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_drawer_raw"
-        android:autoMirrored="true">
-</bitmap>
diff --git a/res/layout-sw600dp/mail_toolbar_view.xml b/res/layout-sw600dp/mail_toolbar_view.xml
index bef17f9..b453a24 100644
--- a/res/layout-sw600dp/mail_toolbar_view.xml
+++ b/res/layout-sw600dp/mail_toolbar_view.xml
@@ -22,6 +22,7 @@
     android:id="@+id/mail_toolbar"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:contentInsetStart="@dimen/action_bar_content_inset_start"
     app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light" >
 
diff --git a/res/layout/conversation_footer.xml b/res/layout/conversation_footer.xml
index edd270a..0306216 100644
--- a/res/layout/conversation_footer.xml
+++ b/res/layout/conversation_footer.xml
@@ -19,7 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content"
+    android:layout_marginTop="24dp" >
 
     <include layout="@layout/conversation_view_border" />
 
@@ -55,7 +56,7 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="16dp"
+        android:layout_height="48dp"
         android:background="@color/conversation_view_item_background_color" />
 
 </com.android.mail.browse.ConversationFooterView>
\ No newline at end of file
diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml
index e311e64..88f6b2b 100644
--- a/res/layout/conversation_message_upper_header_text.xml
+++ b/res/layout/conversation_message_upper_header_text.xml
@@ -59,6 +59,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/sender_name"
+        android:ellipsize="end"
         style="@style/MessageHeaderSubtitleStyle" />
 
     <TextView
diff --git a/res/layout/folder_list.xml b/res/layout/folder_list.xml
index 239dea7..6cca4e0 100644
--- a/res/layout/folder_list.xml
+++ b/res/layout/folder_list.xml
@@ -50,6 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:src="@drawable/ic_ellipsis_24dp"
+            android:contentDescription="@string/drawer_open"
             style="@style/MiniDrawerFolderStyle" />
 
         <Space
diff --git a/res/layout/mail_toolbar_view.xml b/res/layout/mail_toolbar_view.xml
index 961e89c..78a5172 100644
--- a/res/layout/mail_toolbar_view.xml
+++ b/res/layout/mail_toolbar_view.xml
@@ -21,5 +21,6 @@
     android:id="@+id/mail_toolbar"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:contentInsetStart="@dimen/action_bar_content_inset_start"
     app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file
diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml
index a68f7b5..281d198 100644
--- a/res/layout/super_collapsed_block.xml
+++ b/res/layout/super_collapsed_block.xml
@@ -33,13 +33,13 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/divider_height"
             android:background="@color/conversation_view_border_color"/>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="8dp"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginTop="4dp"
             android:background="@color/conversation_view_border_color"/>
 
     </LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 348fc62..f61c4a2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Kry tans jou boodskappe"</string>
     <string name="undo" msgid="8256285267701059609">"Ontdoen"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Ontster <xliff:g id="COUNT">%1$d</xliff:g> gesprek."</item>
-    <item quantity="other" msgid="7677305734833709789">"Ontster <xliff:g id="COUNT">%1$d</xliff:g> gesprekke."</item>
+    <item quantity="one" msgid="1701235480675303125">"Ontster tans <xliff:g id="COUNT">%1$d</xliff:g> gesprek"</item>
+    <item quantity="other" msgid="1154441830432477256">"Ontster tans <xliff:g id="COUNT">%1$d</xliff:g> gesprekke"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gedemp."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gedemp."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gedemp"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gedemp"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as strooipos aangemeld."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; aangegee as strooipos."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as strooipos gerapporteer"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as strooipos gerapporteer"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteer as nie strooipos nie."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteer as nie strooipos nie."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as strooipos gerapporteer"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as strooipos gerapporteer"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemerk as nie belangrik nie."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemerk as nie belangrik nie."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemerk as nie belangrik nie"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemerk as nie belangrik nie"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as uitvissing gerapporteer."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as uitvissing gerapporteer."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as uitvissing gerapporteer"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; as uitvissing gerapporteer"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; geargiveer."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; geargiveer."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; geargiveer"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; geargiveer"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; uitgevee."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; uitgevee."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; uitgevee"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; uitgevee"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Uitgevee"</string>
     <string name="archived" msgid="6283673603512713022">"Geargiveer"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Verwyder uit <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Het vouer verander."</item>
-    <item quantity="other" msgid="8815390494333090939">"Het vouers verander."</item>
+    <item quantity="one" msgid="7787126147584620603">"Het vouer verander"</item>
+    <item quantity="other" msgid="6307772984911017972">"Het vouers verander"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Verskuif na <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultate"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Search word nie ondersteun op hierdie rekening nie."</string>
     <string name="add_label" msgid="3285338046038610902">"Voeg vouer by"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Wys nuwe boodskap van <xliff:g id="SENDER">%s</xliff:g> af."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Wys <xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskap"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Bekyk besonderhede&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Versteek details"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Vorige"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Sukses"</item>
-    <item msgid="2972425114100316260">"Geen verbinding nie."</item>
-    <item msgid="8594593386776437871">"Kon nie aanmeld nie."</item>
-    <item msgid="1375193906551623606">"Sekuriteitsfout"</item>
-    <item msgid="195177374927979967">"Kon nie sinkroniseer nie."</item>
+    <item msgid="2835492307658712596">"Geen verbinding nie"</item>
+    <item msgid="5932644761344898987">"Kon nie aanmeld nie"</item>
+    <item msgid="7335227237106118306">"Sekuriteitsfout"</item>
+    <item msgid="8148525741623865182">"Kon nie sinkroniseer nie"</item>
     <item msgid="8026148967150231130">"Interne fout"</item>
     <item msgid="5442620760791553027">"Bedienerfout"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ongelees"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ ongelees"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Sien nog gesprekke"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Laai tans…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Kies rekening"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Meld aan"</string>
     <string name="info" msgid="1357564480946178121">"Inligting"</string>
     <string name="report" msgid="4318141326014579036">"Gee aan"</string>
+    <string name="show" msgid="2874876876336599985">"Wys"</string>
     <string name="sync_error" msgid="1795794969006241678">"Kon nie sinkroniseer nie."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Jou toestel het nie genoeg stoorplek om te sinkroniseer nie."</string>
     <string name="storage" msgid="4783683938444150638">"Berging"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9e7af05..ea14a9c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"የእርስዎን መልዕክቶች ማግኘት"</string>
     <string name="undo" msgid="8256285267701059609">"ቀልብስ"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"የ<xliff:g id="COUNT">%1$d</xliff:g> ውይይት ኮከብ በማንሳት ላይ።"</item>
-    <item quantity="other" msgid="7677305734833709789">"የ<xliff:g id="COUNT">%1$d</xliff:g> ውይይቶች ኮከብ በማንሳት ላይ።"</item>
+    <item quantity="one" msgid="1701235480675303125">"የ<xliff:g id="COUNT">%1$d</xliff:g> ውይይት ኮከብ በማንሳት ላይ"</item>
+    <item quantity="other" msgid="1154441830432477256">"የ<xliff:g id="COUNT">%1$d</xliff:g> ውይይቶች ኮከብ በማንሳት ላይ"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ድምፀ-ከል ተደርጎበታል።"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ድምፀ-ከል ተደርጎበታል።"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ድምጸ-ከል ተደርጎበታል"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ድምጸ-ከል ተደርጎባቸዋል"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ መልዕክት ተብለው ሪፖርት ተደርገዋል።"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; እንደ አይፈለጌ መልዕክት ሪፖርት ተደርጓል።"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ መልዕክት ተብሎ ሪፖርት ተደርጓል"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ መልዕክት ተብሎ ሪፖርት ተደርገዋል"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ አይደሉም ተብለው ሪፖርት ተደርገዋል።"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ አይደሉም ተብለው ሪፖርት ተደርገዋል።"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ መልዕክት አይደለም ተብሎ ሪፖርት ተደርጓል"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አይፈለጌ መልዕክት አይደለም ተብሎ ሪፖርት ተደርገዋል"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&amp;gt<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አስፈላጊ አይደሉም የሚል ምልክት ተደርጎባቸዋል።"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&amp;gt<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አስፈላጊ አይደሉም የሚል ምልክት ተደርጎባቸዋል።"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አስፈላጊ አይደሉም የሚል ምልክት ተደርጎበታል"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; አስፈላጊ አይደሉም የሚል ምልክት ተደርጎባቸዋል።"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ማስገር ተብለው ሪፖርት ተደርገዋል።"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ማስገር ተብለው ሪፖርት ተደርገዋል።"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ማስገር ተብሎ ሪፖርት ተደርጓል"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ማስገር ተብሎ ሪፖርት ተደርገዋል"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;gየተመዘገበ"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;gየተመዘገበ"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; በማህደር ተቀምጧል"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; በማህደር ተቀምጠዋል"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;g የተሰረዘ"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;g የተሰረዘ"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ተሰርዟል"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ተሰርዘዋል"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ተሰርዟል"</string>
     <string name="archived" msgid="6283673603512713022">"ተሰንዷል"</string>
     <string name="folder_removed" msgid="5656281444688183676">"ከ<xliff:g id="FOLDERNAME">%1$s</xliff:g> ተወግዷል"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"የተቀየረ አቃፊ። የተለወጠ አቃፊ።"</item>
-    <item quantity="other" msgid="8815390494333090939">"የተቀየሩ አቃፊዎች።"</item>
+    <item quantity="one" msgid="7787126147584620603">"አቃፊ ተቀይሯል"</item>
+    <item quantity="other" msgid="6307772984911017972">"አቃፊዎች ተቀይረዋል"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"ወደ <xliff:g id="FOLDERNAME">%1$s</xliff:g> ተወስዷል"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ውጤቶች"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ፍለጋ በዚህ መለያ አይደገፍም።"</string>
     <string name="add_label" msgid="3285338046038610902">"አቃፊ አክል"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"ከ<xliff:g id="SENDER">%s</xliff:g> የመጣ አዲስ መልዕክት አሳይ።"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶችን አሳይ።"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክት"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;ዝርዝሮችን ይመልከቱ&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ዝርዝሮችን ደብቅ"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"ቀዳሚ"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"ተሳክቷል"</item>
-    <item msgid="2972425114100316260">"ግንኙነት የለም።"</item>
-    <item msgid="8594593386776437871">"በመለያ መግባት አልተቻለም።"</item>
-    <item msgid="1375193906551623606">"የደህንነት ስህተት።"</item>
-    <item msgid="195177374927979967">"ማመሳሰል አልተቻለም።"</item>
+    <item msgid="2835492307658712596">"ምንም ግንኙነት የለም"</item>
+    <item msgid="5932644761344898987">"በመለያ መግባት አልተቻለም"</item>
+    <item msgid="7335227237106118306">"የደህንነት ስህተት"</item>
+    <item msgid="8148525741623865182">"ማመሳሰል አልተቻለም"</item>
     <item msgid="8026148967150231130">"ውስጣዊ ስህተት"</item>
     <item msgid="5442620760791553027">"የአገልጋይ ስህተት"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ያልተነበቡ"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ ያልተነበቡ"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"ተጨማሪ ውይይቶችን ዕይ"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"በመጫን ላይ…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"መለያ ምረጥ"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"በመለያ ግባ"</string>
     <string name="info" msgid="1357564480946178121">"መረጃ"</string>
     <string name="report" msgid="4318141326014579036">"ሪፖርት አድርግ"</string>
+    <string name="show" msgid="2874876876336599985">"አሳይ"</string>
     <string name="sync_error" msgid="1795794969006241678">"ማመሳሰል አልተቻለም።"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"መሣሪያዎ ለማመሳሰል የሚያስፈልገው በቂ የማከማቻ ቦታ የለውም።"</string>
     <string name="storage" msgid="4783683938444150638">"ማከማቻ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c014263..d50636e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"جارٍ الحصول على رسائلك"</string>
     <string name="undo" msgid="8256285267701059609">"تراجع"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"جارٍ إلغاء تمييز محادثة <xliff:g id="COUNT">%1$d</xliff:g> بنجمة."</item>
-    <item quantity="other" msgid="7677305734833709789">"جارٍ إلغاء تمييز <xliff:g id="COUNT">%1$d</xliff:g> من المحادثات بنجمة."</item>
+    <item quantity="one" msgid="1701235480675303125">"إزالة التمييز بنجمة عن <xliff:g id="COUNT">%1$d</xliff:g> محادثة"</item>
+    <item quantity="other" msgid="1154441830432477256">"إزالة التمييز بنجمة عن <xliff:g id="COUNT">%1$d</xliff:g> من المحادثات"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"‏تم تجاهل &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4276111931404654219">"‏تم تجاهل &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"‏تم تجاهل &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4559007262578295280">"‏تم تجاهل &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كرسائل غير مرغوب فيها."</item>
-    <item quantity="other" msgid="5900913789259199137">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كغير مرغوب فيها."</item>
+    <item quantity="one" msgid="1749550834135461470">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحتوى غير مرغوب فيه"</item>
+    <item quantity="other" msgid="664292592683692920">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحتوى غير مرغوب فيه"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحادثة ليست ضمن المحادثات غير المرغوب فيها."</item>
-    <item quantity="other" msgid="4966164423991098144">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحادثات ليست ضمن المحادثات غير المرغوب فيها."</item>
+    <item quantity="one" msgid="3680479171846552641">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحتوى مرغوب فيه"</item>
+    <item quantity="other" msgid="6351739502184556635">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحتوى مرغوب فيه"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"‏تم وضع علامة على &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; تشير إلى عدم الأهمية."</item>
-    <item quantity="other" msgid="1215472798075869124">"‏تم وضع علامة على &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; تشير إلى عدم الأهمية."</item>
+    <item quantity="one" msgid="7432667428974709669">"‏تم وضع علامة على &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; تشير إلى عدم الأهمية"</item>
+    <item quantity="other" msgid="4823331037057239763">"‏تم وضع علامة على &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; تشير إلى عدم الأهمية"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحادثة تهدف إلى التصيّد."</item>
-    <item quantity="other" msgid="9218674052779504277">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كمحادثات تهدف إلى التصيّد."</item>
+    <item quantity="one" msgid="3511804715065046338">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كتصيد احتيالي"</item>
+    <item quantity="other" msgid="8400382886585779414">"‏تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كتصيد احتيالي"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"‏تمت أرشفة &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"‏تمت أرشفة &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"‏تم وضع &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; في الأرشيف"</item>
+    <item quantity="other" msgid="8520761617935818623">"‏تم وضع &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; في الأرشيف"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"‏تم حذف &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"‏تم حذف &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"‏تم حذف &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6287534453625638257">"‏تم حذف &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"تم الحذف"</string>
     <string name="archived" msgid="6283673603512713022">"تم الوضع في الأرشيف"</string>
     <string name="folder_removed" msgid="5656281444688183676">"تمت الإزالة من <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"تم تغيير المجلد."</item>
-    <item quantity="other" msgid="8815390494333090939">"تم تغيير المجلدات."</item>
+    <item quantity="one" msgid="7787126147584620603">"تم تغيير المجلد"</item>
+    <item quantity="other" msgid="6307772984911017972">"تم تغيير المجلدات"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"تم النقل إلى <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"النتائج"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"لا يمكن استخدام البحث على هذا الحساب."</string>
     <string name="add_label" msgid="3285338046038610902">"إضافة مجلد"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"عرض رسالة جديدة من <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"عرض <xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> رسالة جديدة"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;عرض التفاصيل&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"إخفاء التفاصيل"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"السابق"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"تم بنجاح"</item>
-    <item msgid="2972425114100316260">"لا يتوفر اتصال."</item>
-    <item msgid="8594593386776437871">"تعذر تسجيل الدخول."</item>
-    <item msgid="1375193906551623606">"خطأ أمنى."</item>
-    <item msgid="195177374927979967">"تعذرت المزامنة"</item>
+    <item msgid="2835492307658712596">"ليس هناك اتصال"</item>
+    <item msgid="5932644761344898987">"تعذر تسجيل الدخول"</item>
+    <item msgid="7335227237106118306">"خطأ متعلق بالأمان"</item>
+    <item msgid="8148525741623865182">"تعذرت المزامنة"</item>
     <item msgid="8026148967150231130">"خطأ داخلي"</item>
     <item msgid="5442620760791553027">"خطأ في الخادم"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> غير مقروءة"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"أكثر من <xliff:g id="COUNT">%1$d</xliff:g> غير مقروءة"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"عرض المزيد من المحادثات"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"جارٍ التحميل…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"اختيار حساب"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"تسجيل الدخول"</string>
     <string name="info" msgid="1357564480946178121">"معلومات"</string>
     <string name="report" msgid="4318141326014579036">"الإبلاغ"</string>
+    <string name="show" msgid="2874876876336599985">"عرض"</string>
     <string name="sync_error" msgid="1795794969006241678">"تعذرت المزامنة."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"ليست هناك مساحة تخزينية كافية على الجهاز لإجراء المزامنة."</string>
     <string name="storage" msgid="4783683938444150638">"وحدة التخزين"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 86db454..e1d85b8 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Съобщенията ви се извличат"</string>
     <string name="undo" msgid="8256285267701059609">"Отмяна"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Звездата се премахва от <xliff:g id="COUNT">%1$d</xliff:g> кореспонденция."</item>
-    <item quantity="other" msgid="7677305734833709789">"Звездите се премахват от <xliff:g id="COUNT">%1$d</xliff:g> кореспонденции."</item>
+    <item quantity="one" msgid="1701235480675303125">"Премахва се звездата от <xliff:g id="COUNT">%1$d</xliff:g> кореспонденция"</item>
+    <item quantity="other" msgid="1154441830432477256">"Премахват се звездите от <xliff:g id="COUNT">%1$d</xliff:g> кореспонденции"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Спряхте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="4276111931404654219">"Спряхте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе спряна"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бяха спрени"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Подадохте сигнал за спам за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="5900913789259199137">"Подадохте сигнал за спам за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="1749550834135461470">"За &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе подаден сигнал за спам"</item>
+    <item quantity="other" msgid="664292592683692920">"За &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе подаден сигнал за спам"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Подадохте сигнал „Не е спам“ за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4966164423991098144">"Подадохте сигнал „Не е спам“ за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3680479171846552641">"За &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе сигнализирано, че не е спам"</item>
+    <item quantity="other" msgid="6351739502184556635">"За &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе сигнализирано, че не са спам"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Означихте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; като маловажна."</item>
-    <item quantity="other" msgid="1215472798075869124">"Означихте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; като маловажни."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе означена като маловажна"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бяха означени като маловажни"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Подадохте сигнал за фишинг за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="9218674052779504277">"Подадохте сигнал за фишинг за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3511804715065046338">"За &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе подаден сигнал за фишинг"</item>
+    <item quantity="other" msgid="8400382886585779414">"За &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе подаден сигнал за фишинг"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Архивирахте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Архивирахте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе архивирана"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бяха архивирани"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Изтрихте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"Изтрихте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бе изтрита"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; бяха изтрити"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Изтрита"</string>
     <string name="archived" msgid="6283673603512713022">"Архивирана"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Премахнатa от „<xliff:g id="FOLDERNAME">%1$s</xliff:g>“"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Променихте папката."</item>
-    <item quantity="other" msgid="8815390494333090939">"Променихте папките."</item>
+    <item quantity="one" msgid="7787126147584620603">"Папката бе променена"</item>
+    <item quantity="other" msgid="6307772984911017972">"Папките бяха променени"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Преместено в/ъв „<xliff:g id="FOLDERNAME">%1$s</xliff:g>“"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Резултати"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Търсенето не се поддържа за този профил."</string>
     <string name="add_label" msgid="3285338046038610902">"Добавяне на папка"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Показване на ново съобщение от <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Показване на <xliff:g id="COUNT">%1$d</xliff:g> нови съобщения."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ново съобщение"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Преглед на подробностите&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Скриване на подробностите"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Предишно"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Успех"</item>
-    <item msgid="2972425114100316260">"Няма връзка."</item>
-    <item msgid="8594593386776437871">"Не можахте да влезете."</item>
-    <item msgid="1375193906551623606">"Грешка в сигурността."</item>
-    <item msgid="195177374927979967">"Не можа да се синхронизира."</item>
+    <item msgid="2835492307658712596">"Няма връзка"</item>
+    <item msgid="5932644761344898987">"Влизането в профила не бе възможно"</item>
+    <item msgid="7335227237106118306">"Грешка в сигурността"</item>
+    <item msgid="8148525741623865182">"Синхронизирането не бе възможно"</item>
     <item msgid="8026148967150231130">"Вътрешна грешка"</item>
     <item msgid="5442620760791553027">"Грешка в сървъра"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> непрочетени"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"над <xliff:g id="COUNT">%1$d</xliff:g> непрочетени"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Преглед на още кореспонденции"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Зарежда се..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Изберете профил"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Вход"</string>
     <string name="info" msgid="1357564480946178121">"Информация"</string>
     <string name="report" msgid="4318141326014579036">"Изпращане"</string>
+    <string name="show" msgid="2874876876336599985">"Показване"</string>
     <string name="sync_error" msgid="1795794969006241678">"Не можа да се синхронизира."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Устройството ви няма достатъчно място в хранилището, за да се извърши синхронизиране."</string>
     <string name="storage" msgid="4783683938444150638">"Хранилище"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index f94c4aa..41e0127 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"আপনার বার্তাগুলি প্রাপ্ত করা হচ্ছে"</string>
     <string name="undo" msgid="8256285267701059609">"পূর্বাবস্থায় ফিরুন"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g>টি কথোপকথন তারকা চিহ্নমুক্ত হচ্ছে।"</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g>টি কথোপকথন তারকা চিহ্নমুক্ত হচ্ছে।"</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g>টি কথোপকথন থেকে তারকা চিহ্ন তুলে নেওয়া হচ্ছে"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g>টি কথোপকথন থেকে তারকা চিহ্ন তুলে নেওয়া হচ্ছে"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি নিঃশব্দ করা হয়েছে।"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি নিঃশব্দ করা হয়েছে।"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি নিঃশব্দ করা হয়েছে"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি নিঃশব্দ করা হয়েছে"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম হিসাবে প্রতিবেদন করা হয়েছে।"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম হিসাবে প্রতিবেদন করা হয়েছে।"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম হিসাবে প্রতিবেদন করা হয়েছে"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম হিসাবে প্রতিবেদন করা হয়েছে"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম নয় হিসাবে প্রতিবেদন করা হয়েছে।"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম নয় হিসাবে প্রতিবেদন করা হয়েছে।"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম নয় বলে প্রতিবেদন করা হয়েছে"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি স্প্যাম নয় বলে প্রতিবেদন করা হয়েছে"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি গুরুত্বপূর্ণ নয় হিসাবে চিহ্নিত হয়েছে।"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি গুরুত্বপূর্ণ নয় হিসাবে চিহ্নিত হয়েছে।"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি গুরুত্বপূর্ণ নয় বলে চিহ্নিত করা হয়েছে"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি গুরুত্বপূর্ণ নয় বলে চিহ্নিত করা হয়েছে"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি ফিশিং হিসাবে প্রতিবেদন করা হয়েছে।"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি ফিশিং হিসাবে প্রতিবেদন করা হয়েছে।"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি ফিশিং হিসাবে প্রতিবেদন করা হয়েছে"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি ফিশিং হিসাবে প্রতিবেদন করা হয়েছে"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি সংরক্ষণাগারভুক্ত হয়েছে।"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি সংরক্ষণাগারভুক্ত হয়েছে।"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি সংরক্ষণাগারভুক্ত করা হয়েছে"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি সংরক্ষণাগারভুক্ত করা হয়েছে"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি মোছা হয়েছে।"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি মোছা হয়েছে।"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি মোছা হয়েছে"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;টি মোছা হয়েছে"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"মোছা হয়েছে"</string>
     <string name="archived" msgid="6283673603512713022">"সংরক্ষণাগারভুক্ত"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> থেকে সরানো হয়েছে"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"ফোল্ডার পরিবর্তন হয়েছে।"</item>
-    <item quantity="other" msgid="8815390494333090939">"ফোল্ডারগুলি পরিবর্তন হয়েছে।"</item>
+    <item quantity="one" msgid="7787126147584620603">"পরিবর্তিত ফোল্ডার"</item>
+    <item quantity="other" msgid="6307772984911017972">"পরিবর্তিত ফোল্ডারগুলি"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> এ সরানো হয়েছে"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ফলাফল"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"এই অ্যাকাউন্টে অনুসন্ধানের সুবিধা নেই।"</string>
     <string name="add_label" msgid="3285338046038610902">"ফোল্ডার জুড়ুন"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> এর থেকে নতুন বার্তা দেখান।"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g>টি নতুন বার্তা দেখান।"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g>টি নতুন বার্তা"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g>টি নতুন বার্তা"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;বিশদ বিবরণ দেখুন&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"বিশদ বিবরণ লুকান"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"পূর্ববর্তী"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"সফল"</item>
-    <item msgid="2972425114100316260">"কোনো সংযোগ নেই৷"</item>
-    <item msgid="8594593386776437871">"সাইন ইন করা যায়নি।"</item>
-    <item msgid="1375193906551623606">"নিরাপত্তাজনিত ত্রুটি"</item>
-    <item msgid="195177374927979967">"সিঙ্ক করা যায়নি।"</item>
+    <item msgid="2835492307658712596">"কোনো সংযোগ নেই"</item>
+    <item msgid="5932644761344898987">"সাইন ইন করা যায়নি"</item>
+    <item msgid="7335227237106118306">"নিরাপত্তা ত্রুটি"</item>
+    <item msgid="8148525741623865182">"সিঙ্ক করা যায়নি"</item>
     <item msgid="8026148967150231130">"অভ্যন্তরীণ ত্রুটি"</item>
     <item msgid="5442620760791553027">"সার্ভার ত্রুটি"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g>টি অপঠিত"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>টি+ অপঠিত"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"আরো কথোপকথন দেখুন"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"লোড হচ্ছে..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"অ্যাকাউন্ট চয়ন করুন"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"সাইন-ইন করুন"</string>
     <string name="info" msgid="1357564480946178121">"তথ্য"</string>
     <string name="report" msgid="4318141326014579036">"প্রতিবেদন করুন"</string>
+    <string name="show" msgid="2874876876336599985">"দেখান"</string>
     <string name="sync_error" msgid="1795794969006241678">"সিঙ্ক করা যায়নি।"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"সিঙ্ক করার জন্য আপনার ডিভাইসে পর্যাপ্ত সঞ্চয় স্থান নেই।"</string>
     <string name="storage" msgid="4783683938444150638">"সঞ্চয়স্থান"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 037f359..49b5dde 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"S\'estan obtenint els missatges."</string>
     <string name="undo" msgid="8256285267701059609">"Desfés"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"S\'està anul·lant <xliff:g id="COUNT">%1$d</xliff:g> conversa destacada."</item>
-    <item quantity="other" msgid="7677305734833709789">"S\'estan anul·lant <xliff:g id="COUNT">%1$d</xliff:g> converses destacades."</item>
+    <item quantity="one" msgid="1701235480675303125">"S\'està anul·lant <xliff:g id="COUNT">%1$d</xliff:g> conversa destacada"</item>
+    <item quantity="other" msgid="1154441830432477256">"S\'estan anul·lant <xliff:g id="COUNT">%1$d</xliff:g> converses destacades"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Se n\'ha silenciat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4276111931404654219">"Se n\'han silenciat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silenciada"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silenciades"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Converses notificades com a activitat brossa:&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="5900913789259199137">"S\'ha informat d\'&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses com a activitat brossa."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; notificada com a activitat brossa"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; notificades com a activitat brossa"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses no són activitat brossa."</item>
-    <item quantity="other" msgid="4966164423991098144">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses no són activitat brossa."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; notificada com a no activitat brossa"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; notificades com a no activitat brossa"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no important."</item>
-    <item quantity="other" msgid="1215472798075869124">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no importants."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada com a no important"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcades com a no importants"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses són pesca."</item>
-    <item quantity="other" msgid="9218674052779504277">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses són pesca."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; notificada com a suplantació d\'identitat"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; notificades com a suplantació d\'identitat"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Se n\'ha arxivat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Se n\'ha arxivat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arxivada"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arxivades"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Se n\'han suprimit &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"Se n\'han suprimit &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminada"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminades"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Suprimida"</string>
     <string name="archived" msgid="6283673603512713022">"Arxivat"</string>
     <string name="folder_removed" msgid="5656281444688183676">"S\'ha eliminat de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"S\'ha canviat la carpeta."</item>
-    <item quantity="other" msgid="8815390494333090939">"S\'han canviat les carpetes."</item>
+    <item quantity="one" msgid="7787126147584620603">"S\'ha canviat la carpeta"</item>
+    <item quantity="other" msgid="6307772984911017972">"S\'han canviat les carpetes"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"S\'ha mogut a <xliff:g id="FOLDERNAME">%1$s</xliff:g>."</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultats"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"La cerca no és compatible en aquest compte."</string>
     <string name="add_label" msgid="3285338046038610902">"Afegeix una carpeta"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostra el missatge nou de <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostra <xliff:g id="COUNT">%1$d</xliff:g> missatges nous."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> missatge nou"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Mostra els detalls&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Amaga els detalls"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Anterior"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Correcte"</item>
-    <item msgid="2972425114100316260">"Sense connexió."</item>
-    <item msgid="8594593386776437871">"No s\'ha pogut iniciar la sessió"</item>
-    <item msgid="1375193906551623606">"Error de seguretat."</item>
-    <item msgid="195177374927979967">"No s\'ha pogut sincronitzar."</item>
+    <item msgid="2835492307658712596">"Sense connexió"</item>
+    <item msgid="5932644761344898987">"No s\'ha pogut iniciar la sessió"</item>
+    <item msgid="7335227237106118306">"Error de seguretat"</item>
+    <item msgid="8148525741623865182">"No s\'ha pogut fer la sincronització"</item>
     <item msgid="8026148967150231130">"Error intern"</item>
     <item msgid="5442620760791553027">"Error del servidor"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> no llegits"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Més de <xliff:g id="COUNT">%1$d</xliff:g> no llegits"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Visualitza més converses"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"S\'està carregant…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Selecciona un compte"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Inicia la sessió"</string>
     <string name="info" msgid="1357564480946178121">"Informació"</string>
     <string name="report" msgid="4318141326014579036">"Informa"</string>
+    <string name="show" msgid="2874876876336599985">"Mostra"</string>
     <string name="sync_error" msgid="1795794969006241678">"No s\'ha pogut sincronitzar."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"El dispositiu no té prou espai d\'emmagatzematge per sincronitzar."</string>
     <string name="storage" msgid="4783683938444150638">"Emmagatzematge"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 950bf67..ae49426 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,7 +18,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="from" msgid="5159056500059912358">"Odesílatel"</string>
+    <string name="from" msgid="5159056500059912358">"Od"</string>
     <string name="to" msgid="3971614275716830581">"Komu"</string>
     <string name="cc" msgid="8768828862207919684">"Kopie"</string>
     <string name="bcc" msgid="519303553518479171">"Skrytá kopie"</string>
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Načítání zpráv"</string>
     <string name="undo" msgid="8256285267701059609">"Vrátit zpět"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Ruší se označení <xliff:g id="COUNT">%1$d</xliff:g> konverzace hvězdičkou."</item>
-    <item quantity="other" msgid="7677305734833709789">"Ruší se označení <xliff:g id="COUNT">%1$d</xliff:g> konverzací hvězdičkou."</item>
+    <item quantity="one" msgid="1701235480675303125">"Ruší se označení <xliff:g id="COUNT">%1$d</xliff:g> konverzace hvězdičkou."</item>
+    <item quantity="other" msgid="1154441830432477256">"Ruší se označení <xliff:g id="COUNT">%1$d</xliff:g> konverzací hvězdičkou."</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Ignorované konverzace: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="4276111931404654219">"Ignorované konverzace: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace ignorována"</item>
+    <item quantity="other" msgid="4559007262578295280">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) ignorovány"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Konverzace nahlášené jako spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="5900913789259199137">"Konverzace nahlášené jako spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace nahlášena jako spam"</item>
+    <item quantity="other" msgid="664292592683692920">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) nahlášeny jako spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Konverzace, které nebyly nahlášeny jako spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="4966164423991098144">"Konverzace, které nebyly nahlášeny jako spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace označena jako spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) označeny jako spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Počet konverzací označených jako nedůležité: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="1215472798075869124">"Počet konverzací označených jako nedůležité: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace označena jako nedůležitá"</item>
+    <item quantity="other" msgid="4823331037057239763">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) označeny jako nedůležité"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Konverzace nahlášené jako phishing: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="9218674052779504277">"Konverzace nahlášené jako phishing: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace nahlášena jako phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) nahlášeny jako phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Archivované konverzace: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="7789480176789922968">"Archivované konverzace: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace archivována"</item>
+    <item quantity="other" msgid="8520761617935818623">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) archivovány"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Smazané konverzace: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="7060256058737892078">"Smazané konverzace: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzace smazána"</item>
+    <item quantity="other" msgid="6287534453625638257">"Konverzace (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) smazány"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Smazáno"</string>
     <string name="archived" msgid="6283673603512713022">"Archivováno"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Odestraněno ze složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Složka změněna."</item>
-    <item quantity="other" msgid="8815390494333090939">"Složky změněny."</item>
+    <item quantity="one" msgid="7787126147584620603">"Složka změněna"</item>
+    <item quantity="other" msgid="6307772984911017972">"Složky změněny"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Přesunuto do složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Výsledky"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Vyhledávání není v tomto účtu podporováno."</string>
     <string name="add_label" msgid="3285338046038610902">"Přidat složku"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Zobrazit novou zprávu od odesílatele <xliff:g id="SENDER">%s</xliff:g>"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Zobrazit nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nová zpráva"</item>
+    <item quantity="other" msgid="4085982174357328926">"Nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.cz\'&gt;Zobrazit podrobnosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skrýt podrobnosti"</string>
@@ -229,7 +229,7 @@
   <plurals name="super_collapsed_loading_content_description">
     <item quantity="other" msgid="678491885491918982">"Načítání <xliff:g id="COUNT">%1$d</xliff:g> starších zpráv"</item>
   </plurals>
-    <string name="from_heading" msgid="48290556829713090">"Odesílatel:"</string>
+    <string name="from_heading" msgid="48290556829713090">"Od:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Odpovědět:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Komu: "</string>
     <string name="to_heading_no_space" msgid="679167047628308670">"Komu:"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Předchozí"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Podařilo se"</item>
-    <item msgid="2972425114100316260">"Žádné připojení."</item>
-    <item msgid="8594593386776437871">"Přihlášení se nezdařilo"</item>
-    <item msgid="1375193906551623606">"Chyba zabezpečení."</item>
-    <item msgid="195177374927979967">"Chyba synchronizace."</item>
+    <item msgid="2835492307658712596">"Žádné připojení"</item>
+    <item msgid="5932644761344898987">"Přihlášení se nezdařilo"</item>
+    <item msgid="7335227237106118306">"Chyba zabezpečení"</item>
+    <item msgid="8148525741623865182">"Synchronizace se nezdařila"</item>
     <item msgid="8026148967150231130">"Interní chyba"</item>
     <item msgid="5442620760791553027">"Chyba serveru"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Nepřečteno: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Nepřečteno: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Zobrazit další konverzace"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Načítá se..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Výběr účtu"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Přihlásit se"</string>
     <string name="info" msgid="1357564480946178121">"Informace"</string>
     <string name="report" msgid="4318141326014579036">"Přehled"</string>
+    <string name="show" msgid="2874876876336599985">"Zobrazit"</string>
     <string name="sync_error" msgid="1795794969006241678">"Chyba synchronizace."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Ve vašem zařízení není pro synchronizaci dostatek místa."</string>
     <string name="storage" msgid="4783683938444150638">"Úložiště"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e0fdef7..074870d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Dine meddelelser hentes"</string>
     <string name="undo" msgid="8256285267701059609">"Fortryd"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Fjerner stjernemarkering fra <xliff:g id="COUNT">%1$d</xliff:g> samtale."</item>
-    <item quantity="other" msgid="7677305734833709789">"Fjerner stjernemarkering fra <xliff:g id="COUNT">%1$d</xliff:g> samtaler."</item>
+    <item quantity="one" msgid="1701235480675303125">"Stjernemarkering fjernes fra <xliff:g id="COUNT">%1$d</xliff:g> samtale"</item>
+    <item quantity="other" msgid="1154441830432477256">"Stjernemarkering fjernes fra <xliff:g id="COUNT">%1$d</xliff:g> samtaler"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er ignoreret."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er ignoreret."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver ignoreret"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver ignoreret"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er rapporteret som spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er rapporteret som spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; blev rapporteret som \"ikke spam\"."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; blev rapporteret som \"ikke spam\"."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som ikke spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som ikke spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er markeret som uvigtige."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er markeret som vigtige."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver markeret som ikke vigtig"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver markeret som ikke vigtig"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; blev rapporteret som phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; blev rapporteret som phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er arkiveret."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er arkiveret."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkiveres"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkiveres"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er slettet."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er slettet."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; slettes"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; slettes"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Slettet"</string>
     <string name="archived" msgid="6283673603512713022">"Arkiveret"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Fjernet fra <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Ændret mappe."</item>
-    <item quantity="other" msgid="8815390494333090939">"Ændrede mapper."</item>
+    <item quantity="one" msgid="7787126147584620603">"En mappe blive ændret"</item>
+    <item quantity="other" msgid="6307772984911017972">"Mapper bliver ændret"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Flyttet til <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultater"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Søgningen understøttes ikke på denne konto."</string>
     <string name="add_label" msgid="3285338046038610902">"Tilføj mappe"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Vis ny meddelelse fra <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Vis <xliff:g id="COUNT">%1$d</xliff:g> nye meddelelser."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ny meddelelse"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nye meddelelser"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Se info&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skjul info"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Forrige"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Gennemført"</item>
-    <item msgid="2972425114100316260">"Ingen forbindelse."</item>
-    <item msgid="8594593386776437871">"Det var ikke muligt at logge ind."</item>
-    <item msgid="1375193906551623606">"Sikkerhedsfejl."</item>
-    <item msgid="195177374927979967">"Det var ikke muligt at synkronisere."</item>
+    <item msgid="2835492307658712596">"Ingen forbindelse"</item>
+    <item msgid="5932644761344898987">"Kunne ikke logge ind"</item>
+    <item msgid="7335227237106118306">"Sikkerhedsfejl"</item>
+    <item msgid="8148525741623865182">"Kunne ikke synkronisere"</item>
     <item msgid="8026148967150231130">"Intern fejl"</item>
     <item msgid="5442620760791553027">"Serverfejl"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ulæste"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ ulæste"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Vis flere samtaler"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Indlæser…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Vælg konto"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Log ind"</string>
     <string name="info" msgid="1357564480946178121">"Oplysninger"</string>
     <string name="report" msgid="4318141326014579036">"Rapportér"</string>
+    <string name="show" msgid="2874876876336599985">"Vis"</string>
     <string name="sync_error" msgid="1795794969006241678">"Det var ikke muligt at synkronisere."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Enheden har ikke nok lagerplads til at synkronisere."</string>
     <string name="storage" msgid="4783683938444150638">"Lager"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5bb7a91..e594045 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Ihre Nachrichten werden geladen."</string>
     <string name="undo" msgid="8256285267701059609">"Rückgängig"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Markierung von <xliff:g id="COUNT">%1$d</xliff:g> Konversation wird aufgehoben..."</item>
-    <item quantity="other" msgid="7677305734833709789">"Markierungen von <xliff:g id="COUNT">%1$d</xliff:g> Konversationen werden aufgehoben..."</item>
+    <item quantity="one" msgid="1701235480675303125">"Markierung von <xliff:g id="COUNT">%1$d</xliff:g> Konversation wird aufgehoben"</item>
+    <item quantity="other" msgid="1154441830432477256">"Markierung von <xliff:g id="COUNT">%1$d</xliff:g> Konversationen wird aufgehoben"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; wird ignoriert."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; werden ignoriert."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; stumm geschaltet"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; stumm geschaltet"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Spam gemeldet"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Spam gemeldet"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Spam gemeldet"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Spam gemeldet"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als kein Spam gemeldet"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als kein Spam gemeldet"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Nicht-Spam gemeldet"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Nicht-Spam gemeldet"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als nicht wichtig markiert"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als nicht wichtig markiert"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als nicht wichtig markiert"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als nicht wichtig markiert"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Phishing gemeldet"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Phishing gemeldet"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Phishing gemeldet"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als Phishing gemeldet"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviert"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviert"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviert"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviert"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gelöscht"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gelöscht"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gelöscht"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gelöscht"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Gelöscht"</string>
     <string name="archived" msgid="6283673603512713022">"Archiviert"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Aus <xliff:g id="FOLDERNAME">%1$s</xliff:g> entfernt"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Ordner geändert"</item>
-    <item quantity="other" msgid="8815390494333090939">"Ordner geändert"</item>
+    <item quantity="one" msgid="7787126147584620603">"Ordner geändert"</item>
+    <item quantity="other" msgid="6307772984911017972">"Ordner geändert"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Verschoben nach <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Ergebnisse"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Die Suche wird für dieses Konto nicht unterstützt."</string>
     <string name="add_label" msgid="3285338046038610902">"Ordner hinzufügen"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Neue Nachricht von <xliff:g id="SENDER">%s</xliff:g> anzeigen"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten anzeigen"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachricht"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.ihrebeispielurl.com\'&gt;Details ansehen&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Details ausblenden"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Zurück"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Erfolgreich"</item>
-    <item msgid="2972425114100316260">"Keine Verbindung"</item>
-    <item msgid="8594593386776437871">"Anmeldung nicht möglich"</item>
-    <item msgid="1375193906551623606">"Sicherheitsfehler"</item>
-    <item msgid="195177374927979967">"Synchronisierung nicht möglich"</item>
+    <item msgid="2835492307658712596">"Keine Verbindung"</item>
+    <item msgid="5932644761344898987">"Anmeldung nicht möglich"</item>
+    <item msgid="7335227237106118306">"Sicherheitsfehler"</item>
+    <item msgid="8148525741623865182">"Synchronisierung konnte nicht durchgeführt werden"</item>
     <item msgid="8026148967150231130">"Interner Fehler"</item>
     <item msgid="5442620760791553027">"Serverfehler"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ungelesene"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Mindestens <xliff:g id="COUNT">%1$d</xliff:g> ungelesene"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Weitere Konversationen ansehen"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Wird geladen..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Konto auswählen"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Anmelden"</string>
     <string name="info" msgid="1357564480946178121">"Details"</string>
     <string name="report" msgid="4318141326014579036">"Feedback"</string>
+    <string name="show" msgid="2874876876336599985">"Ansehen"</string>
     <string name="sync_error" msgid="1795794969006241678">"Synchronisierung nicht möglich"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Das Gerät verfügt nicht über genügend Speicherplatz für die Synchronisierung."</string>
     <string name="storage" msgid="4783683938444150638">"Speicher"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5a8bb93..9817e38 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Λήψη των μηνυμάτων σας"</string>
     <string name="undo" msgid="8256285267701059609">"Αναίρεση"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Κατάργηση αστεριού για <xliff:g id="COUNT">%1$d</xliff:g> συνομιλία."</item>
-    <item quantity="other" msgid="7677305734833709789">"Κατάργηση αστεριού για <xliff:g id="COUNT">%1$d</xliff:g> συνομιλίες."</item>
+    <item quantity="one" msgid="1701235480675303125">"Κατάργηση αστεριού για <xliff:g id="COUNT">%1$d</xliff:g> συνομιλία"</item>
+    <item quantity="other" msgid="1154441830432477256">"Κατάργηση αστεριού για <xliff:g id="COUNT">%1$d</xliff:g> συνομιλίες"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; τέθηκε σε σίγαση."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; τέθηκαν σε σίγαση."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία σε σίγαση"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες σε σίγαση"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αναφέρθηκαν ως ανεπιθύμητες."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αναφέρθηκαν ως ανεπιθύμητες."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία αναφέρθηκε ως ανεπιθύμητη"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες αναφέρθηκαν ως ανεπιθύμητες"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αναφορές ως μη ανεπιθύμητες."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αναφορές ως μη ανεπιθύμητες."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία αναφέρθηκε ως μη ανεπιθύμητη"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες αναφέρθηκαν ως μη ανεπιθύμητες"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; επισημάνθηκαν ως μη σημαντικές."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; επισημάνθηκε ως μη σημαντική."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία επισημάνθηκε ως μη σημαντική"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες επισημάνθηκαν ως μη σημαντικές"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αναφορές ηλεκτρονικού ψαρέματος."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αναφορές ηλεκτρονικού ψαρέματος."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία αναφέρθηκε ως απόπειρα ηλεκτρονικού ψαρέματος (phishing)"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες αναφέρθηκαν ως απόπειρες ηλεκτρονικού ψαρέματος (phishing)"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αρχειοθετήθηκαν."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; αρχειοθετήθηκαν."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία αρχειοθετήθηκε"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες αρχειοθετήθηκαν"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; διαγράφηκαν."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; διαγράφηκαν."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλία διαγράφτηκε"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; συνομιλίες διαγράφτηκαν"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Διαγράφηκε"</string>
     <string name="archived" msgid="6283673603512713022">"Αρχειοθετήθηκε"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Καταργήθηκε από το <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Αλλαγή φακέλου."</item>
-    <item quantity="other" msgid="8815390494333090939">"Αλλαγή φακέλων."</item>
+    <item quantity="one" msgid="7787126147584620603">"Αλλαγή φακέλου"</item>
+    <item quantity="other" msgid="6307772984911017972">"Αλλαγή φακέλων"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Μεταφέρθηκε στο φάκελο <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Αποτελέσματα"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Η αναζήτηση δεν υποστηρίζεται σε αυτόν τον λογαριασμό."</string>
     <string name="add_label" msgid="3285338046038610902">"Προσθήκη φακέλου"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Εμφάνιση νέου μηνύματος από το χρήστη <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Εμφάνιση <xliff:g id="COUNT">%1$d</xliff:g> νέων μηνυμάτων."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> νέο μήνυμα"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Λεπτομέρειες&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Απόκρυψη λεπτομερειών"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Προηγούμενο"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Επιτυχία"</item>
-    <item msgid="2972425114100316260">"Δεν υπάρχει σύνδεση."</item>
-    <item msgid="8594593386776437871">"Δεν ήταν δυνατή η σύνδεση."</item>
-    <item msgid="1375193906551623606">"Σφάλμα ασφαλείας."</item>
-    <item msgid="195177374927979967">"Δεν ήταν δυνατός ο συγχρονισμός."</item>
+    <item msgid="2835492307658712596">"Δεν υπάρχει σύνδεση"</item>
+    <item msgid="5932644761344898987">"Δεν ήταν δυνατή η σύνδεση"</item>
+    <item msgid="7335227237106118306">"Σφάλμα ασφάλειας"</item>
+    <item msgid="8148525741623865182">"Συγχρονισμός αδύνατος"</item>
     <item msgid="8026148967150231130">"Εσωτερικό σφάλμα"</item>
     <item msgid="5442620760791553027">"Σφάλμα διακομιστή"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> μη αναγνωσμένα"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ μη αναγνωσμένα"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Προβολή περισσότερων συνομιλιών"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Φόρτωση..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Επιλογή λογαριασμού"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Σύνδεση"</string>
     <string name="info" msgid="1357564480946178121">"Πληροφορίες"</string>
     <string name="report" msgid="4318141326014579036">"Αναφορά"</string>
+    <string name="show" msgid="2874876876336599985">"Προβολή"</string>
     <string name="sync_error" msgid="1795794969006241678">"Δεν ήταν δυνατός ο συγχρονισμός."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Η συσκευή σας δεν διαθέτει επαρκή χώρο αποθήκευσης για συγχρονισμό."</string>
     <string name="storage" msgid="4783683938444150638">"Χώρος αποθήκευσης"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d743dae..f370b36 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Getting your messages"</string>
     <string name="undo" msgid="8256285267701059609">"Undo"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation."</item>
-    <item quantity="other" msgid="7677305734833709789">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversations."</item>
+    <item quantity="one" msgid="1701235480675303125">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation"</item>
+    <item quantity="other" msgid="1154441830432477256">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversations"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked not important."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked not important."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked as not important"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked as not important"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Deleted"</string>
     <string name="archived" msgid="6283673603512713022">"Archived"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Removed from <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Changed folder."</item>
-    <item quantity="other" msgid="8815390494333090939">"Changed folders."</item>
+    <item quantity="one" msgid="7787126147584620603">"Changed folder"</item>
+    <item quantity="other" msgid="6307772984911017972">"Changed folders"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Moved to <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Results"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Search is not supported on this account."</string>
     <string name="add_label" msgid="3285338046038610902">"Add folder"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Show new message from <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Show <xliff:g id="COUNT">%1$d</xliff:g> new messages."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Hide details"</string>
@@ -255,17 +255,17 @@
     <string name="enumeration_comma" msgid="2848850136844740850">", "</string>
     <string name="send_anyway" msgid="2727576121007079643">"Send anyway"</string>
     <string name="ok" msgid="6178802457914802336">"OK"</string>
-    <string name="done" msgid="344354738335270292">"Finished"</string>
+    <string name="done" msgid="344354738335270292">"Done"</string>
     <string name="cancel" msgid="4831678293149626190">"Cancel"</string>
     <string name="clear" msgid="765949970989448022">"Clear"</string>
     <string name="next" msgid="2662478712866255138">"Next"</string>
     <string name="previous" msgid="8985379053279804274">"Previous"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Success"</item>
-    <item msgid="2972425114100316260">"No connection."</item>
-    <item msgid="8594593386776437871">"Couldn\'t sign in."</item>
-    <item msgid="1375193906551623606">"Security error."</item>
-    <item msgid="195177374927979967">"Couldn\'t sync."</item>
+    <item msgid="2835492307658712596">"No connection"</item>
+    <item msgid="5932644761344898987">"Couldn\'t sign in"</item>
+    <item msgid="7335227237106118306">"Security error"</item>
+    <item msgid="8148525741623865182">"Couldn\'t sync"</item>
     <item msgid="8026148967150231130">"Internal Error"</item>
     <item msgid="5442620760791553027">"Server Error"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> unread"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ unread"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"View more conversations"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Loading…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Choose account"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Sign-in"</string>
     <string name="info" msgid="1357564480946178121">"Info"</string>
     <string name="report" msgid="4318141326014579036">"Report"</string>
+    <string name="show" msgid="2874876876336599985">"Show"</string>
     <string name="sync_error" msgid="1795794969006241678">"Couldn\'t sync."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Your device doesn\'t have enough storage space to sync."</string>
     <string name="storage" msgid="4783683938444150638">"Storage"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d743dae..f370b36 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Getting your messages"</string>
     <string name="undo" msgid="8256285267701059609">"Undo"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation."</item>
-    <item quantity="other" msgid="7677305734833709789">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversations."</item>
+    <item quantity="one" msgid="1701235480675303125">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation"</item>
+    <item quantity="other" msgid="1154441830432477256">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversations"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked not important."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked not important."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked as not important"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked as not important"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Deleted"</string>
     <string name="archived" msgid="6283673603512713022">"Archived"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Removed from <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Changed folder."</item>
-    <item quantity="other" msgid="8815390494333090939">"Changed folders."</item>
+    <item quantity="one" msgid="7787126147584620603">"Changed folder"</item>
+    <item quantity="other" msgid="6307772984911017972">"Changed folders"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Moved to <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Results"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Search is not supported on this account."</string>
     <string name="add_label" msgid="3285338046038610902">"Add folder"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Show new message from <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Show <xliff:g id="COUNT">%1$d</xliff:g> new messages."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Hide details"</string>
@@ -255,17 +255,17 @@
     <string name="enumeration_comma" msgid="2848850136844740850">", "</string>
     <string name="send_anyway" msgid="2727576121007079643">"Send anyway"</string>
     <string name="ok" msgid="6178802457914802336">"OK"</string>
-    <string name="done" msgid="344354738335270292">"Finished"</string>
+    <string name="done" msgid="344354738335270292">"Done"</string>
     <string name="cancel" msgid="4831678293149626190">"Cancel"</string>
     <string name="clear" msgid="765949970989448022">"Clear"</string>
     <string name="next" msgid="2662478712866255138">"Next"</string>
     <string name="previous" msgid="8985379053279804274">"Previous"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Success"</item>
-    <item msgid="2972425114100316260">"No connection."</item>
-    <item msgid="8594593386776437871">"Couldn\'t sign in."</item>
-    <item msgid="1375193906551623606">"Security error."</item>
-    <item msgid="195177374927979967">"Couldn\'t sync."</item>
+    <item msgid="2835492307658712596">"No connection"</item>
+    <item msgid="5932644761344898987">"Couldn\'t sign in"</item>
+    <item msgid="7335227237106118306">"Security error"</item>
+    <item msgid="8148525741623865182">"Couldn\'t sync"</item>
     <item msgid="8026148967150231130">"Internal Error"</item>
     <item msgid="5442620760791553027">"Server Error"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> unread"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ unread"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"View more conversations"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Loading…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Choose account"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Sign-in"</string>
     <string name="info" msgid="1357564480946178121">"Info"</string>
     <string name="report" msgid="4318141326014579036">"Report"</string>
+    <string name="show" msgid="2874876876336599985">"Show"</string>
     <string name="sync_error" msgid="1795794969006241678">"Couldn\'t sync."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Your device doesn\'t have enough storage space to sync."</string>
     <string name="storage" msgid="4783683938444150638">"Storage"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bc460e0..c64c4ac 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Cargando mensajes"</string>
     <string name="undo" msgid="8256285267701059609">"Deshacer"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Quitando marca de estrella de <xliff:g id="COUNT">%1$d</xliff:g> conversación"</item>
-    <item quantity="other" msgid="7677305734833709789">"Quitando marca de estrella de <xliff:g id="COUNT">%1$d</xliff:g> conversaciones"</item>
+    <item quantity="one" msgid="1701235480675303125">"Quitando estrella de <xliff:g id="COUNT">%1$d</xliff:g> conversación"</item>
+    <item quantity="other" msgid="1154441830432477256">"Quitando estrella de <xliff:g id="COUNT">%1$d</xliff:g> conversaciones"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Se silenció &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4276111931404654219">"Se silenciaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silenciada"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silenciadas"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación marcada como spam"</item>
-    <item quantity="other" msgid="5900913789259199137">"Se detectaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; como spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; informada como spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; informadas como spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Se marcó &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como deseada."</item>
-    <item quantity="other" msgid="4966164423991098144">"Se marcaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como deseadas."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como deseada"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como deseadas"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Se marcó &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como no importante."</item>
-    <item quantity="other" msgid="1215472798075869124">"Se marcaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como no importantes."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como no importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como no importantes"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Se marcó &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como suplantación de identidad."</item>
-    <item quantity="other" msgid="9218674052779504277">"Se marcaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como suplantación de identidad."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como suplantación de identidad"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como suplantaciones de identidad"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Se archivó &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Se archivaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archivada"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archivadas"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Se eliminó &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"Se eliminaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminada"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminadas"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Eliminada"</string>
     <string name="archived" msgid="6283673603512713022">"Archivada"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Eliminada de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Carpeta modificada"</item>
-    <item quantity="other" msgid="8815390494333090939">"Carpetas modificadas"</item>
+    <item quantity="one" msgid="7787126147584620603">"Carpeta modificada"</item>
+    <item quantity="other" msgid="6307772984911017972">"Carpetas modificadas"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Enviada a <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultados"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Esta cuenta no admite la función de búsqueda."</string>
     <string name="add_label" msgid="3285338046038610902">"Agregar carpeta"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostrar mensaje nuevo de <xliff:g id="SENDER">%s</xliff:g>"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostrar <xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje nuevo"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalles&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalles"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Anterior"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"La acción se realizó correctamente."</item>
-    <item msgid="2972425114100316260">"Sin conexión"</item>
-    <item msgid="8594593386776437871">"No se pudo acceder."</item>
-    <item msgid="1375193906551623606">"Error de seguridad"</item>
-    <item msgid="195177374927979967">"No se pudo establecer la sincronización."</item>
+    <item msgid="2835492307658712596">"Sin conexión"</item>
+    <item msgid="5932644761344898987">"No se pudo acceder."</item>
+    <item msgid="7335227237106118306">"Error de seguridad"</item>
+    <item msgid="8148525741623865182">"No se pudo sincronizar."</item>
     <item msgid="8026148967150231130">"Error interno"</item>
     <item msgid="5442620760791553027">"Error de servidor"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje(s) sin leer"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Más de <xliff:g id="COUNT">%1$d</xliff:g> mensajes sin leer"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ver más conversaciones"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Cargando…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Seleccionar cuenta"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Acceder"</string>
     <string name="info" msgid="1357564480946178121">"Información"</string>
     <string name="report" msgid="4318141326014579036">"Informar"</string>
+    <string name="show" msgid="2874876876336599985">"Mostrar"</string>
     <string name="sync_error" msgid="1795794969006241678">"No se pudo establecer la sincronización."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Tu dispositivo no tiene suficiente espacio de almacenamiento para establecer la sincronización."</string>
     <string name="storage" msgid="4783683938444150638">"Almacenamiento"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0d37bd4..2198c02 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Obteniendo tus mensajes"</string>
     <string name="undo" msgid="8256285267701059609">"Deshacer"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Anulando <xliff:g id="COUNT">%1$d</xliff:g> conversación destacada"</item>
-    <item quantity="other" msgid="7677305734833709789">"Anulando <xliff:g id="COUNT">%1$d</xliff:g> conversaciones destacadas"</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> conversación sin destacar"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> conversaciones sin destacar"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Se ha silenciado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación."</item>
-    <item quantity="other" msgid="4276111931404654219">"Se han silenciado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones."</item>
+    <item quantity="one" msgid="3622533556738049499">"Se ha silenciado <xliff:g id="COUNT">%1$d</xliff:g> conversación"</item>
+    <item quantity="other" msgid="4559007262578295280">"Se han silenciado <xliff:g id="COUNT">%1$d</xliff:g> conversaciones"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Se han denunciado&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones por spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"Se han marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"Se ha informado de &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como spam"</item>
+    <item quantity="other" msgid="664292592683692920">"Se ha informado de &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Se ha marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como deseada."</item>
-    <item quantity="other" msgid="4966164423991098144">"Se han marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como deseadas."</item>
+    <item quantity="one" msgid="3680479171846552641">"Se ha informado de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación no es spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"Se ha informado de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones no son spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Se ha marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como no importante."</item>
-    <item quantity="other" msgid="1215472798075869124">"Se han marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como no importantes."</item>
+    <item quantity="one" msgid="7432667428974709669">"Se ha marcado <xliff:g id="COUNT">%1$d</xliff:g> conversación como no importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"Se han marcado <xliff:g id="COUNT">%1$d</xliff:g> conversaciones como no importantes"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Se ha marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como suplantación de identidad."</item>
-    <item quantity="other" msgid="9218674052779504277">"Se han marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como suplantación de identidad."</item>
+    <item quantity="one" msgid="3511804715065046338">"Se ha denunciado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación por suplantación de identidad"</item>
+    <item quantity="other" msgid="8400382886585779414">"Se han denunciado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones por suplantación de identidad"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Se ha archivado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación."</item>
-    <item quantity="other" msgid="7789480176789922968">"Se han archivado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones."</item>
+    <item quantity="one" msgid="4859172326053399351">"Se ha archivado <xliff:g id="COUNT">%1$d</xliff:g> conversación"</item>
+    <item quantity="other" msgid="8520761617935818623">"Se han archivado <xliff:g id="COUNT">%1$d</xliff:g> conversaciones"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Se ha eliminado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación."</item>
-    <item quantity="other" msgid="7060256058737892078">"Se han eliminado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones."</item>
+    <item quantity="one" msgid="4819167474123685161">"Se ha eliminado <xliff:g id="COUNT">%1$d</xliff:g> conversación"</item>
+    <item quantity="other" msgid="6287534453625638257">"Se han eliminado <xliff:g id="COUNT">%1$d</xliff:g> conversaciones"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Eliminada"</string>
     <string name="archived" msgid="6283673603512713022">"Archivada"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Eliminado de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Carpeta cambiada"</item>
-    <item quantity="other" msgid="8815390494333090939">"Carpetas cambiadas"</item>
+    <item quantity="one" msgid="7787126147584620603">"Se ha cambiado la carpeta"</item>
+    <item quantity="other" msgid="6307772984911017972">"Se han cambiado las carpetas"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Movida a <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultados"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Esta cuenta no admite la función de búsqueda."</string>
     <string name="add_label" msgid="3285338046038610902">"Añadir carpeta"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostrar mensaje nuevo de <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostrar <xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje nuevo"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Detalles&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalles"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Anterior"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Sin errores"</item>
-    <item msgid="2972425114100316260">"Sin conexión"</item>
-    <item msgid="8594593386776437871">"Error al iniciar sesión"</item>
-    <item msgid="1375193906551623606">"Error de seguridad"</item>
-    <item msgid="195177374927979967">"Error al sincronizar"</item>
+    <item msgid="2835492307658712596">"Sin conexión"</item>
+    <item msgid="5932644761344898987">"Error al iniciar sesión"</item>
+    <item msgid="7335227237106118306">"Error de seguridad"</item>
+    <item msgid="8148525741623865182">"No se ha podido sincronizar"</item>
     <item msgid="8026148967150231130">"Error interno"</item>
     <item msgid="5442620760791553027">"Error del servidor"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> no leídos"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Más de <xliff:g id="COUNT">%1$d</xliff:g> no leídos"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ver más conversaciones"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Cargando..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Seleccionar cuenta"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Iniciar sesión"</string>
     <string name="info" msgid="1357564480946178121">"Información"</string>
     <string name="report" msgid="4318141326014579036">"Informar"</string>
+    <string name="show" msgid="2874876876336599985">"Mostrar"</string>
     <string name="sync_error" msgid="1795794969006241678">"Error al sincronizar"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"No hay suficiente espacio en el dispositivo para sincronizar tu correo"</string>
     <string name="storage" msgid="4783683938444150638">"Almacenamiento"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 4cdac04..c9ddc57 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Sõnumite hankimine"</string>
     <string name="undo" msgid="8256285267701059609">"Võta tagasi"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Tärnid eemaldatakse <xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt."</item>
-    <item quantity="other" msgid="7677305734833709789">"Tärnid eemaldatakse <xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt eemaldatakse tärn"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt eemaldatakse tärn"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; summutati."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; summutati."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on vaigistatud"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on vaigistatud"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; märgiti rämpspostiks."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestlusest teatatakse kui rämpspostist."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestluse puhul teatati, et tegemist on rämpspostiga"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestluse puhul teatati, et tegemist on rämpspostiga"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlus märgiti mitte-rämpspostiks."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlust märgiti mitte-rämpspostiks."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestluse puhul teatati, et tegemist pole rämpspostiga"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestluse puhul teatati, et tegemist pole rämpspostiga"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; üksus märgiti ebaoluliseks."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; üksust märgiti ebaoluliseks."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on märgitud ebaoluliseks"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on märgitud ebaoluliseks"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlus märgiti andmepüügiga seotuks."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlust märgiti andmepüügiga seotuks."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestluse puhul teatati, et tegemist on andmepüügiga"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestluse puhul teatati, et tegemist on andmepüügiga"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhiveeriti."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhiveeriti."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on arhiivitud"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on arhiivitud"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kustutati."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kustutati."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on kustutatud"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; on kustutatud"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Kustutatud"</string>
     <string name="archived" msgid="6283673603512713022">"Arhiveeritud"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Eemaldatud kaustast <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Muudetud kaust."</item>
-    <item quantity="other" msgid="8815390494333090939">"Muudetud kaustad."</item>
+    <item quantity="one" msgid="7787126147584620603">"Kausta on muudetud"</item>
+    <item quantity="other" msgid="6307772984911017972">"Kaustu on muudetud"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Teisaldati kausta <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Tulemused"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Sellel kontol ei toetata otsingut."</string>
     <string name="add_label" msgid="3285338046038610902">"Lisa kaust"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Näita uut sõnumit saatjalt <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Näita <xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> uus kiri"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> uut kirja"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Kuva üksikasjad&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Üksikasjade peitmine"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Eelmine"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Õnnestus"</item>
-    <item msgid="2972425114100316260">"Ühendus puudub."</item>
-    <item msgid="8594593386776437871">"Sisselogimine ebaõnnestus."</item>
-    <item msgid="1375193906551623606">"Turvalisuse viga."</item>
-    <item msgid="195177374927979967">"Ei saanud sünkroonida."</item>
+    <item msgid="2835492307658712596">"Ühendus puudub"</item>
+    <item msgid="5932644761344898987">"Sisselogimine ebaõnnestus"</item>
+    <item msgid="7335227237106118306">"Turvaviga"</item>
+    <item msgid="8148525741623865182">"Sünkroonimine ebaõnnestus"</item>
     <item msgid="8026148967150231130">"Sisemine viga"</item>
     <item msgid="5442620760791553027">"Serveri viga"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> on lugemata"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ lugemata"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Kuva rohkem meilivestlusi"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Laadimine …"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Konto valimine"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Logi sisse"</string>
     <string name="info" msgid="1357564480946178121">"Teave"</string>
     <string name="report" msgid="4318141326014579036">"Teavitamine"</string>
+    <string name="show" msgid="2874876876336599985">"Kuva"</string>
     <string name="sync_error" msgid="1795794969006241678">"Ei saanud sünkroonida."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Seadmes pole sünkroonimiseks piisavalt mäluruumi."</string>
     <string name="storage" msgid="4783683938444150638">"Salvestamine"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4fcfc91..6ae3a1c 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Mezuak kargatzen"</string>
     <string name="undo" msgid="8256285267701059609">"Desegin"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> elkarrizketari izarra kentzen."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> elkarrizketari izarra kentzen."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> elkarrizketari izarra kentzen"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> elkarrizketari izarrak kentzen"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezkutatu da."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezkutatu dira."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezkutatu da"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezkutatu dira"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spam gisa markatu da."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spam gisa markatu dira."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spama dela adierazi da"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spama direla adierazi da"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ez-spam gisa markatu da."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ez-spam gisa markatu dira."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spama ez dela adierazi da"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spama ez direla adierazi da"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ez-garrantzitsu gisa markatu da."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ez-garrantzitsu gisa markatu dira."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; garrantzirik gabeko gisa markatu da"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; garrantzirik gabeko gisa markatu dira"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; phishing gisa markatu da."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; phishing gisa markatu dira."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; phishing-a dela adierazi da"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; phishing-a direla adierazi da"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; artxibatu da."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; artxibatu dira."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; artxibatu da"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; artxibatu dira"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezabatu da."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezabatu dira."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezabatu da"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ezabatu dira"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Ezabatuta"</string>
     <string name="archived" msgid="6283673603512713022">"Artxibatuta"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> karpetatik kendu da"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Karpeta aldatu da."</item>
-    <item quantity="other" msgid="8815390494333090939">"Karpetak aldatu dira."</item>
+    <item quantity="one" msgid="7787126147584620603">"Karpeta aldatu da"</item>
+    <item quantity="other" msgid="6307772984911017972">"Karpetak aldatu dira"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> karpetara eraman da"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Emaitzak"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Bilaketa ez da kontu honetan onartzen."</string>
     <string name="add_label" msgid="3285338046038610902">"Gehitu karpeta"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Erakutsi <xliff:g id="SENDER">%s</xliff:g> kontaktuaren mezu berria."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Erakutsi <xliff:g id="COUNT">%1$d</xliff:g> mezu berri."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mezu berri"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> mezu berri"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ikusi xehetasunak&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ezkutatu xehetasunak"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Aurrekoa"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Behar bezala burutu da"</item>
-    <item msgid="2972425114100316260">"Ez dago konexiorik."</item>
-    <item msgid="8594593386776437871">"Ezin izan da saioa hasi."</item>
-    <item msgid="1375193906551623606">"Segurtasun-errorea."</item>
-    <item msgid="195177374927979967">"Ezin izan da sinkronizatu."</item>
+    <item msgid="2835492307658712596">"Ez dago konektatuta"</item>
+    <item msgid="5932644761344898987">"Ezin izan da saioa hasi"</item>
+    <item msgid="7335227237106118306">"Segurtasun-errorea"</item>
+    <item msgid="8148525741623865182">"Ezin izan da sinkronizatu"</item>
     <item msgid="8026148967150231130">"Barneko errorea"</item>
     <item msgid="5442620760791553027">"Zerbitzariaren errorea"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> irakurri gabe"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ irakurri gabe"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ikusi elkarrizketa gehiago"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Kargatzen…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Aukeratu kontua"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Hasi saioa"</string>
     <string name="info" msgid="1357564480946178121">"Informazioa"</string>
     <string name="report" msgid="4318141326014579036">"Eman honen berri"</string>
+    <string name="show" msgid="2874876876336599985">"Erakutsi"</string>
     <string name="sync_error" msgid="1795794969006241678">"Ezin izan da sinkronizatu."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Gailuan ez dago behar adina memoria sinkronizatu ahal izateko."</string>
     <string name="storage" msgid="4783683938444150638">"Memoria"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c3eff93..b56a0be 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"در حال دریافت پیام‌های شما"</string>
     <string name="undo" msgid="8256285267701059609">"لغو"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"در حال حذف ستاره <xliff:g id="COUNT">%1$d</xliff:g> مکالمه."</item>
-    <item quantity="other" msgid="7677305734833709789">"در حال حذف ستاره <xliff:g id="COUNT">%1$d</xliff:g> مکالمه."</item>
+    <item quantity="one" msgid="1701235480675303125">"در حال حذف ستاره <xliff:g id="COUNT">%1$d</xliff:g> مکالمه"</item>
+    <item quantity="other" msgid="1154441830432477256">"در حال حذف ستاره <xliff:g id="COUNT">%1$d</xliff:g> مکالمه"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد نادیده گرفته شد."</item>
-    <item quantity="other" msgid="4276111931404654219">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد نادیده گرفته شد."</item>
+    <item quantity="one" msgid="3622533556738049499">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه بی‌صدا شد"</item>
+    <item quantity="other" msgid="4559007262578295280">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه بی‌صدا شد"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به عنوان هرزنامه گزارش شد."</item>
-    <item quantity="other" msgid="5900913789259199137">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد به‌عنوان هرزنامه گزارش شد."</item>
+    <item quantity="one" msgid="1749550834135461470">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به عنوان هرزنامه گزارش شد"</item>
+    <item quantity="other" msgid="664292592683692920">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به عنوان هرزنامه گزارش شد"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به‌عنوان غیرهرزنامه گزارش شد"</item>
-    <item quantity="other" msgid="4966164423991098144">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به‌عنوان غیرهرزنامه گزارش شد."</item>
+    <item quantity="one" msgid="3680479171846552641">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه به عنوان غیرهرزنامه گزارش شد"</item>
+    <item quantity="other" msgid="6351739502184556635">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه به عنوان غیرهرزنامه گزارش شد"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد به‌عنوان غیرمهم علامت‌گذاری شد."</item>
-    <item quantity="other" msgid="1215472798075869124">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد به‌عنوان غیرمهم علامت‌گذاری شد."</item>
+    <item quantity="one" msgid="7432667428974709669">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه به عنوان غیرمهم علامت‌گذاری شد"</item>
+    <item quantity="other" msgid="4823331037057239763">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه به عنوان غیرمهم علامت‌گذاری شد"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به‌عنوان فیشینگ گزارش شد."</item>
-    <item quantity="other" msgid="9218674052779504277">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به‌عنوان فیشینگ گزارش شد."</item>
+    <item quantity="one" msgid="3511804715065046338">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به عنوان فیشینگ گزارش شد"</item>
+    <item quantity="other" msgid="8400382886585779414">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; به عنوان فیشینگ گزارش شد"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد بایگانی شد."</item>
-    <item quantity="other" msgid="7789480176789922968">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد بایگانی شد."</item>
+    <item quantity="one" msgid="4859172326053399351">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه بایگانی شد"</item>
+    <item quantity="other" msgid="8520761617935818623">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه بایگانی شد"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد حذف شد."</item>
-    <item quantity="other" msgid="7060256058737892078">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مورد حذف شد."</item>
+    <item quantity="one" msgid="4819167474123685161">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه حذف شد"</item>
+    <item quantity="other" msgid="6287534453625638257">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; مکالمه حذف شد"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"حذف شد"</string>
     <string name="archived" msgid="6283673603512713022">"بایگانی شد"</string>
     <string name="folder_removed" msgid="5656281444688183676">"از <xliff:g id="FOLDERNAME">%1$s</xliff:g> حذف شد"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"پوشه تغییر کرد."</item>
-    <item quantity="other" msgid="8815390494333090939">"پوشه‌ها تغییر کردند."</item>
+    <item quantity="one" msgid="7787126147584620603">"پوشه تغییر کرد"</item>
+    <item quantity="other" msgid="6307772984911017972">"پوشه‌ها تغییر کردند"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"به <xliff:g id="FOLDERNAME">%1$s</xliff:g> انتقال یافت"</string>
     <string name="search_results_header" msgid="1529438451150580188">"نتایج"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"جستجو در این حساب پشتیبانی نمی‌شود."</string>
     <string name="add_label" msgid="3285338046038610902">"افزودن پوشه"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"نمایش پیام جدید از <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"نمایش <xliff:g id="COUNT">%1$d</xliff:g> پیام جدید."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> ‏&lt;a href=\'http://www.example.com\'&gt;مشاهده جزئیات&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"پنهان کردن جزئیات"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"قبلی"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"موفق شدید"</item>
-    <item msgid="2972425114100316260">"اتصال برقرار نیست."</item>
-    <item msgid="8594593386776437871">"ورود به برنامه انجام نشد."</item>
-    <item msgid="1375193906551623606">"خطای امنیتی."</item>
-    <item msgid="195177374927979967">"همگام‌سازی انجام نشد."</item>
+    <item msgid="2835492307658712596">"اتصال برقرار نیست"</item>
+    <item msgid="5932644761344898987">"ورود به سیستم ممکن نیست"</item>
+    <item msgid="7335227237106118306">"خطای امنیتی"</item>
+    <item msgid="8148525741623865182">"همگام‌سازی نشد"</item>
     <item msgid="8026148967150231130">"خطای داخلی"</item>
     <item msgid="5442620760791553027">"خطای سرور"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> مورد خوانده نشده"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"بیش از <xliff:g id="COUNT">%1$d</xliff:g> مورد خوانده نشده"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"مشاهده مکالمات بیشتر"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"در حال بارگیری..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"انتخاب حساب"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"ورود به برنامه"</string>
     <string name="info" msgid="1357564480946178121">"اطلاعات"</string>
     <string name="report" msgid="4318141326014579036">"گزارش"</string>
+    <string name="show" msgid="2874876876336599985">"نمایش پیام‌های جدید"</string>
     <string name="sync_error" msgid="1795794969006241678">"همگام‌سازی نشد."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"دستگاه شما فضای ذخیره کافی برای همگام‌سازی ندارد."</string>
     <string name="storage" msgid="4783683938444150638">"محل ذخیره"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fa7bd6f..8977bbb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Viestejäsi noudetaan"</string>
     <string name="undo" msgid="8256285267701059609">"Kumoa"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Poistetaan tähti <xliff:g id="COUNT">%1$d</xliff:g> keskustelusta."</item>
-    <item quantity="other" msgid="7677305734833709789">"Poistetaan tähti <xliff:g id="COUNT">%1$d</xliff:g> keskustelusta."</item>
+    <item quantity="one" msgid="1701235480675303125">"Poistetaan tähti <xliff:g id="COUNT">%1$d</xliff:g> keskustelusta"</item>
+    <item quantity="other" msgid="1154441830432477256">"Poistetaan tähti <xliff:g id="COUNT">%1$d</xliff:g> keskustelusta"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ohitettu."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ohitettu."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ohitettu"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ohitettu"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty roskapostiksi."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty roskapostiksi."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty roskapostiksi"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty roskapostiksi"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty muuksi kuin roskapostiksi."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty muuksi kuin roskapostiksi."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty muuksi kuin roskapostiksi"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty muuksi kuin roskapostiksi"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty ei-tärkeäksi."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty ei-tärkeäksi."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty ei-tärkeäksi"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty ei-tärkeäksi"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty tietojenkalasteluksi."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty tietojenkalasteluksi."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty tietojenkalasteluksi"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty tietojenkalasteluksi"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkistoitu."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkistoitu."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkistoitu"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkistoitu"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; poistettu."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; poistettu."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; poistettu"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; poistettu"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Poistettu"</string>
     <string name="archived" msgid="6283673603512713022">"Arkistoitu"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Poistettu kansiosta <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Kansiota muutettu."</item>
-    <item quantity="other" msgid="8815390494333090939">"Kansioita muutettu."</item>
+    <item quantity="one" msgid="7787126147584620603">"Muuttunut kansio"</item>
+    <item quantity="other" msgid="6307772984911017972">"Muuttuneet kansiot"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Siirretty kansioon <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Tulokset"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Hakua ei voi käyttää tällä tilillä."</string>
     <string name="add_label" msgid="3285338046038610902">"Lisää kansio"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Näytä uusi viesti lähettäjältä <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Näytä <xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> uusi viesti"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Näytä tiedot&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Piilota tiedot"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Edellinen"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Onnistui"</item>
-    <item msgid="2972425114100316260">"Ei yhteyttä."</item>
-    <item msgid="8594593386776437871">"Kirjautuminen ei onnistu."</item>
-    <item msgid="1375193906551623606">"Suojausvirhe."</item>
-    <item msgid="195177374927979967">"Synkronointi epäonnistui."</item>
+    <item msgid="2835492307658712596">"Ei yhteyttä"</item>
+    <item msgid="5932644761344898987">"Kirjautuminen ei onnistu"</item>
+    <item msgid="7335227237106118306">"Suojausvirhe"</item>
+    <item msgid="8148525741623865182">"Synkronointi ei onnistunut"</item>
     <item msgid="8026148967150231130">"Sisäinen virhe"</item>
     <item msgid="5442620760791553027">"Palvelinvirhe"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> lukematonta"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Yli <xliff:g id="COUNT">%1$d</xliff:g> lukematonta"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Näytä lisää keskusteluita"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Ladataan…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Valitse tili"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Kirjaudu sisään"</string>
     <string name="info" msgid="1357564480946178121">"Tietoja"</string>
     <string name="report" msgid="4318141326014579036">"Lähetä palautetta"</string>
+    <string name="show" msgid="2874876876336599985">"Näytä"</string>
     <string name="sync_error" msgid="1795794969006241678">"Synkronointi epäonnistui."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Laitteessa ei ole tarpeeksi tallennustilaa synkronointiin."</string>
     <string name="storage" msgid="4783683938444150638">"Tallentaminen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ae419aa..1f898f9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Chargement de vos messages en cours..."</string>
     <string name="undo" msgid="8256285267701059609">"Annuler"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Suppression de l\'étoile de <xliff:g id="COUNT">%1$d</xliff:g> conversation en cours…"</item>
-    <item quantity="other" msgid="7677305734833709789">"Suppression de l\'étoile de <xliff:g id="COUNT">%1$d</xliff:g> conversations en cours…"</item>
+    <item quantity="one" msgid="1701235480675303125">"Suppression de l\'étoile de <xliff:g id="COUNT">%1$d</xliff:g> conversation en cours…"</item>
+    <item quantity="other" msgid="1154441830432477256">"Suppression de l\'étoile de <xliff:g id="COUNT">%1$d</xliff:g> conversations en cours…"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations ignorées."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations ignorées."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation ignorée"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations ignorées"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme pourriel."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme pourriel."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme pourriel."</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme pourriel."</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme n\'étant pas du pourriel."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme n\'étant pas du pourriel."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme n\'étant pas du pourriel"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme n\'étant pas du pourriel"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme n\'étant pas importante."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme n\'étant pas importantes."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme n\'étant pas importantes."</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme n\'étant pas importantes."</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme étant du hameçonnage."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme étant du hameçonnage."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation signalée comme étant de l\'hameçonnage"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme étant de l\'hameçonnage"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation archivée."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations archivées."</item>
+    <item quantity="one" msgid="4859172326053399351">"<xliff:g id="COUNT">%1$d</xliff:g> conversation archivée."</item>
+    <item quantity="other" msgid="8520761617935818623">"<xliff:g id="COUNT">%1$d</xliff:g> conversations archivées."</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation supprimée."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations supprimées."</item>
+    <item quantity="one" msgid="4819167474123685161">"<xliff:g id="COUNT">%1$d</xliff:g> conversation supprimée."</item>
+    <item quantity="other" msgid="6287534453625638257">"<xliff:g id="COUNT">%1$d</xliff:g> conversations supprimées."</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Supprimé"</string>
     <string name="archived" msgid="6283673603512713022">"Archivée"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Supprimé de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Dossier modifié."</item>
-    <item quantity="other" msgid="8815390494333090939">"Dossiers modifiés."</item>
+    <item quantity="one" msgid="7787126147584620603">"Dossier modifié"</item>
+    <item quantity="other" msgid="6307772984911017972">"Dossiers modifiés"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Déplacée vers <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Résultats"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"La fonctionnalité de recherche n\'est pas compatible avec ce compte."</string>
     <string name="add_label" msgid="3285338046038610902">"Ajouter un dossier"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Afficher le nouveau message envoyé par <xliff:g id="SENDER">%s</xliff:g>"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nouveau message"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Afficher les détails&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Masquer les détails"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Précédent"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Réussite"</item>
-    <item msgid="2972425114100316260">"Aucune connexion"</item>
-    <item msgid="8594593386776437871">"Connexion impossible."</item>
-    <item msgid="1375193906551623606">"Erreur de sécurité."</item>
-    <item msgid="195177374927979967">"Synchronisation impossible."</item>
+    <item msgid="2835492307658712596">"Aucune connexion"</item>
+    <item msgid="5932644761344898987">"Impossible de se connecter."</item>
+    <item msgid="7335227237106118306">"Erreur de sécurité"</item>
+    <item msgid="8148525741623865182">"Impossible d\'effectuer la synchronisation"</item>
     <item msgid="8026148967150231130">"Erreur interne"</item>
     <item msgid="5442620760791553027">"Erreur du serveur"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> non lus"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Plus de <xliff:g id="COUNT">%1$d</xliff:g> non lus"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Afficher plus de conversations"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Chargement en cours..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Sélectionner un compte"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Connexion &amp;#8250;"</string>
     <string name="info" msgid="1357564480946178121">"Renseignements"</string>
     <string name="report" msgid="4318141326014579036">"Signaler"</string>
+    <string name="show" msgid="2874876876336599985">"Afficher"</string>
     <string name="sync_error" msgid="1795794969006241678">"Synchronisation impossible"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Synchronisation impossible, car l\'espace de stockage est insuffisant sur l\'appareil."</string>
     <string name="storage" msgid="4783683938444150638">"Stockage"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2a63154..5e5ec22 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Chargement des messages en cours…"</string>
     <string name="undo" msgid="8256285267701059609">"Annuler"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Désactivation du suivi de <xliff:g id="COUNT">%1$d</xliff:g> conversation en cours…"</item>
-    <item quantity="other" msgid="7677305734833709789">"Désactivation du suivi de <xliff:g id="COUNT">%1$d</xliff:g> conversations en cours…"</item>
+    <item quantity="one" msgid="1701235480675303125">"Annulation du suivi pour <xliff:g id="COUNT">%1$d</xliff:g> conversation"</item>
+    <item quantity="other" msgid="1154441830432477256">"Annulation du suivi pour <xliff:g id="COUNT">%1$d</xliff:g> conversations"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation ignorée."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations ignorées."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation ignorée"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations ignorées"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation signalée comme étant du spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme étant du spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme étant du spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation signalée comme n\'étant pas du spam"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme n\'étant pas du spam"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme n\'étant pas du spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme n\'étant pas du spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme n\'étant pas importante"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme n\'étant pas importantes"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme non importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme non importantes"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation signalée comme étant du phishing"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations signalées comme étant du phishing"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme étant du phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme étant du phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation archivée."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations archivées."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation archivée"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations archivées"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation supprimée."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations supprimées."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation supprimée"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;conversations supprimées"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Supprimé."</string>
     <string name="archived" msgid="6283673603512713022">"Archivé."</string>
     <string name="folder_removed" msgid="5656281444688183676">"Supprimé de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Dossier modifié."</item>
-    <item quantity="other" msgid="8815390494333090939">"Dossiers modifiés."</item>
+    <item quantity="one" msgid="7787126147584620603">"Dossier modifié"</item>
+    <item quantity="other" msgid="6307772984911017972">"Dossiers modifiés"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Déplacée vers <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Résultats"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"La fonctionnalité de recherche n\'est pas compatible avec ce compte."</string>
     <string name="add_label" msgid="3285338046038610902">"Ajouter un dossier"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Afficher le nouveau message envoyé par <xliff:g id="SENDER">%s</xliff:g>"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nouveau message"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Afficher les détails&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Masquer les informations détaillées"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Précédent"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Opération réussie."</item>
-    <item msgid="2972425114100316260">"Aucune connexion"</item>
-    <item msgid="8594593386776437871">"Connexion impossible."</item>
-    <item msgid="1375193906551623606">"Erreur de sécurité."</item>
-    <item msgid="195177374927979967">"Synchronisation impossible."</item>
+    <item msgid="2835492307658712596">"Aucune connexion"</item>
+    <item msgid="5932644761344898987">"Impossible de se connecter."</item>
+    <item msgid="7335227237106118306">"Erreur liée à la sécurité."</item>
+    <item msgid="8148525741623865182">"Impossible d\'effectuer la synchronisation."</item>
     <item msgid="8026148967150231130">"Erreur interne"</item>
     <item msgid="5442620760791553027">"Erreur du serveur."</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> non lus"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Plus de <xliff:g id="COUNT">%1$d</xliff:g> non lus"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Afficher d\'autres conversations"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Chargement en cours…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Sélectionner un compte"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Connexion"</string>
     <string name="info" msgid="1357564480946178121">"Informations"</string>
     <string name="report" msgid="4318141326014579036">"Signaler"</string>
+    <string name="show" msgid="2874876876336599985">"Afficher"</string>
     <string name="sync_error" msgid="1795794969006241678">"Synchronisation impossible"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Synchronisation impossible, car l\'espace de stockage est insuffisant sur l\'appareil."</string>
     <string name="storage" msgid="4783683938444150638">"Stockage"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 7c9998f..2f659f9 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Obtendo as túas mensaxes"</string>
     <string name="undo" msgid="8256285267701059609">"Desfacer"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Desmarcando con estrela <xliff:g id="COUNT">%1$d</xliff:g> conversa."</item>
-    <item quantity="other" msgid="7677305734833709789">"Eliminando estrela <xliff:g id="COUNT">%1$d</xliff:g> conversas."</item>
+    <item quantity="one" msgid="1701235480675303125">"Eliminando a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversa"</item>
+    <item quantity="other" msgid="1154441830432477256">"Eliminando a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversas"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Silenciouse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa."</item>
-    <item quantity="other" msgid="4276111931404654219">"Silenciáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversas."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silenciada"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silenciadas"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa é spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversas son spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"Informouse que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; é spam"</item>
+    <item quantity="other" msgid="664292592683692920">"Informouse que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; son spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa non é spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversas non son spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; non é spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; non son spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Marcouse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa como non importante."</item>
-    <item quantity="other" msgid="1215472798075869124">"Marcáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversas como non importantes."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como non importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como non importantes"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa non é phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa é phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; é phising"</item>
+    <item quantity="other" msgid="8400382886585779414">"Informouse de que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; son phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Arquivouse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa."</item>
-    <item quantity="other" msgid="7789480176789922968">"Arquiváronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversas."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivada"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivadas"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Eliminouse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa."</item>
-    <item quantity="other" msgid="7060256058737892078">"Elimináronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversas."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminada"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminadas"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Eliminada"</string>
     <string name="archived" msgid="6283673603512713022">"Arquivada"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Eliminada de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Cartafol cambiado"</item>
-    <item quantity="other" msgid="8815390494333090939">"Cartafoles cambiados"</item>
+    <item quantity="one" msgid="7787126147584620603">"Cartafol cambiado"</item>
+    <item quantity="other" msgid="6307772984911017972">"Cartafoles cambiados"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Moveuse a <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultados"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Esta conta non admite a busca."</string>
     <string name="add_label" msgid="3285338046038610902">"Engadir cartafol"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostrar nova mensaxe de <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostrar <xliff:g id="COUNT">%1$d</xliff:g> mensaxes novas."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mensaxe nova"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> mensaxes novas"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalles&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalles"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Anterior"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Correcto"</item>
-    <item msgid="2972425114100316260">"Sen conexión"</item>
-    <item msgid="8594593386776437871">"Non se puido iniciar sesión."</item>
-    <item msgid="1375193906551623606">"Erro de seguranza"</item>
-    <item msgid="195177374927979967">"Non se puido sincronizar."</item>
+    <item msgid="2835492307658712596">"Sen conexión"</item>
+    <item msgid="5932644761344898987">"Non se puido iniciar sesión"</item>
+    <item msgid="7335227237106118306">"Erro de seguridade"</item>
+    <item msgid="8148525741623865182">"Non se puido sincronizar"</item>
     <item msgid="8026148967150231130">"Erro interno"</item>
     <item msgid="5442620760791553027">"Erro do servidor"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> non lidas"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Más de <xliff:g id="COUNT">%1$d</xliff:g> non lidos"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ver máis conversas"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Cargando..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Selecciona unha conta"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Iniciar sesión"</string>
     <string name="info" msgid="1357564480946178121">"Información"</string>
     <string name="report" msgid="4318141326014579036">"Enviar comentario"</string>
+    <string name="show" msgid="2874876876336599985">"Mostrar"</string>
     <string name="sync_error" msgid="1795794969006241678">"Non se puido sincronizar."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"O dispositivo non ten espazo de almacenamento suficiente para sincronizar."</string>
     <string name="storage" msgid="4783683938444150638">"Almacenamento"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e209a66..7ec824e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"आपके संदेश प्राप्त हो रहे हैं"</string>
     <string name="undo" msgid="8256285267701059609">"पूर्ववत करें"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> बातचीत के तारांकन हटाए जा रहे हैं."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> बातचीत के तारांकन हटाए जा रहे हैं."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> बातचीत के तारांकन हटाए जा रहे हैं"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> बातचीत के तारांकन हटाए जा रहे हैं"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को म्‍यूट कि‍या गया."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को म्‍यूट कि‍या गया."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को म्‍यूट कि‍या गया"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को म्‍यूट कि‍या गया"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की स्पैम के रूप में रिपोर्ट की गई."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को अनचाहा के रूप में रिपोर्ट किया गया."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की स्पैम के रूप में रिपोर्ट की गई"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की स्पैम के रूप में रिपोर्ट की गई"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को अनचाहा नहीं के रूप में रिपोर्ट किया गया."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को अनचाहा नहीं के रूप में रिपोर्ट किया गया."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की स्पैम नहीं के रूप में रिपोर्ट की गई"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की स्पैम नहीं के रूप में रिपोर्ट की गई"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को महत्‍वपूर्ण नहीं के रूप में चि‍ह्नि‍त कि‍या गया."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को महत्‍वपूर्ण नहीं के रूप में चि‍ह्नि‍त कि‍या गया."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को महत्‍वपूर्ण नहीं के रूप में चि‍ह्नि‍त कि‍या गया"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को महत्‍वपूर्ण नहीं के रूप में चि‍ह्नि‍त कि‍या गया"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को फ़िशिंग के रूप में रिपोर्ट किया गया."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को फ़िशिंग के रूप में रिपोर्ट किया गया."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की फ़िशिंग के रूप में रिपोर्ट की गई"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; की फ़िशिंग के रूप में रिपोर्ट की गई"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को संग्रहीत कि‍या गया."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को संग्रहीत कि‍या गया."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को संग्रहीत कि‍या गया"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को संग्रहीत कि‍या गया"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को हटा दिया गया."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को हटा दिया गया."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को हटा दिया गया"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को हटा दिया गया"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"हटाई गई"</string>
     <string name="archived" msgid="6283673603512713022">"संग्रहीत"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> से निकाला गया"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"फ़ोल्‍डर बदला गया."</item>
-    <item quantity="other" msgid="8815390494333090939">"फ़ोल्डर बदले गए."</item>
+    <item quantity="one" msgid="7787126147584620603">"फ़ोल्‍डर बदल दिया गया."</item>
+    <item quantity="other" msgid="6307772984911017972">"फ़ोल्डर बदल दिए गए."</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> में ले जाया गया"</string>
     <string name="search_results_header" msgid="1529438451150580188">"परिणाम"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"इस खाते पर खोज समर्थित नहीं है."</string>
     <string name="add_label" msgid="3285338046038610902">"फ़ोल्‍डर जोड़ें"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> के नए संदेश दिखाएं."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश दिखाएं."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> नया संदेश"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;विवरण देखें&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"विवरणों को छिपाएं"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"पिछला"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"सफल"</item>
-    <item msgid="2972425114100316260">"कोई कनेक्शन नहीं."</item>
-    <item msgid="8594593386776437871">"प्रवेश नहीं किया जा सका."</item>
-    <item msgid="1375193906551623606">"सुरक्षा त्रुटि."</item>
-    <item msgid="195177374927979967">"समन्‍वयित नहीं किया जा सका."</item>
+    <item msgid="2835492307658712596">"कोई कनेक्शन नहीं"</item>
+    <item msgid="5932644761344898987">"प्रवेश नहीं किया जा सका"</item>
+    <item msgid="7335227237106118306">"सुरक्षा त्रुटि"</item>
+    <item msgid="8148525741623865182">"समन्‍वयन नहीं किया जा सका"</item>
     <item msgid="8026148967150231130">"आंतरिक त्रुटि"</item>
     <item msgid="5442620760791553027">"सर्वर त्रुटि"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> अपठित"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ अपठित"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"अधिक बातचीत देखें"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"लोड हो रहा है…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"खाता चुनें"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"साइन-इन करें"</string>
     <string name="info" msgid="1357564480946178121">"जानकारी"</string>
     <string name="report" msgid="4318141326014579036">"रिपोर्ट करें"</string>
+    <string name="show" msgid="2874876876336599985">"दिखाएं"</string>
     <string name="sync_error" msgid="1795794969006241678">"समन्‍वयित नहीं किया जा सका."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"आपके उपकरण में समन्वयित करने के लिए पर्याप्त संग्रहण स्थान नहीं है."</string>
     <string name="storage" msgid="4783683938444150638">"संग्रहण"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d82bd3f..6f1e74c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Dohvaćamo vaše poruke"</string>
     <string name="undo" msgid="8256285267701059609">"Poništi"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Uklanjanje zvjezdice s <xliff:g id="COUNT">%1$d</xliff:g> razgovora."</item>
-    <item quantity="other" msgid="7677305734833709789">"Uklanjanje zvjezdica s <xliff:g id="COUNT">%1$d</xliff:g> razgovora."</item>
+    <item quantity="one" msgid="1701235480675303125">"Uklanjanje zvjezdice s <xliff:g id="COUNT">%1$d</xliff:g> razgovora"</item>
+    <item quantity="other" msgid="1154441830432477256">"Broj razgovora s uklonjenom zvjezdicom: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Zanemareno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4276111931404654219">"Zanemareno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"Isključen zvuk &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; razgovora"</item>
+    <item quantity="other" msgid="4559007262578295280">"Razgovori s isključenim zvukom: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; razgovor prijavljen kao neželjen."</item>
-    <item quantity="other" msgid="5900913789259199137">"Prijavljeno kao neželjeno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; razgovor prijavljen kao neželjena pošta"</item>
+    <item quantity="other" msgid="664292592683692920">"Broj razgovora prijavljenih kao neželjena pošta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Prijavljeno da nije neželjeni sadržaj: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4966164423991098144">"Prijavljeno da nije neželjeni sadržaj: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3680479171846552641">"Prijavljeno je da &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; razgovor nije neželjena pošta"</item>
+    <item quantity="other" msgid="6351739502184556635">"Broj razgovora za koje je prijavljeno da nisu neželjeno pošta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Označeno kao nevažno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="1215472798075869124">"Označeno kao nevažno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; razgovor označen kao nevažan"</item>
+    <item quantity="other" msgid="4823331037057239763">"Broj razgovora označenih kao nevažnih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Prijavljeno kao krađa identiteta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="9218674052779504277">"Prijavljeno kao krađa identiteta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; razgovor prijavljen za krađu identiteta"</item>
+    <item quantity="other" msgid="8400382886585779414">"Broj razgovora prijavljenih za krađu identiteta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Arhivirano: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Arhivirano: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhivirani razgovor"</item>
+    <item quantity="other" msgid="8520761617935818623">"Arhiviranih razgovora: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Izbrisano: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"Izbrisano: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; izbirsan razgovor"</item>
+    <item quantity="other" msgid="6287534453625638257">"Izbrisanih razgovora: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Izbrisano"</string>
     <string name="archived" msgid="6283673603512713022">"Arhivirano"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Uklonjeno iz mape <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Promijenjena mapa."</item>
-    <item quantity="other" msgid="8815390494333090939">"Promijenjene mape."</item>
+    <item quantity="one" msgid="7787126147584620603">"Promijenjena mapa"</item>
+    <item quantity="other" msgid="6307772984911017972">"Promijenjene mape"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Premješteno u mapu <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Rezultati"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Pretraživanje nije podržano na ovom računu."</string>
     <string name="add_label" msgid="3285338046038610902">"Dodaj mapu"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Pokaži nove poruke pošiljatelja <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Pokaži sljedeći broj novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nova poruka"</item>
+    <item quantity="other" msgid="4085982174357328926">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Prikaz pojedinosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Sakrij detalje"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Prethodno"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Uspjeh"</item>
-    <item msgid="2972425114100316260">"Nema veze."</item>
-    <item msgid="8594593386776437871">"Prijava nije bila moguća."</item>
-    <item msgid="1375193906551623606">"Sigurnosna pogreška."</item>
-    <item msgid="195177374927979967">"Sinkronizacija nije bila moguća."</item>
+    <item msgid="2835492307658712596">"Nema veze"</item>
+    <item msgid="5932644761344898987">"Neuspjela prijava"</item>
+    <item msgid="7335227237106118306">"Sigurnosna pogreška"</item>
+    <item msgid="8148525741623865182">"Sinkronizacija nije moguća"</item>
     <item msgid="8026148967150231130">"Interna pogreška"</item>
     <item msgid="5442620760791553027">"Pogreška poslužitelja"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Nepročitano: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Nepročitano: više od <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Prikaži više razgovora"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Učitavanje…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Odabir računa"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Prijava"</string>
     <string name="info" msgid="1357564480946178121">"Informacije"</string>
     <string name="report" msgid="4318141326014579036">"Prijavi"</string>
+    <string name="show" msgid="2874876876336599985">"Prikaži"</string>
     <string name="sync_error" msgid="1795794969006241678">"Sinkronizacija nije bila moguća."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Uređaj nema dovoljno prostora za pohranu za sinkronizaciju."</string>
     <string name="storage" msgid="4783683938444150638">"Pohrana"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1ac448f..3476712 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Üzenetek lekérése"</string>
     <string name="undo" msgid="8256285267701059609">"Visszavonás"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> beszélgetés csillagozásának megszüntetése."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> beszélgetés csillagozásának megszüntetése."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> beszélgetés csillagozásának megszüntetése"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> beszélgetés csillagozásának megszüntetése"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; lezárva."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; lezárva."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; lezárva"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; lezárva"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spamnek jelölve."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spamnek jelölve."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; jelentve spamként"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; jelentve spamként"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bejelentve nem spamként."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bejelentve nem spamként."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; megjelölve nem spamként"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; megjelölve nem spamként"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; megjelölve nem fontosként."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; megjelölve nem fontosként."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; megjelölve nem fontosként"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; megjelölve nem fontosként"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; jelentve adathalászatként."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; jelentve adathalászatként."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; jelentve adathalászatként"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; jelentve adathalászatként"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiválva."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiválva."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiválva"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiválva"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; törölve."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; törölve."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; törölve"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; törölve"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Törölve"</string>
     <string name="archived" msgid="6283673603512713022">"Archiválva"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Eltávolítva innen: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"A mappa módosult."</item>
-    <item quantity="other" msgid="8815390494333090939">"A mappák módosultak."</item>
+    <item quantity="one" msgid="7787126147584620603">"Módosított mappa"</item>
+    <item quantity="other" msgid="6307772984911017972">"Módosított mappák"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Áthelyezve ide: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Találatok"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"A keresés nem támogatott ebben a fiókban."</string>
     <string name="add_label" msgid="3285338046038610902">"Mappa hozzáadása"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Új üzenetek megjelenítése tőle: <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet megjelenítése."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Részletek megtekintése&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Részletek elrejtése"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Előző"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Sikerült"</item>
-    <item msgid="2972425114100316260">"Nincs kapcsolat."</item>
-    <item msgid="8594593386776437871">"A bejelentkezés sikertelen."</item>
-    <item msgid="1375193906551623606">"Biztonsági hiba."</item>
-    <item msgid="195177374927979967">"A szinkronizálás sikertelen."</item>
+    <item msgid="2835492307658712596">"Nincs kapcsolat"</item>
+    <item msgid="5932644761344898987">"Sikertelen bejelentkezés"</item>
+    <item msgid="7335227237106118306">"Biztonsági hiba"</item>
+    <item msgid="8148525741623865182">"Sikertelen szinkronizálás"</item>
     <item msgid="8026148967150231130">"Belső hiba"</item>
     <item msgid="5442620760791553027">"Szerverhiba"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> olvasatlan"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ olvasatlan"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"További beszélgetések megtekintése"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Betöltés…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Fiók kiválasztása"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Bejelentkezés"</string>
     <string name="info" msgid="1357564480946178121">"Információ"</string>
     <string name="report" msgid="4318141326014579036">"Visszajelzés"</string>
+    <string name="show" msgid="2874876876336599985">"Megjelenítés"</string>
     <string name="sync_error" msgid="1795794969006241678">"A szinkronizálás sikertelen."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Az eszköz nem rendelkezik elegendő tárhellyel a szinkronizáláshoz."</string>
     <string name="storage" msgid="4783683938444150638">"Tárhely"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 2bb8229..aa6c58c 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Հաղորդագրությունները բեռնվում են"</string>
     <string name="undo" msgid="8256285267701059609">"Հետարկել"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> խոսակցություն ապաաստղանշվում է:"</item>
-    <item quantity="other" msgid="7677305734833709789">"Ապաաստղանշվում է <xliff:g id="COUNT">%1$d</xliff:g> զրույց:"</item>
+    <item quantity="one" msgid="1701235480675303125">"Ապաստղանշվում է <xliff:g id="COUNT">%1$d</xliff:g> խոսակցություն"</item>
+    <item quantity="other" msgid="1154441830432477256">"Ապաստղանշվում է <xliff:g id="COUNT">%1$d</xliff:g> խոսակցություն"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; համրեցված է:"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; համրեցված է:"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; խլացված"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; խլացված"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; խոսակցություն նշված է որպես լցոն:"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; զեկուցված է որպես լցոն:"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես սպամ"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես սպամ"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; զեկուցված է որպես ոչ լցոն:"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; զեկուցված է որպես ոչ լցոն:"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես ոչ սպամ"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես ոչ սպամ"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; նշված է որպես ոչ կարևոր:"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; նշված է որպես ոչ կարևոր:"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; նշված՝ որպես ոչ կարևոր"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; նշված՝ որպես ոչ կարևոր"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; զեկուցված է որպես որսում:"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; զեկուցված է որպես որսում:"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես ֆիշինգ"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես ֆիշինգ"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; արխիվացված է:"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; արխիվացված:"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; արխիվացված"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; արխիվացված"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ջնջված է:"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ջնջված:"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ջնջված"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ջնջված"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Ջնջված է"</string>
     <string name="archived" msgid="6283673603512713022">"Արխիվացված"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Հեռացվել է <xliff:g id="FOLDERNAME">%1$s</xliff:g>-ից"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Փոխված թղթապանակ:"</item>
-    <item quantity="other" msgid="8815390494333090939">"Փոխված թղթապանակներ:"</item>
+    <item quantity="one" msgid="7787126147584620603">"Փոխված թղթապանակ"</item>
+    <item quantity="other" msgid="6307772984911017972">"Փոխված թղթապանակներ"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Տեղափոխվել է <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Արդյունքներ"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Որոնումը չի աջակցվում այս հաշվի համար:"</string>
     <string name="add_label" msgid="3285338046038610902">"Ավելացնել թղթապանակ"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Ցույց տալ նոր հաղորդագրությունը <xliff:g id="SENDER">%s</xliff:g>-ից:"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Ցույց տալ <xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն:"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Մանրամասներ&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Թաքցնել մանրամասները"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Նախորդը"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Հաջողվել է"</item>
-    <item msgid="2972425114100316260">"Կապ չկա:"</item>
-    <item msgid="8594593386776437871">"Չհաջողվեց մուտք գործել:"</item>
-    <item msgid="1375193906551623606">"Անվտանգության սխալ:"</item>
-    <item msgid="195177374927979967">"Հնարավոր չէ համաժամեցնել:"</item>
+    <item msgid="2835492307658712596">"Կապ չկա"</item>
+    <item msgid="5932644761344898987">"Հնարավոր չէ մուտք գործել"</item>
+    <item msgid="7335227237106118306">"Անվտանգության սխալ"</item>
+    <item msgid="8148525741623865182">"Չհաջողվեց համաժամեցնել"</item>
     <item msgid="8026148967150231130">"Ներքին սխալ"</item>
     <item msgid="5442620760791553027">"Սերվերի սխալ"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> չընթերցված"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g> + չընթերցված"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Տեսնել այլ զրույցներ"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Բեռնում..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Ընտրեք հաշիվը"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Մուտք գործել"</string>
     <string name="info" msgid="1357564480946178121">"Տեղեկություններ"</string>
     <string name="report" msgid="4318141326014579036">"Զեկուցել"</string>
+    <string name="show" msgid="2874876876336599985">"Ցուցադրել"</string>
     <string name="sync_error" msgid="1795794969006241678">"Հնարավոր չէ համաժամեցնել:"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Ձեր սարքը համաժամեցնելու համար չունի բավարար պահոցի տարածք"</string>
     <string name="storage" msgid="4783683938444150638">"Պահոց"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 967410c..3197a5d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Mendapatkan pesan Anda"</string>
     <string name="undo" msgid="8256285267701059609">"Urungkan"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Meredupkan bintang <xliff:g id="COUNT">%1$d</xliff:g> percakapan."</item>
-    <item quantity="other" msgid="7677305734833709789">"Meredupkan bintang <xliff:g id="COUNT">%1$d</xliff:g> percakapan."</item>
+    <item quantity="one" msgid="1701235480675303125">"Hapus bintang <xliff:g id="COUNT">%1$d</xliff:g> percapakan"</item>
+    <item quantity="other" msgid="1154441830432477256">"Hapus bintang <xliff:g id="COUNT">%1$d</xliff:g> percakapan"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dibungkam."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dibungkam."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tidak ditampilkan"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tidak ditampilkan"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai sebagai tidak penting."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai sebagai tidak penting."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai tidak penting"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai tidak penting"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai phising."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai phising."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarsipkan."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarsipkan."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarsipkan"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarsipkan"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dihapus."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dihapus."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dihapus"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dihapus"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Dihapus"</string>
     <string name="archived" msgid="6283673603512713022">"Diarsipkan"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Hapus dari <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Folder diubah."</item>
-    <item quantity="other" msgid="8815390494333090939">"Folder diubah."</item>
+    <item quantity="one" msgid="7787126147584620603">"Folder diubah"</item>
+    <item quantity="other" msgid="6307772984911017972">"Folder diubah"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Dipindahkan ke <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Hasil"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Penelusuran tidak didukung pada akun ini."</string>
     <string name="add_label" msgid="3285338046038610902">"Tambahkan folder"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Tampilkan pesan baru dari <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Tampilkan <xliff:g id="COUNT">%1$d</xliff:g> pesan baru."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tampilkan detail&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Sembunyikan detail"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Sebelumnya"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Berhasil"</item>
-    <item msgid="2972425114100316260">"Tidak ada sambungan."</item>
-    <item msgid="8594593386776437871">"Tidak dapat masuk."</item>
-    <item msgid="1375193906551623606">"Kesalahan keamanan."</item>
-    <item msgid="195177374927979967">"Tidak dapat menyinkronkan."</item>
+    <item msgid="2835492307658712596">"Tidak ada koneksi"</item>
+    <item msgid="5932644761344898987">"Tidak dapat masuk"</item>
+    <item msgid="7335227237106118306">"Kesalahan keamanan"</item>
+    <item msgid="8148525741623865182">"Tidak dapat menyinkronkan"</item>
     <item msgid="8026148967150231130">"Kesalahan Internal"</item>
     <item msgid="5442620760791553027">"Kesalahan Server"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> belum dibaca"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ belum dibaca"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Lihat percakapan lainnya"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Memuat…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Pilih akun"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Masuk"</string>
     <string name="info" msgid="1357564480946178121">"Info"</string>
     <string name="report" msgid="4318141326014579036">"Laporan"</string>
+    <string name="show" msgid="2874876876336599985">"Tampilkan"</string>
     <string name="sync_error" msgid="1795794969006241678">"Tidak dapat menyinkronkan."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Ruang penyimpanan di perangkat Anda tidak cukup untuk sinkronisasi."</string>
     <string name="storage" msgid="4783683938444150638">"Penyimpanan"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index c348922..f0cb329 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Sækir skeytin þín"</string>
     <string name="undo" msgid="8256285267701059609">"Afturkalla"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Fjarlægir stjörnu af <xliff:g id="COUNT">%1$d</xliff:g> samtali."</item>
-    <item quantity="other" msgid="7677305734833709789">"Stjörnur fjarlægðar af <xliff:g id="COUNT">%1$d</xliff:g> samtölum."</item>
+    <item quantity="one" msgid="1701235480675303125">"Fjarlægir stjörnu af <xliff:g id="COUNT">%1$d</xliff:g> samtali"</item>
+    <item quantity="other" msgid="1154441830432477256">"Fjarlægir stjörnu af <xliff:g id="COUNT">%1$d</xliff:g> samtölum"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; þaggað."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; þögguð."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; þaggað"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; þögguð"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem ruslpóstur."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem ruslpóstur."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem ruslpóstur"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem ruslpóstur"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem ekki ruslpóstur."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem ekki ruslpóstur."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem ekki ruslpóstur"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem ekki ruslpóstur"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem léttvægt."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem léttvæg."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem léttvægt"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkt sem léttvæg"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem vefveiðar."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem vefveiðar."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem vefveiðar"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; tilkynnt sem vefveiðar"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sett í geymslu."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; í geymslu."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; í geymslu"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; í geymslu"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eytt."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eytt."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eytt"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eytt"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Eytt"</string>
     <string name="archived" msgid="6283673603512713022">"Sett í geymslu"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Fjarlægt úr <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Möppu breytt."</item>
-    <item quantity="other" msgid="8815390494333090939">"Möppum breytt."</item>
+    <item quantity="one" msgid="7787126147584620603">"Möppu breytt"</item>
+    <item quantity="other" msgid="6307772984911017972">"Möppum breytt"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Fært í <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Niðurstöður"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Leit er ekki studd á þessum reikningi."</string>
     <string name="add_label" msgid="3285338046038610902">"Bæta möppu við"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Sýna nýtt skeyti sem <xliff:g id="SENDER">%s</xliff:g> sendi."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Sýna <xliff:g id="COUNT">%1$d</xliff:g> ný skeyti."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nýtt skeyti"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> ný skeyti"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Skoða upplýsingar&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Fela upplýsingar"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Til baka"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Tókst"</item>
-    <item msgid="2972425114100316260">"Engin tenging."</item>
-    <item msgid="8594593386776437871">"Innskráning tókst ekki."</item>
-    <item msgid="1375193906551623606">"Öryggisvilla."</item>
-    <item msgid="195177374927979967">"Ekki var hægt að samstilla."</item>
+    <item msgid="2835492307658712596">"Engin tenging"</item>
+    <item msgid="5932644761344898987">"Innskráning tókst ekki"</item>
+    <item msgid="7335227237106118306">"Öryggisvilla"</item>
+    <item msgid="8148525741623865182">"Ekki var hægt að samstilla"</item>
     <item msgid="8026148967150231130">"Innri villa"</item>
     <item msgid="5442620760791553027">"Villa á þjóni"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ólesin"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ ólesin"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Skoða fleiri samtöl"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Hleður…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Velja reikning"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Skrá inn"</string>
     <string name="info" msgid="1357564480946178121">"Upplýsingar"</string>
     <string name="report" msgid="4318141326014579036">"Tilkynna"</string>
+    <string name="show" msgid="2874876876336599985">"Sýna"</string>
     <string name="sync_error" msgid="1795794969006241678">"Ekki var hægt að samstilla."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Ekki er nægt geymslurými í tækinu til að samstilla."</string>
     <string name="storage" msgid="4783683938444150638">"Geymsla"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e7eb1f4..5c79960 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Recupero dei tuoi messaggi in corso"</string>
     <string name="undo" msgid="8256285267701059609">"Annulla"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Rimozione di <xliff:g id="COUNT">%1$d</xliff:g> conversazione da Speciali."</item>
-    <item quantity="other" msgid="7677305734833709789">"Rimozione di <xliff:g id="COUNT">%1$d</xliff:g> conversazioni da Speciali."</item>
+    <item quantity="one" msgid="1701235480675303125">"Rimozione di <xliff:g id="COUNT">%1$d</xliff:g> conversazione da Speciali"</item>
+    <item quantity="other" msgid="1154441830432477256">"Rimozione di <xliff:g id="COUNT">%1$d</xliff:g> conversazioni da Speciali"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; disattivata."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; disattivate."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; disattivata"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; disattivate"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalata come spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalate come spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalata come spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalate come spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalata come non spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalate come non spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalata come non spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalate come non spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; contrassegnata come non importante."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; contrassegnate come non importanti."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; contrassegnata come non importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; contrassegnate come non importanti"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalata come phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalate come phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalata come phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnalate come phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviata."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviate."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviata"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archiviate"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminata."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminate."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminata"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminate"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Eliminata"</string>
     <string name="archived" msgid="6283673603512713022">"Archiviata"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Rimosso da <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Cartella cambiata."</item>
-    <item quantity="other" msgid="8815390494333090939">"Cartelle cambiate."</item>
+    <item quantity="one" msgid="7787126147584620603">"Cartella cambiata"</item>
+    <item quantity="other" msgid="6307772984911017972">"Cartelle cambiate"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Spostata in <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Risultati"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"La ricerca non è supportata per l\'account in uso."</string>
     <string name="add_label" msgid="3285338046038610902">"Aggiungi cartella"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostra nuovo messaggio di <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostra <xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nuovo messaggio"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Vedi dettagli&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Nascondi dettagli"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Indietro"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Operazione riuscita"</item>
-    <item msgid="2972425114100316260">"Nessuna connessione."</item>
-    <item msgid="8594593386776437871">"Accesso non riuscito."</item>
-    <item msgid="1375193906551623606">"Errore di protezione."</item>
-    <item msgid="195177374927979967">"Sincronizzazione non riuscita."</item>
+    <item msgid="2835492307658712596">"Nessuna connessione"</item>
+    <item msgid="5932644761344898987">"Accesso non riuscito"</item>
+    <item msgid="7335227237106118306">"Errore di sicurezza"</item>
+    <item msgid="8148525741623865182">"Impossibile sincronizzare"</item>
     <item msgid="8026148967150231130">"Errore interno"</item>
     <item msgid="5442620760791553027">"Errore server"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> da leggere"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Più di <xliff:g id="COUNT">%1$d</xliff:g> da leggere"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Visualizza altre conversazioni"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Caricamento…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Scegli account"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Accedi"</string>
     <string name="info" msgid="1357564480946178121">"Informazioni"</string>
     <string name="report" msgid="4318141326014579036">"Invia"</string>
+    <string name="show" msgid="2874876876336599985">"Mostra"</string>
     <string name="sync_error" msgid="1795794969006241678">"Sincronizzazione non riuscita."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Il dispositivo non dispone di spazio sufficiente per la sincronizzazione."</string>
     <string name="storage" msgid="4783683938444150638">"Memoria"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1a3d7bf..ca36ac6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"טוען את ההודעות שלך"</string>
     <string name="undo" msgid="8256285267701059609">"ביטול"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"מסיר כוכב משיחה <xliff:g id="COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="7677305734833709789">"מסיר כוכב מ-<xliff:g id="COUNT">%1$d</xliff:g> שיחות."</item>
+    <item quantity="one" msgid="1701235480675303125">"מסיר כוכב משיחה <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="1154441830432477256">"מסיר כוכב מ-<xliff:g id="COUNT">%1$d</xliff:g> שיחות"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הושתקה."</item>
-    <item quantity="other" msgid="4276111931404654219">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הושתקו."</item>
+    <item quantity="one" msgid="3622533556738049499">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הושתקה"</item>
+    <item quantity="other" msgid="4559007262578295280">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הושתקו"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחה כספאם."</item>
-    <item quantity="other" msgid="5900913789259199137">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחו כספאם."</item>
+    <item quantity="one" msgid="1749550834135461470">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחה כספאם"</item>
+    <item quantity="other" msgid="664292592683692920">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחו כספאם"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחה כלא ספאם."</item>
-    <item quantity="other" msgid="4966164423991098144">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחו כלא ספאם."</item>
+    <item quantity="one" msgid="3680479171846552641">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחה כשיחה שאינה ספאם"</item>
+    <item quantity="other" msgid="6351739502184556635">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחו כשיחות שאינן ספאם"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; סומנה כלא חשובה."</item>
-    <item quantity="other" msgid="1215472798075869124">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; סומנו כלא חשובות."</item>
+    <item quantity="one" msgid="7432667428974709669">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; סומנה כלא חשובה"</item>
+    <item quantity="other" msgid="4823331037057239763">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; סומנו כלא חשובות"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחה כהתחזות."</item>
-    <item quantity="other" msgid="9218674052779504277">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחו כהתחזות."</item>
+    <item quantity="one" msgid="3511804715065046338">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחה כדיוג"</item>
+    <item quantity="other" msgid="8400382886585779414">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; דווחו כדיוג"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הועברה לארכיון."</item>
-    <item quantity="other" msgid="7789480176789922968">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הועברו לארכיון."</item>
+    <item quantity="one" msgid="4859172326053399351">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הועברה לארכיון"</item>
+    <item quantity="other" msgid="8520761617935818623">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; הועברו לארכיון"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; נמחקה."</item>
-    <item quantity="other" msgid="7060256058737892078">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; נמחקו."</item>
+    <item quantity="one" msgid="4819167474123685161">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; נמחקה"</item>
+    <item quantity="other" msgid="6287534453625638257">"‏&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; נמחקו"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"נמחקה"</string>
     <string name="archived" msgid="6283673603512713022">"הועברה לארכיון"</string>
     <string name="folder_removed" msgid="5656281444688183676">"הוסרה מ-<xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"התיקיה שונתה."</item>
-    <item quantity="other" msgid="8815390494333090939">"התיקיות שונו."</item>
+    <item quantity="one" msgid="7787126147584620603">"התיקייה שונתה"</item>
+    <item quantity="other" msgid="6307772984911017972">"התיקיות שונו"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"הועברה אל <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"תוצאות"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"חיפוש אינו נתמך בחשבון זה."</string>
     <string name="add_label" msgid="3285338046038610902">"הוסף תיקיה"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"הצג הודעות חדשות מ-<xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"הצג <xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"הודעה חדשה <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;פרטים&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"הסתר פרטים"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"הקודם"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"בוצע בהצלחה"</item>
-    <item msgid="2972425114100316260">"אין חיבור."</item>
-    <item msgid="8594593386776437871">"הכניסה נכשלה."</item>
-    <item msgid="1375193906551623606">"שגיאת אבטחה."</item>
-    <item msgid="195177374927979967">"הסנכרון נכשל."</item>
+    <item msgid="2835492307658712596">"אין חיבור"</item>
+    <item msgid="5932644761344898987">"לא ניתן להיכנס"</item>
+    <item msgid="7335227237106118306">"שגיאת אבטחה"</item>
+    <item msgid="8148525741623865182">"הסנכרון נכשל"</item>
     <item msgid="8026148967150231130">"שגיאה פנימית"</item>
     <item msgid="5442620760791553027">"שגיאת שרת"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> לא נקראו"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ לא נקראו"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"הצג שיחות נוספות"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"טוען..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"בחר חשבון"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"היכנס"</string>
     <string name="info" msgid="1357564480946178121">"מידע"</string>
     <string name="report" msgid="4318141326014579036">"דווח"</string>
+    <string name="show" msgid="2874876876336599985">"הצג"</string>
     <string name="sync_error" msgid="1795794969006241678">"הסנכרון נכשל."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"אין במכשיר מספיק שטח אחסון על מנת לבצע סנכרון."</string>
     <string name="storage" msgid="4783683938444150638">"אחסון"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 796a576..e51b2b7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"メッセージを取得しています"</string>
     <string name="undo" msgid="8256285267701059609">"元に戻す"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドからスターを外しています。"</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドからスターを外しています。"</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドからスターを外しています"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドからスターを外しています"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をミュートしました。"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をミュートしました。"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をミュートしました"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をミュートしました"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールとして報告しました。"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールとして報告しました。"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールとして報告しました"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールとして報告しました"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールではないメールとして報告しました。"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールではないメールとして報告しました。"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールではないメールとして報告しました"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールではないメールとして報告しました"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件の重要マークを外しました。"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件の重要マークを外しました。"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件の重要マークを外しました"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件の重要マークを外しました"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をフィッシングとして報告しました。"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をフィッシングとして報告しました。"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をフィッシングとして報告しました"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をフィッシングとして報告しました"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をアーカイブしました。"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をアーカイブしました。"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をアーカイブしました"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をアーカイブしました"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を削除しました。"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を削除しました。"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を削除しました"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を削除しました"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"削除済み"</string>
     <string name="archived" msgid="6283673603512713022">"アーカイブ済み"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>から削除しました"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"フォルダを変更しました。"</item>
-    <item quantity="other" msgid="8815390494333090939">"フォルダを変更しました。"</item>
+    <item quantity="one" msgid="7787126147584620603">"フォルダを変更しました"</item>
+    <item quantity="other" msgid="6307772984911017972">"フォルダを変更しました"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>に移動しました"</string>
     <string name="search_results_header" msgid="1529438451150580188">"検索結果"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"このアカウントでは検索をご利用いただけません。"</string>
     <string name="add_label" msgid="3285338046038610902">"フォルダを追加"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g>さんからの新着メールを表示"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g>通の新着メールを表示"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g>&lt;a href=\'http://www.example.com\'&gt;詳細を表示&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"詳細を表示しない"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"前へ"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"完了"</item>
-    <item msgid="2972425114100316260">"接続できません。"</item>
-    <item msgid="8594593386776437871">"ログインできませんでした。"</item>
-    <item msgid="1375193906551623606">"セキュリティエラー"</item>
-    <item msgid="195177374927979967">"同期できませんでした。"</item>
+    <item msgid="2835492307658712596">"接続なし"</item>
+    <item msgid="5932644761344898987">"ログインできませんでした"</item>
+    <item msgid="7335227237106118306">"セキュリティエラー"</item>
+    <item msgid="8148525741623865182">"同期できませんでした"</item>
     <item msgid="8026148967150231130">"内部エラー"</item>
     <item msgid="5442620760791553027">"サーバーエラー"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g>件の未読"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>件以上の未読"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"他のスレッドを見る"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"読み込んでいます..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"アカウントを選択"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"ログイン"</string>
     <string name="info" msgid="1357564480946178121">"情報"</string>
     <string name="report" msgid="4318141326014579036">"報告"</string>
+    <string name="show" msgid="2874876876336599985">"表示"</string>
     <string name="sync_error" msgid="1795794969006241678">"同期できませんでした。"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"お使いの端末には十分な空き容量がないため同期できません。"</string>
     <string name="storage" msgid="4783683938444150638">"容量"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 776cd46..77b536e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"თქვენი შეტყობინებების მიღება"</string>
     <string name="undo" msgid="8256285267701059609">"დაბრუნება"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> მიმოწერას მოეხსნა ვარსკვლავით მონიშვნა."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> მიმოწერას მოეხსნება ვარსკვლავით მონიშვნა."</item>
+    <item quantity="one" msgid="1701235480675303125">"ვარსკვლავით მონიშვნა მოეხსნა <xliff:g id="COUNT">%1$d</xliff:g> მიმოწერას"</item>
+    <item quantity="other" msgid="1154441830432477256">"ვარსკვლავით მონიშვნა მოეხსნა <xliff:g id="COUNT">%1$d</xliff:g> მიმოწერას"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დადუმებულია."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დადუმებულია."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დადუმებულია"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დადუმებულია"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა სპამად."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მონიშნულია სპამად."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა სპამად"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა სპამად"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოეხსნა სპამად მონიშვნა."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოეხსნება სპამის მონიშვნა."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;-ს მოეხსნა სპამად მონიშვნა"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;-ს მოეხსნა სპამად მონიშვნა"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მონიშნა უმნიშვნელოდ."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა უმნიშვნელოდ."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა უმნიშვნელოდ"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა უმნიშვნელოდ"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა ფიშინგად."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა ფიშინგად."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა ფიშინგად"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; მოინიშნა ფიშინგად"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დაარქივებულია."</item>
-    <item quantity="other" msgid="7789480176789922968">"დაარქივებულია &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დაარქივდა"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; დაარქივდა"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; წაშლილია."</item>
-    <item quantity="other" msgid="7060256058737892078">"წაშლილია &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; წაიშალა"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; წაიშალა"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"წაშლილი"</string>
     <string name="archived" msgid="6283673603512713022">"დაარქივებული"</string>
     <string name="folder_removed" msgid="5656281444688183676">"წაშლილია <xliff:g id="FOLDERNAME">%1$s</xliff:g>-დან"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"საქაღალდე შეცვლილია."</item>
-    <item quantity="other" msgid="8815390494333090939">"საქაღალდეები შეცვლილია."</item>
+    <item quantity="one" msgid="7787126147584620603">"შეცვლილი საქაღალდე"</item>
+    <item quantity="other" msgid="6307772984911017972">"შეცვლილი საქაღალდეები"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"გადატანილია <xliff:g id="FOLDERNAME">%1$s</xliff:g>-ში"</string>
     <string name="search_results_header" msgid="1529438451150580188">"შედეგები"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ძიება ამ ანგარიშში არ არის მხარდაჭერილი."</string>
     <string name="add_label" msgid="3285338046038610902">"საქაღალდის დამატება"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g>-დან მიღებული ახალი შეტყობინების ჩვენება."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> ახალი შეტყობინების ჩვენება."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ახალი შეტყობინება"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> ახალი შეტყობინება"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"დეტალების დამალვა"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"წინა"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"წარმატებით შესრულდა"</item>
-    <item msgid="2972425114100316260">"კავშირი არ არის"</item>
-    <item msgid="8594593386776437871">"შესვლა ვერ მოხერხდა."</item>
-    <item msgid="1375193906551623606">"უსაფრთხოების შეცდომა."</item>
-    <item msgid="195177374927979967">"სინქრონიზაცია ვერ მოხერხდა."</item>
+    <item msgid="2835492307658712596">"კავშირი არ არის"</item>
+    <item msgid="5932644761344898987">"შესვლა ვერ მოხერხდა"</item>
+    <item msgid="7335227237106118306">"უსაფრთხოების შეცდომა"</item>
+    <item msgid="8148525741623865182">"სინქრონიზაცია ვერ მოხერხდა"</item>
     <item msgid="8026148967150231130">"შიდა შეცდომა"</item>
     <item msgid="5442620760791553027">"სერვერის შეცდომა"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> წაუკითხავი"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ წაუკითხავი"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"მეტი მიმოწერის ნახვა"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"იტვირთება..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"ანგარიშის არჩევა"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"შესვლა"</string>
     <string name="info" msgid="1357564480946178121">"ინფო"</string>
     <string name="report" msgid="4318141326014579036">"შეტყობინება"</string>
+    <string name="show" msgid="2874876876336599985">"ჩვენება"</string>
     <string name="sync_error" msgid="1795794969006241678">"სინქრონიზაცია ვერ მოხერხდა."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"თქვენ მოწყობილობის მეხსიერების საცავში არ არის სინქრონიზაციისთვის საჭირო თავისუფალი ადგილი."</string>
     <string name="storage" msgid="4783683938444150638">"საცავი"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 49dc941..5fc775d 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -174,53 +174,33 @@
     <string name="empty_folder" msgid="3227552635613553855">"Бұл жерде пошта жоқ."</string>
     <string name="getting_messages" msgid="8403333791332403244">"Хабарларды алу"</string>
     <string name="undo" msgid="8256285267701059609">"Болдырмау"</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> сөйлесімнің жұлдызшасы алынуда."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> сөйлесімнен белгі алынды."</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; дыбысы өшірілді."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; дыбысы өшірілді."</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам ретінде хабарланды."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам ретінде хабарланды."</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам емес деп белгіленді."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам емес деп белгіленді."</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; маңызды емес деп белгіленді."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; маңызды емес деп белгіленді."</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; фишинг ретінде белгіленді."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; фишинг ретінде белгіленді."</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; мұрағатталды."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; мұрағатталды."</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; жойылды."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; жойылды."</item>
-  </plurals>
+    <!-- no translation found for conversation_unstarred:one (1701235480675303125) -->
+    <!-- no translation found for conversation_unstarred:other (1154441830432477256) -->
+    <!-- no translation found for conversation_muted:one (3622533556738049499) -->
+    <!-- no translation found for conversation_muted:other (4559007262578295280) -->
+    <!-- no translation found for conversation_spammed:one (1749550834135461470) -->
+    <!-- no translation found for conversation_spammed:other (664292592683692920) -->
+    <!-- no translation found for conversation_not_spam:one (3680479171846552641) -->
+    <!-- no translation found for conversation_not_spam:other (6351739502184556635) -->
+    <!-- no translation found for conversation_not_important:one (7432667428974709669) -->
+    <!-- no translation found for conversation_not_important:other (4823331037057239763) -->
+    <!-- no translation found for conversation_phished:one (3511804715065046338) -->
+    <!-- no translation found for conversation_phished:other (8400382886585779414) -->
+    <!-- no translation found for conversation_archived:one (4859172326053399351) -->
+    <!-- no translation found for conversation_archived:other (8520761617935818623) -->
+    <!-- no translation found for conversation_deleted:one (4819167474123685161) -->
+    <!-- no translation found for conversation_deleted:other (6287534453625638257) -->
     <string name="deleted" msgid="7378013910782008375">"Жойылды"</string>
     <string name="archived" msgid="6283673603512713022">"Мұрағатталды"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> ішінен жойылды"</string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Өзгертілген қалта."</item>
-    <item quantity="other" msgid="8815390494333090939">"Өзгертілген қалталар."</item>
-  </plurals>
+    <!-- no translation found for conversation_folder_changed:one (7787126147584620603) -->
+    <!-- no translation found for conversation_folder_changed:other (6307772984911017972) -->
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> ішіне жылжытылды"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Нәтижелер"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Бұл есептік жазбада іздеуге қолдау көрсетілмейді."</string>
     <string name="add_label" msgid="3285338046038610902">"Қалта қосу"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> жіберген жаңа хабарды көрсету."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> жаңа хабар көрсету."</item>
-  </plurals>
+    <!-- no translation found for new_incoming_messages:one (1532079301006372605) -->
+    <!-- no translation found for new_incoming_messages:other (4085982174357328926) -->
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Мәліметтерді көру&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Мәліметтерді жасыру"</string>
     <string name="to_message_header" msgid="3954385178027011919">"Алушы: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
@@ -263,15 +243,10 @@
     <string name="clear" msgid="765949970989448022">"Тазалау"</string>
     <string name="next" msgid="2662478712866255138">"Келесі"</string>
     <string name="previous" msgid="8985379053279804274">"Алдыңғы"</string>
-  <string-array name="sync_status">
-    <item msgid="4600303222943450797">"Сәтті"</item>
-    <item msgid="2972425114100316260">"Байланыс жоқ."</item>
-    <item msgid="8594593386776437871">"Жүйеге кіру мүмкін болмады."</item>
-    <item msgid="1375193906551623606">"Қауіпсіздік қатесі."</item>
-    <item msgid="195177374927979967">"Синхрондау мүмкін болмады."</item>
-    <item msgid="8026148967150231130">"Ішкі қате"</item>
-    <item msgid="5442620760791553027">"Сервер қатесі"</item>
-  </string-array>
+    <!-- no translation found for sync_status:1 (2835492307658712596) -->
+    <!-- no translation found for sync_status:2 (5932644761344898987) -->
+    <!-- no translation found for sync_status:3 (7335227237106118306) -->
+    <!-- no translation found for sync_status:4 (8148525741623865182) -->
     <string name="tap_to_configure" msgid="137172348280050643">"Реттеу үшін түртіңіз."</string>
     <string name="non_synced_folder_description" msgid="3044618511909304701">"Сөйлесімдерді көру үшін осы қалтаны синхрондаңыз."</string>
     <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Қалтаны синхрондау"</string>
@@ -281,7 +256,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> оқылмаған"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ оқылмаған"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Қосымша сөйлесімдерді көру"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Жүктелуде…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Есептік жазба таңдау"</string>
@@ -315,6 +289,8 @@
     <string name="signin" msgid="4699091478139791244">"Кіру"</string>
     <string name="info" msgid="1357564480946178121">"Ақпарат"</string>
     <string name="report" msgid="4318141326014579036">"Есеп беру"</string>
+    <!-- no translation found for show (2874876876336599985) -->
+    <skip />
     <string name="sync_error" msgid="1795794969006241678">"Синхрондау мүмкін болмады."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Синхрондау үшін құрылғыңызда сақтау орны жеткіліксіз."</string>
     <string name="storage" msgid="4783683938444150638">"Жад"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ba1d550..a9b09d0 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"ទទួល​​សារ​របស់​អ្នក"</string>
     <string name="undo" msgid="8256285267701059609">"មិន​ធ្វើ​វិញ"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"មិន​ដាក់​ផ្កាយ​ការ​សន្ទនា <xliff:g id="COUNT">%1$d</xliff:g> ​។"</item>
-    <item quantity="other" msgid="7677305734833709789">"មិន​ដាក់​ផ្កាយ​ការ​សន្ទនា <xliff:g id="COUNT">%1$d</xliff:g> ។"</item>
+    <item quantity="one" msgid="1701235480675303125">"ដោះ​ផ្កាយ​ <xliff:g id="COUNT">%1$d</xliff:g> ការ​សន្ទនា"</item>
+    <item quantity="other" msgid="1154441830432477256">"ដោះ​ផ្កាយ​ <xliff:g id="COUNT">%1$d</xliff:g> ការ​សន្ទនា"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"បាន​ដកចេញ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
-    <item quantity="other" msgid="4276111931404654219">"បាន​​ដកចេញ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ។"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​បិទ​សំឡេង"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​បិទ​សំឡេង"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​ជា​សារ​ឥត​បាន​ការ។"</item>
-    <item quantity="other" msgid="5900913789259199137">"បាន​រាយការណ៍​ថា​ជា​សារ​ឥត​បានការ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ។"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​ជា​សារ​ឥត​បាន​ការ"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​ជា​សារ​ឥត​បាន​ការ"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"បាន​រាយការណ៍​មិន​មែន​ជា​សារ​ឥត​បាន​ការ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
-    <item quantity="other" msgid="4966164423991098144">"បាន​រាយការណ៍​មិន​មែន​ជា​សារ​ឥត​បាន​ការ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​មិន​មែន​ជា​សារ​ឥត​បាន​ការ"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​មិន​មែន​ជា​សារ​ឥត​បាន​ការ"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"បាន​សម្គាល់​ថា​មិន​សំខាន់ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="1215472798075869124">"បាន​សម្គាល់​ថា​មិន​សំខាន់ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​សម្គាល់​ថា​មិន​សំខាន់"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​សម្គាល់​ថា​មិន​សំខាន់"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"បាន​រាយការណ៍​ថា​ជា​ការ​បន្លំ​ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
-    <item quantity="other" msgid="9218674052779504277">"បាន​រាយការណ៍​ថា​ជា​ការ​បន្លំ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​ជា​ការ​ឆបោក"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​រាយការណ៍​ថា​ជា​ការ​ឆបោក"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"បាន​ទុក​ក្នុង​ប័ណ្ណសារ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="7789480176789922968">"បាន​ទុក​ក្នុង​ប័ណ្ណសារ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​ទុក​ក្នុង​ប័ណ្ណ​សារ"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​ទុក​ក្នុង​ប័ណ្ណ​សារ"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"បាន​លុប &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
-    <item quantity="other" msgid="7060256058737892078">"បាន​លុប &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;។"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​លុប"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; បាន​លុប"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"បាន​លុប"</string>
     <string name="archived" msgid="6283673603512713022">"ប័ណ្ណសារ"</string>
     <string name="folder_removed" msgid="5656281444688183676">"បាន​យក​ចេញ​ពី <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"បាន​ប្ដូរ​ថត។"</item>
-    <item quantity="other" msgid="8815390494333090939">"បាន​ប្ដូរ​ថត។"</item>
+    <item quantity="one" msgid="7787126147584620603">"ថត​ដែល​បាន​ផ្លាស់​ប្តូរ"</item>
+    <item quantity="other" msgid="6307772984911017972">"ថត​ដែល​បាន​ផ្លាស់​ប្តូរ"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"បាន​ផ្លាស់​ទី​ទៅ <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"លទ្ធផល"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"មិន​គាំទ្រ​ការ​ស្វែងរក​​នៅ​លើ​គណនី​នេះ​។"</string>
     <string name="add_label" msgid="3285338046038610902">"បន្ថែម​ថត"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"បង្ហាញ​សារ​ថ្មី​ពី <xliff:g id="SENDER">%s</xliff:g>។"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"បង្ហាញ​សារ​ថ្មី <xliff:g id="COUNT">%1$d</xliff:g>។"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"សារ​ថ្មី​ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="4085982174357328926">"សារ​ថ្មី​ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;មើលព័ត៌មានលម្អិត&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"លាក់​ព័ត៌មាន​​លម្អិត"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"មុន"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"ជោគជ័យ"</item>
-    <item msgid="2972425114100316260">"គ្មាន​​តំណ​​​ភ្ជាប់​។"</item>
-    <item msgid="8594593386776437871">"មិន​អាច​ចូល។"</item>
-    <item msgid="1375193906551623606">"កំហុស​​​សុវត្ថិភាព។"</item>
-    <item msgid="195177374927979967">"មិន​អាច​​ធ្វើ​សម​កាល​កម្ម​។"</item>
+    <item msgid="2835492307658712596">"គ្មាន​ការ​តភ្ជាប់"</item>
+    <item msgid="5932644761344898987">"មិន​អាច​ចូល"</item>
+    <item msgid="7335227237106118306">"កំហុស​​​​​សុវត្ថិភាព​"</item>
+    <item msgid="8148525741623865182">"មិន​អាច​ធ្វើ​សម​កាល​កម្ម"</item>
     <item msgid="8026148967150231130">"កំហុស​ខាង​ក្នុង"</item>
     <item msgid="5442620760791553027">"កំហុស​ម៉ាស៊ីន​មេ"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"មិន​ទាន់​អាន <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"មិន​​ទាន់​អាន <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"មើល​ការ​សន្ទនា​​​ច្រើន​​ទៀត"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"កំពុង​ផ្ទុក…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"ជ្រើស​គណនី"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"ចូល"</string>
     <string name="info" msgid="1357564480946178121">"ព័ត៌មាន"</string>
     <string name="report" msgid="4318141326014579036">"រាយការណ៍"</string>
+    <string name="show" msgid="2874876876336599985">"បង្ហាញ"</string>
     <string name="sync_error" msgid="1795794969006241678">"មិន​អាច​​ធ្វើ​សម​កាល​កម្ម​។"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"ឧបករណ៍​​របស់​អ្នក​មិន​មាន​ទំហំ​គ្រប់គ្រាន់​ ដើម្បី​ផ្ទុក​សម្រាប់​ធ្វើ​​សម​កាល​កម្ម​។"</string>
     <string name="storage" msgid="4783683938444150638">"ការ​ផ្ទុក"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f05527d..23de01d 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದು"</string>
     <string name="undo" msgid="8256285267701059609">"ರದ್ದುಮಾಡು"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> ಸಂವಾದದಲ್ಲಿ ನಕ್ಷತ್ರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತಿದೆ."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> ನಕ್ಷತ್ರ ತೆಗೆದುಹಾಕಿರುವ ಸಂವಾದಗಳು."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> ಸಂವಾದದಲ್ಲಿ ನಕ್ಷತ್ರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತಿದೆ"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> ಸಂವಾದಗಳಲ್ಲಿ ನಕ್ಷತ್ರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತಿದೆ"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಮುಖ್ಯವಾದುದಲ್ಲ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮುಖ್ಯವಾದುದಲ್ಲ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮುಖ್ಯವಾದುದಲ್ಲ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಮುಖ್ಯವಾದುದಲ್ಲ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಫಿಶಿಂಗ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಫಿಶಿಂಗ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಫಿಶಿಂಗ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಫಿಶಿಂಗ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಆರ್ಕೈವ್‌‌ ಮಾಡಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಆರ್ಕೈವ್‌‌ ಮಾಡಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಆರ್ಕೈವ್ ಮಾಡಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಆರ್ಕೈವ್ ಮಾಡಲಾಗಿದೆ"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ಅಳಿಸಲಾಗಿದೆ"</string>
     <string name="archived" msgid="6283673603512713022">"ಆರ್ಕೈವ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> ನಿಂದ ತೆಗೆದು ಹಾಕಲಾಗಿದೆ"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"ಫೋಲ್ಡರ್ ಬದಲಿಸಲಾಗಿದೆ."</item>
-    <item quantity="other" msgid="8815390494333090939">"ಫೋಲ್ಡರ್‍ಗಳನ್ನು ಬದಲಿಸಲಾಗಿದೆ."</item>
+    <item quantity="one" msgid="7787126147584620603">"ಫೋಲ್ಡರ್ ಬದಲಾಯಿಸಲಾಗಿದೆ"</item>
+    <item quantity="other" msgid="6307772984911017972">"ಫೋಲ್ಡರ್‍ಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> ಗೆ ಸರಿಸಲಾಗಿದೆ"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ಫಲಿತಾಂಶಗಳು"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ಈ ಖಾತೆಯಲ್ಲಿ ಹುಡುಕಾಟ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ."</string>
     <string name="add_label" msgid="3285338046038610902">"ಫೋಲ್ಡರ್ ಸೇರಿಸಿ"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> ಅವರಿಂದ ಹೊಸ ಸಂದೇಶ ತೋರಿಸು."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> ಹೊಸ ಸಂದೇಶಗಳನ್ನು ತೋರಿಸು."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ಹೊಸ ಸಂದೇಶ"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> ಹೊಸ ಸಂದೇಶಗಳು"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ವಿವರಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"ಹಿಂದೆ"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"ಯಶಸ್ವಿಯಾಗಿದೆ"</item>
-    <item msgid="2972425114100316260">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ."</item>
-    <item msgid="8594593386776437871">"ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಲಿಲ್ಲ."</item>
-    <item msgid="1375193906551623606">"ಭದ್ರತಾ ದೋಷ."</item>
-    <item msgid="195177374927979967">"ಸಿಂಕ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</item>
+    <item msgid="2835492307658712596">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ"</item>
+    <item msgid="5932644761344898987">"ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</item>
+    <item msgid="7335227237106118306">"ಸುರಕ್ಷತಾ ದೋಷ"</item>
+    <item msgid="8148525741623865182">"ಸಿಂಕ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</item>
     <item msgid="8026148967150231130">"ಆಂತರಿಕ ದೋಷ"</item>
     <item msgid="5442620760791553027">"ಸರ್ವರ್ ದೋಷ"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ಓದದಿರುವುದು"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ ಓದದಿರುವುದು"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"ಇನ್ನಷ್ಟು ಸಂವಾದಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"ಖಾತೆಯನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"ಸೈನ್-ಇನ್"</string>
     <string name="info" msgid="1357564480946178121">"ಮಾಹಿತಿ"</string>
     <string name="report" msgid="4318141326014579036">"ವರದಿ ಮಾಡು"</string>
+    <string name="show" msgid="2874876876336599985">"ತೋರಿಸು"</string>
     <string name="sync_error" msgid="1795794969006241678">"ಸಿಂಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"ಸಿಂಕ್ ಮಾಡಲು ಬೇಕಿರುವಷ್ಟು ಸಂಗ್ರಹಣಾ ಸ್ಥಳವಾಕಾಶ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿಲ್ಲ."</string>
     <string name="storage" msgid="4783683938444150638">"ಸಂಗ್ರಹಣೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0b390d5..5b30ba3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"메시지 가져오는 중"</string>
     <string name="undo" msgid="8256285267701059609">"실행취소"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"대화 <xliff:g id="COUNT">%1$d</xliff:g>개의 별표를 제거하는 중 입니다."</item>
-    <item quantity="other" msgid="7677305734833709789">"대화 <xliff:g id="COUNT">%1$d</xliff:g>개의 별표를 제거하는 중입니다."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g>개 대화의 별표표시 취소 중"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g>개 대화의 별표표시 취소 중"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 숨기기"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 숨기기"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 숨김"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 숨김"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 스팸으로 신고"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 스팸으로 신고"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 스팸으로 신고함"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 스팸으로 신고함"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개가 스팸이 아님을 신고"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개가 스팸이 아님을 신고"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 대화의 스팸해제를 요청함"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 대화의 스팸해제를 요청함"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 중요하지 않음으로 표시했습니다."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 중요하지 않음으로 표시했습니다."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 중요하지 않음으로 표시함"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 중요하지 않음으로 표시함"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 피싱 메일로 신고"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 피싱 메일로 신고"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 피싱 메일로 신고함"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 피싱 메일로 신고함"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 보관처리"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 보관처리"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 보관처리함"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 보관처리함"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 삭제됨"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 삭제됨"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 삭제함"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개의 대화를 삭제함"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"삭제됨"</string>
     <string name="archived" msgid="6283673603512713022">"보관처리됨"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>에서 삭제됨"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"폴더가 변경되었습니다."</item>
-    <item quantity="other" msgid="8815390494333090939">"폴더가 변경되었습니다."</item>
+    <item quantity="one" msgid="7787126147584620603">"폴더를 변경함"</item>
+    <item quantity="other" msgid="6307772984911017972">"폴더를 변경함"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>(으)로 이동함"</string>
     <string name="search_results_header" msgid="1529438451150580188">"검색결과"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"이 계정에서는 검색이 지원되지 않습니다."</string>
     <string name="add_label" msgid="3285338046038610902">"폴더 추가"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g>님이 보낸 새 메일 보기"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개 보기"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
+    <item quantity="other" msgid="4085982174357328926">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;세부정보 보기&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"세부정보 숨기기"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"이전"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"완료"</item>
-    <item msgid="2972425114100316260">"연결되지 않았습니다."</item>
-    <item msgid="8594593386776437871">"로그인하지 못했습니다."</item>
-    <item msgid="1375193906551623606">"보안 오류입니다."</item>
-    <item msgid="195177374927979967">"동기화하지 못했습니다."</item>
+    <item msgid="2835492307658712596">"연결되지 않음"</item>
+    <item msgid="5932644761344898987">"로그인 실패"</item>
+    <item msgid="7335227237106118306">"보안 오류"</item>
+    <item msgid="8148525741623865182">"동기화 실패"</item>
     <item msgid="8026148967150231130">"내부 오류"</item>
     <item msgid="5442620760791553027">"서버 오류"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"읽지 않은 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>개 이상 읽지 않음"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"대화 더보기"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"로드 중…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"계정 선택"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"로그인"</string>
     <string name="info" msgid="1357564480946178121">"정보"</string>
     <string name="report" msgid="4318141326014579036">"신고"</string>
+    <string name="show" msgid="2874876876336599985">"표시"</string>
     <string name="sync_error" msgid="1795794969006241678">"동기화하지 못했습니다."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"기기에 동기화를 위한 충분한 저장 공간이 없습니다."</string>
     <string name="storage" msgid="4783683938444150638">"저장소"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 43b205c..d15f7f0 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -174,53 +174,33 @@
     <string name="empty_folder" msgid="3227552635613553855">"Бул жерде кат жок."</string>
     <string name="getting_messages" msgid="8403333791332403244">"Билдирүүлөрүңүз алынууда"</string>
     <string name="undo" msgid="8256285267701059609">"Артка кайтар"</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> маектин жылдызчасы алынууда."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> маектин жылдызчалары алынууда."</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; үнү басылды."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; үнү басылды."</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам деп кабарланды."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам деп кабарланды."</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам эмес деп кабарланды."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам эмес деп кабарланды."</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; маанилүү эмес деп белгиленди."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; маанилүү эмес деп белгиленди."</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; фишинг деп кабарланды."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; фишинг деп кабарланды."</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивделди."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивделди."</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; жок кылынды."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; жок кылынды."</item>
-  </plurals>
+    <!-- no translation found for conversation_unstarred:one (1701235480675303125) -->
+    <!-- no translation found for conversation_unstarred:other (1154441830432477256) -->
+    <!-- no translation found for conversation_muted:one (3622533556738049499) -->
+    <!-- no translation found for conversation_muted:other (4559007262578295280) -->
+    <!-- no translation found for conversation_spammed:one (1749550834135461470) -->
+    <!-- no translation found for conversation_spammed:other (664292592683692920) -->
+    <!-- no translation found for conversation_not_spam:one (3680479171846552641) -->
+    <!-- no translation found for conversation_not_spam:other (6351739502184556635) -->
+    <!-- no translation found for conversation_not_important:one (7432667428974709669) -->
+    <!-- no translation found for conversation_not_important:other (4823331037057239763) -->
+    <!-- no translation found for conversation_phished:one (3511804715065046338) -->
+    <!-- no translation found for conversation_phished:other (8400382886585779414) -->
+    <!-- no translation found for conversation_archived:one (4859172326053399351) -->
+    <!-- no translation found for conversation_archived:other (8520761617935818623) -->
+    <!-- no translation found for conversation_deleted:one (4819167474123685161) -->
+    <!-- no translation found for conversation_deleted:other (6287534453625638257) -->
     <string name="deleted" msgid="7378013910782008375">"Жок кылынды"</string>
     <string name="archived" msgid="6283673603512713022">"Архивделди"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> ичинен алынып салынды"</string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Өзгөртүлгөн папка."</item>
-    <item quantity="other" msgid="8815390494333090939">"Өзгөртүлгөн папкалар."</item>
-  </plurals>
+    <!-- no translation found for conversation_folder_changed:one (7787126147584620603) -->
+    <!-- no translation found for conversation_folder_changed:other (6307772984911017972) -->
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> жылдырылды"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Натыйжалар"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Бул каттоо эсебинде издөөгө болбойт."</string>
     <string name="add_label" msgid="3285338046038610902">"Папка кошуу"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> жаңы билдирүүсүн көрсөтүү."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> жаңы билдирүүнү көрсөтүү."</item>
-  </plurals>
+    <!-- no translation found for new_incoming_messages:one (1532079301006372605) -->
+    <!-- no translation found for new_incoming_messages:other (4085982174357328926) -->
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Чоо-жайын карап көрүү&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Чоо-жайларды жашыруу"</string>
     <string name="to_message_header" msgid="3954385178027011919">"кимге <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
@@ -263,15 +243,10 @@
     <string name="clear" msgid="765949970989448022">"Тазалоо"</string>
     <string name="next" msgid="2662478712866255138">"Кийинки"</string>
     <string name="previous" msgid="8985379053279804274">"Мурунку"</string>
-  <string-array name="sync_status">
-    <item msgid="4600303222943450797">"Ийгиликтүү"</item>
-    <item msgid="2972425114100316260">"Туташкан жок."</item>
-    <item msgid="8594593386776437871">"Кирген жок."</item>
-    <item msgid="1375193906551623606">"Коопсуздук катасы."</item>
-    <item msgid="195177374927979967">"Шайкештештирилген жок."</item>
-    <item msgid="8026148967150231130">"Ички ката"</item>
-    <item msgid="5442620760791553027">"Сервер катасы"</item>
-  </string-array>
+    <!-- no translation found for sync_status:1 (2835492307658712596) -->
+    <!-- no translation found for sync_status:2 (5932644761344898987) -->
+    <!-- no translation found for sync_status:3 (7335227237106118306) -->
+    <!-- no translation found for sync_status:4 (8148525741623865182) -->
     <string name="tap_to_configure" msgid="137172348280050643">"Орнотуу үчүн тийип коюңуз"</string>
     <string name="non_synced_folder_description" msgid="3044618511909304701">"Маектерди көрүү үчүн, бул папканы шайкештештириңиз."</string>
     <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Папканы шайкештештирүү"</string>
@@ -281,7 +256,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> окула элек"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ окула элек"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Көбүрөөк маектерди көрүү"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Жүктөлүүдө…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Каттоо эсебин тандоо"</string>
@@ -315,6 +289,8 @@
     <string name="signin" msgid="4699091478139791244">"Кирүү"</string>
     <string name="info" msgid="1357564480946178121">"Маалымат"</string>
     <string name="report" msgid="4318141326014579036">"Отчет"</string>
+    <!-- no translation found for show (2874876876336599985) -->
+    <skip />
     <string name="sync_error" msgid="1795794969006241678">"Шайкештештирилген жок."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Шайкештештирүү үчүн түзмөгүңүздүн сактоо мейкиндиги жетишсиз."</string>
     <string name="storage" msgid="4783683938444150638">"Сактагыч"</string>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 6141383..254bf68 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -165,6 +165,7 @@
 
     <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
         <item name="android:layout_alignParentStart">true</item>
+        <item name="android:maxLines">1</item>
     </style>
 
     <style name="FloatingActionButtonStyle" parent="AbstractFloatingActionButtonStyle">
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 18792a8..981eba2 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"ກຳລັງ​ໂຫຼດ​ອີເມວ​ຂອງທ່ານ"</string>
     <string name="undo" msgid="8256285267701059609">"ຍົກເລີກ"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"ກຳລັງຖອນດາວໃນການສົນທະນາ <xliff:g id="COUNT">%1$d</xliff:g> ອັນ."</item>
-    <item quantity="other" msgid="7677305734833709789">"ກຳລັງຖອນດາວໃນການສົນທະນາ <xliff:g id="COUNT">%1$d</xliff:g> ອັນ."</item>
+    <item quantity="one" msgid="1701235480675303125">"​ກຳ​ລັງຖອນ​ດາວ <xliff:g id="COUNT">%1$d</xliff:g> ​ການ​ສົນ​ທະ​ນາ"</item>
+    <item quantity="other" msgid="1154441830432477256">"​ກຳ​ລັງ​ຖອນ​ດາວ <xliff:g id="COUNT">%1$d</xliff:g> ​ການ​ສົນ​ທະ​ນາ"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາຖືກປິດສຽງແລ້ວ."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາຖືກປິດສຽງແລ້ວ."</item>
+    <item quantity="one" msgid="3622533556738049499">"​ປິດ​ສຽງ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ແລ້ວ"</item>
+    <item quantity="other" msgid="4559007262578295280">"​ປິດ​ສຽງ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ແລ້ວ"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ​ອ​ີ​ເມວຖືກ​ລາຍ​ງານ​ເປັນ​ສະ​ແປມ​ແລ້ວ."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາໄດ້ຖືກລາຍງານວ່າບໍ່ແມ່ນສະແປມແລ້ວ."</item>
+    <item quantity="one" msgid="1749550834135461470">"ລາຍ​ງານ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ວ່າ​ແມ່ນ​ສະ​ແປມ​ແລ້ວ"</item>
+    <item quantity="other" msgid="664292592683692920">"ລາຍ​ງານ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ວ່າ​ແມ່ນ​ສະ​ແປມ​ແລ້ວ"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາໄດ້ຖືກລາຍງານວ່າບໍ່ແມ່ນສະແປມແລ້ວ."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາໄດ້ຖືກລາຍງານວ່າບໍ່ແມ່ນສະແປມແລ້ວ."</item>
+    <item quantity="one" msgid="3680479171846552641">"​ລາຍ​ງານ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ວ່າ​ບໍ່ແມ່ນ​ສະ​ແປມ​ແລ້ວ"</item>
+    <item quantity="other" msgid="6351739502184556635">"ລາຍ​ງານ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ວ່າ​ບໍ່​ແມ່ນ​ສະ​ແປມ​ແລ້ວ"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"ໝາຍ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາວ່າບໍ່ສຳຄັນແລ້ວ."</item>
-    <item quantity="other" msgid="1215472798075869124">"ໝາຍ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາວ່າບໍ່ສຳຄັນແລ້ວ."</item>
+    <item quantity="one" msgid="7432667428974709669">"​ໝາຍ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ວ່າ​ບໍ່​ສຳ​ຄັນ​ແລ້ວ"</item>
+    <item quantity="other" msgid="4823331037057239763">"​ໝາຍ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ວ່າ​ບໍ່​ສຳ​ຄັນ​ແລ້ວ"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາໄດ້ຖືກລາຍງານວ່າແມ່ນພິຊຊິ້ງຂໍ້ມູນ."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາໄດ້ຖືກລາຍງານວ່າແມ່ນພິຊຊິ້ງຂໍ້ມູນ."</item>
+    <item quantity="one" msgid="3511804715065046338">"​ລາຍ​ງານ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນທະນາ​ວ່າ​ແມ່ນ​ຟິດຊິງຂໍ້ມູນ​ແລ້ວ"</item>
+    <item quantity="other" msgid="8400382886585779414">"ລາຍ​ງານ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນທະນາ​ວ່າ​ແມ່ນ​ຟິດຊິງຂໍ້ມູນ​ແລ້ວ"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"ຈັດເກັບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາແລ້ວ."</item>
-    <item quantity="other" msgid="7789480176789922968">"ຈັດເກັບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາແລ້ວ."</item>
+    <item quantity="one" msgid="4859172326053399351">"​ຈັດ​ເກັບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ​ການ​ສົນ​ທະ​ນາແລ້ວ"</item>
+    <item quantity="other" msgid="8520761617935818623">"ຈັດ​ເກັບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ແລ້ວ"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"ລຶບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາແລ້ວ."</item>
-    <item quantity="other" msgid="7060256058737892078">"ລຶບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການສົນທະນາແລ້ວ."</item>
+    <item quantity="one" msgid="4819167474123685161">"​ລຶບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ແລ້ວ"</item>
+    <item quantity="other" msgid="6287534453625638257">"​ລຶບ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ການ​ສົນ​ທະ​ນາ​ແລ້ວ"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ລຶບແລ້ວ"</string>
     <string name="archived" msgid="6283673603512713022">"ຈັດເກັບແລ້ວ"</string>
     <string name="folder_removed" msgid="5656281444688183676">"ລຶບອອກຈາກ <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"ປ່ຽນໂຟນເດີແລ້ວ."</item>
-    <item quantity="other" msgid="8815390494333090939">"ປ່ຽນໂຟນເດີແລ້ວ."</item>
+    <item quantity="one" msgid="7787126147584620603">"​ປ່ຽນ​ໂຟນ​ເດີ​ແລ້ວ"</item>
+    <item quantity="other" msgid="6307772984911017972">"​ປ່ຽນ​ໂຟນ​ເດີ​ແລ້ວ"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"ຍ້າຍໄປ <xliff:g id="FOLDERNAME">%1$s</xliff:g> ແລ້ວ"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ຜົນການຊອກຫາ"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ການຊອກຫາບໍ່​ຮອງຮັບ​ສຳລັບບັນຊີນີ້."</string>
     <string name="add_label" msgid="3285338046038610902">"ເພີ່ມໂຟນເດີ"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"ສະ​ແດງ​ຂໍ້​ຄວາມ​ໃຫມ່​ຈາກ <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"ສະ​ແດງ​ <xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້​ຄວາມ​ໃຫມ່​."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້​ຄວາມ​ໃໝ່"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້​ຄວາມ​ໃໝ່"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;ເບິ່ງ​ລາຍ​ລະ​ອຽດ&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"​ເຊື່ອງ​ລາຍ​ລະ​ອຽດ"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"ກ່ອນໜ້ານີ້"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"ຮຽບຮ້ອຍ"</item>
-    <item msgid="2972425114100316260">"ບໍ່ມີການເຊື່ອມຕໍ່."</item>
-    <item msgid="8594593386776437871">"ບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້."</item>
-    <item msgid="1375193906551623606">"ມີຂໍ້ຜິດພາດດ້ານຄວາມປອດໄພ."</item>
-    <item msgid="195177374927979967">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນໄດ້."</item>
+    <item msgid="2835492307658712596">"ບໍ່ມີ​ການ​ເຊື່ອມຕໍ່"</item>
+    <item msgid="5932644761344898987">"ບໍ່​ສາມາດ​ເຂົ້າສູ່​ລະບົບ​ໄດ້"</item>
+    <item msgid="7335227237106118306">"ມີຂໍ້​ຜິດພາດ​ດ້ານ​ຄວາມປອດໄພ"</item>
+    <item msgid="8148525741623865182">"​ບໍ່​ສາ​ມາດ​ຊິ້ງ​ຂໍ້​ມູນ​ໄດ້"</item>
     <item msgid="8026148967150231130">"ພົບຂໍ້ຜິດພາດພາຍໃນ"</item>
     <item msgid="5442620760791553027">"ເຊີບເວີຜິດພາດ"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມຍັງບໍ່ໄດ້ອ່ານ"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ ຍັງບໍ່ໄດ້ອ່ານ"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"ເບິ່ງບົດສົນທະນາເພີ່ມເຕີມ"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"ກຳລັງໂຫລດ…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"ເລືອກບັນຊີ"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"​ເຂົ້າ​ສູ່​ລະ​ບົບ"</string>
     <string name="info" msgid="1357564480946178121">"ຂໍ້ມູນ"</string>
     <string name="report" msgid="4318141326014579036">"ລາຍງານ"</string>
+    <string name="show" msgid="2874876876336599985">"ສະແດງ"</string>
     <string name="sync_error" msgid="1795794969006241678">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນໄດ້."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"ອຸປະກອນ​ຂອງທ່ານ​ບໍ່ມີ​ເນື້ອທີ່ຫວ່າງ​ພໍເພື່ອຈະຊິ້ງຂໍ້ມູນ"</string>
     <string name="storage" msgid="4783683938444150638">"ບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 88e27e2..cec3168 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Gaunami pranešimai"</string>
     <string name="undo" msgid="8256285267701059609">"Anuliuoti"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Atšaukiamas <xliff:g id="COUNT">%1$d</xliff:g> pokalb. žymėjimas žvaigždute."</item>
-    <item quantity="other" msgid="7677305734833709789">"Atšaukiamas <xliff:g id="COUNT">%1$d</xliff:g> pokalb. žymėjimas žvaigždute."</item>
+    <item quantity="one" msgid="1701235480675303125">"Pokalbių, kurių žymėjimas žvaigždute panaikinamas: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="1154441830432477256">"Pokalbių, kurių žymėjimas žvaigždute panaikinamas: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Nutildyta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4276111931404654219">"Nutildyta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"Nutildyta pokalbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4559007262578295280">"Nutildyta pokalbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Pranešta kaip apie šlamštą: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="5900913789259199137">"Pranešta kaip apie šlamštą: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="1749550834135461470">"Pokalbių, apie kuriuos pranešta kaip apie šlamštą: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="664292592683692920">"Pokalbių, apie kuriuos pranešta kaip apie šlamštą: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie šlamštą."</item>
-    <item quantity="other" msgid="4966164423991098144">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie šlamštą."</item>
+    <item quantity="one" msgid="3680479171846552641">"Pokalbių, apie kuriuos pranešta kaip ne apie šlamštą: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6351739502184556635">"Pokalbių, apie kuriuos pranešta kaip ne apie šlamštą: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Pažymėta kaip nesvarbūs: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="1215472798075869124">"Pažymėta kaip nesvarbūs: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="7432667428974709669">"Pažymėta pokalbių kaip nesvarbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4823331037057239763">"Pažymėta pokalbių kaip nesvarbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie sukčiavimą."</item>
-    <item quantity="other" msgid="9218674052779504277">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie sukčiavimą."</item>
+    <item quantity="one" msgid="3511804715065046338">"Pokalbių, kuriuose, kaip pranešama, sukčiaujama: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8400382886585779414">"Pokalbių, kuriuose, kaip pranešama, sukčiaujama: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Suarchyvuota: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Suarchyvuota: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"Suarchyvuota pokalbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8520761617935818623">"Suarchyvuota pokalbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Ištrinta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"Ištrinta: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"Ištrinta pokalbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6287534453625638257">"Ištrinta pokalbių: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Ištrinta"</string>
     <string name="archived" msgid="6283673603512713022">"Archyvuota"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Pašalinta iš <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Aplankas pakeistas."</item>
-    <item quantity="other" msgid="8815390494333090939">"Aplankai pakeisti."</item>
+    <item quantity="one" msgid="7787126147584620603">"Pakeistas aplankas"</item>
+    <item quantity="other" msgid="6307772984911017972">"Pakeisti aplankai"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Perkelta į <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Rezultatai"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Šioje paskyroje paieška nepalaikoma."</string>
     <string name="add_label" msgid="3285338046038610902">"Pridėti aplanką"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Rodyti naują pranešimą nuo <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Rodyti naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="4085982174357328926">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Peržiūrėti išsamią informaciją&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Slėpti išsamią informaciją"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Ankstesnis"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Sėkmingai"</item>
-    <item msgid="2972425114100316260">"Nėra ryšio."</item>
-    <item msgid="8594593386776437871">"Nepavyko prisijungti."</item>
-    <item msgid="1375193906551623606">"Saugos klaida."</item>
-    <item msgid="195177374927979967">"Nepavyko sinchronizuoti."</item>
+    <item msgid="2835492307658712596">"Nėra ryšio"</item>
+    <item msgid="5932644761344898987">"Nepavyko prisijungti"</item>
+    <item msgid="7335227237106118306">"Saugos klaida"</item>
+    <item msgid="8148525741623865182">"Nepavyko sinchronizuoti"</item>
     <item msgid="8026148967150231130">"Vidinė klaida"</item>
     <item msgid="5442620760791553027">"Serverio klaida"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Neskaitytų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Neskaitytų: <xliff:g id="COUNT">%1$d</xliff:g> ir daugiau"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Peržiūrėti daugiau pokalbių"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Įkeliama..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Pasirinkti paskyrą"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Prisijungti"</string>
     <string name="info" msgid="1357564480946178121">"Informacija"</string>
     <string name="report" msgid="4318141326014579036">"Pranešti"</string>
+    <string name="show" msgid="2874876876336599985">"Rodyti"</string>
     <string name="sync_error" msgid="1795794969006241678">"Nepavyko sinchronizuoti."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Jūsų įrenginyje nėra pakankamai vietos, kad būtų galima sinchronizuoti."</string>
     <string name="storage" msgid="4783683938444150638">"Atmintinė"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3f76f65..d85ea13 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Notiek ziņojumu saņemšana"</string>
     <string name="undo" msgid="8256285267701059609">"Atsaukt"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Notiek zvaigznītes noņemšana no <xliff:g id="COUNT">%1$d</xliff:g> sarunas."</item>
-    <item quantity="other" msgid="7677305734833709789">"Notiek zvaigznītes noņemšana no <xliff:g id="COUNT">%1$d</xliff:g> sarunas(-ām)."</item>
+    <item quantity="one" msgid="1701235480675303125">"Tiek noņemta zvaigznīte <xliff:g id="COUNT">%1$d</xliff:g> sarunai"</item>
+    <item quantity="other" msgid="1154441830432477256">"Tiek noņemtas zvaigznītes <xliff:g id="COUNT">%1$d</xliff:g> sarunām"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna ar izslēgtu skaņu."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as) ar izslēgtu skaņu."</item>
+    <item quantity="one" msgid="3622533556738049499">"Izslēgta skaņa &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunai"</item>
+    <item quantity="other" msgid="4559007262578295280">"Izslēgta skaņa &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunām"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā mēstule."</item>
-    <item quantity="other" msgid="5900913789259199137">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunu(-ām) ziņots kā par mēstuli(-ēm)."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā mēstule"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunas atzīmētas kā mēstules"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā “nav mēstule”."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as) atzīmēta(-as) kā “nav mēstule”."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā mēstule"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunas atzīmētas kā mēstules"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā nesvarīga."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as) atzīmēta(-as) kā nesvarīga(-as)."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā nesvarīga"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunas atzīmētas kā nesvarīgas"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunu ziņots kā par pikšķerēšanu."</item>
-    <item quantity="other" msgid="9218674052779504277">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunu(-ām) ziņots kā par pikšķerēšanu."</item>
+    <item quantity="one" msgid="3511804715065046338">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunu ziņots kā par pikšķerēšanu"</item>
+    <item quantity="other" msgid="8400382886585779414">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunām ziņots kā par pikšķerēšanu"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Tika arhivēta &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna."</item>
-    <item quantity="other" msgid="7789480176789922968">"Tika arhivēta(-as) &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as)."</item>
+    <item quantity="one" msgid="4859172326053399351">"Arhivēta &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna"</item>
+    <item quantity="other" msgid="8520761617935818623">"Arhivētas &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunas"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Tika dzēsta &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna."</item>
-    <item quantity="other" msgid="7060256058737892078">"Tika dzēsta(-as) &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as)."</item>
+    <item quantity="one" msgid="4819167474123685161">"Dzēsta &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna"</item>
+    <item quantity="other" msgid="6287534453625638257">"Dzēstas &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunas"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Dzēsta"</string>
     <string name="archived" msgid="6283673603512713022">"Arhivēta"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Noņemta no mapes <xliff:g id="FOLDERNAME">%1$s</xliff:g>."</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Mape ir mainīta."</item>
-    <item quantity="other" msgid="8815390494333090939">"Mapes ir mainītas."</item>
+    <item quantity="one" msgid="7787126147584620603">"Mainīta mape"</item>
+    <item quantity="other" msgid="6307772984911017972">"Mainītas mapes"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Pārvietota uz: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Rezultāti"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Šajā kontā netiek atbalstīta meklēšana."</string>
     <string name="add_label" msgid="3285338046038610902">"Pievienot mapi"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Rādīt jaunu ziņojumu no: <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Rādīt <xliff:g id="COUNT">%1$d</xliff:g> jaunus ziņojumus."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> jauns ziņojums"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Skatīt detalizētu informāciju&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Slēpt datus"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Atpakaļ"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Izpildīta veiksmīgi"</item>
-    <item msgid="2972425114100316260">"Nav savienojuma."</item>
-    <item msgid="8594593386776437871">"Neizdevās pierakstīties."</item>
-    <item msgid="1375193906551623606">"Drošības kļūda."</item>
-    <item msgid="195177374927979967">"Neizdevās sinhronizēt."</item>
+    <item msgid="2835492307658712596">"Nav savienojuma"</item>
+    <item msgid="5932644761344898987">"Nevarēja pierakstīties"</item>
+    <item msgid="7335227237106118306">"Drošības kļūda"</item>
+    <item msgid="8148525741623865182">"Nevarēja sinhronizēt"</item>
     <item msgid="8026148967150231130">"Iekšējā kļūda"</item>
     <item msgid="5442620760791553027">"Servera kļūda"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> nelasīti"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Vairāk nekā <xliff:g id="COUNT">%1$d</xliff:g> nelasīti"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Skatīt citas sarunas"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Notiek ielāde..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Izvēlēties kontu"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Pierakstīties"</string>
     <string name="info" msgid="1357564480946178121">"Informācija"</string>
     <string name="report" msgid="4318141326014579036">"Ziņot"</string>
+    <string name="show" msgid="2874876876336599985">"Rādīt"</string>
     <string name="sync_error" msgid="1795794969006241678">"Neizdevās sinhronizēt."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Ierīcē nav pietiekami daudz atmiņas, lai sinhronizētu."</string>
     <string name="storage" msgid="4783683938444150638">"Krātuve"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 36eb924..73324f5 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -174,53 +174,33 @@
     <string name="empty_folder" msgid="3227552635613553855">"Нема е-пошта во папката."</string>
     <string name="getting_messages" msgid="8403333791332403244">"Се вчитуваат вашите пораки"</string>
     <string name="undo" msgid="8256285267701059609">"Врати"</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Отстранување ѕвезда од <xliff:g id="COUNT">%1$d</xliff:g> разговор."</item>
-    <item quantity="other" msgid="7677305734833709789">"Отстранување ѕвезда од <xliff:g id="COUNT">%1$d</xliff:g> разговори."</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; со исклучен звук."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; со исклучен звук."</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пријавен како спам."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пријавени како спам."</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пријавен дека не е спам."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пријавени дека не се спам."</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; обележан како неважен."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; обележани како неважни."</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пријавен како кражба на идентитет."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пријавени како кражба на идентитет."</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивиран."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивирани."</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; избришан."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; избришани."</item>
-  </plurals>
+    <!-- no translation found for conversation_unstarred:one (1701235480675303125) -->
+    <!-- no translation found for conversation_unstarred:other (1154441830432477256) -->
+    <!-- no translation found for conversation_muted:one (3622533556738049499) -->
+    <!-- no translation found for conversation_muted:other (4559007262578295280) -->
+    <!-- no translation found for conversation_spammed:one (1749550834135461470) -->
+    <!-- no translation found for conversation_spammed:other (664292592683692920) -->
+    <!-- no translation found for conversation_not_spam:one (3680479171846552641) -->
+    <!-- no translation found for conversation_not_spam:other (6351739502184556635) -->
+    <!-- no translation found for conversation_not_important:one (7432667428974709669) -->
+    <!-- no translation found for conversation_not_important:other (4823331037057239763) -->
+    <!-- no translation found for conversation_phished:one (3511804715065046338) -->
+    <!-- no translation found for conversation_phished:other (8400382886585779414) -->
+    <!-- no translation found for conversation_archived:one (4859172326053399351) -->
+    <!-- no translation found for conversation_archived:other (8520761617935818623) -->
+    <!-- no translation found for conversation_deleted:one (4819167474123685161) -->
+    <!-- no translation found for conversation_deleted:other (6287534453625638257) -->
     <string name="deleted" msgid="7378013910782008375">"Избришан"</string>
     <string name="archived" msgid="6283673603512713022">"Архивирано"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Отстранет од <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Променета папка."</item>
-    <item quantity="other" msgid="8815390494333090939">"Променети папки."</item>
-  </plurals>
+    <!-- no translation found for conversation_folder_changed:one (7787126147584620603) -->
+    <!-- no translation found for conversation_folder_changed:other (6307772984911017972) -->
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Преместен во <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Резултати"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Оваа сметка не поддржува пребарување."</string>
     <string name="add_label" msgid="3285338046038610902">"Додај папка"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Прикажи ја новата порака од <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Прикажи <xliff:g id="COUNT">%1$d</xliff:g> нови пораки."</item>
-  </plurals>
+    <!-- no translation found for new_incoming_messages:one (1532079301006372605) -->
+    <!-- no translation found for new_incoming_messages:other (4085982174357328926) -->
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Прикажи детали&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Сокриј детали"</string>
     <string name="to_message_header" msgid="3954385178027011919">"до <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
@@ -263,15 +243,10 @@
     <string name="clear" msgid="765949970989448022">"Исчисти"</string>
     <string name="next" msgid="2662478712866255138">"Следно"</string>
     <string name="previous" msgid="8985379053279804274">"Претходно"</string>
-  <string-array name="sync_status">
-    <item msgid="4600303222943450797">"Успешно"</item>
-    <item msgid="2972425114100316260">"Нема поврзување."</item>
-    <item msgid="8594593386776437871">"Не можеше да се пријави."</item>
-    <item msgid="1375193906551623606">"Грешка на безбедност."</item>
-    <item msgid="195177374927979967">"Не можеше да се синхронизира."</item>
-    <item msgid="8026148967150231130">"Внатрешна грешка"</item>
-    <item msgid="5442620760791553027">"Грешка на серверот"</item>
-  </string-array>
+    <!-- no translation found for sync_status:1 (2835492307658712596) -->
+    <!-- no translation found for sync_status:2 (5932644761344898987) -->
+    <!-- no translation found for sync_status:3 (7335227237106118306) -->
+    <!-- no translation found for sync_status:4 (8148525741623865182) -->
     <string name="tap_to_configure" msgid="137172348280050643">"Допри за да поставиш"</string>
     <string name="non_synced_folder_description" msgid="3044618511909304701">"За да ги гледате разговорите, синхронизирајте ја папката."</string>
     <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Синхронизирај папка"</string>
@@ -281,7 +256,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> непрочитани"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ непрочитани"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Прикажи повеќе разговори"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Се вчитува..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Избери сметка"</string>
@@ -315,6 +289,8 @@
     <string name="signin" msgid="4699091478139791244">"Пријави се"</string>
     <string name="info" msgid="1357564480946178121">"Информации"</string>
     <string name="report" msgid="4318141326014579036">"Пријави"</string>
+    <!-- no translation found for show (2874876876336599985) -->
+    <skip />
     <string name="sync_error" msgid="1795794969006241678">"Не можеше да се синхронизира."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Вашиот уред нема доволно простор во меморијата за синхронизирање."</string>
     <string name="storage" msgid="4783683938444150638">"Меморија"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 0b8d3ec..057413f 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"നിങ്ങളുടെ സന്ദേശങ്ങൾ നേടുന്നു"</string>
     <string name="undo" msgid="8256285267701059609">"പഴയപടിയാക്കുക"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> സംഭാഷണത്തിന് നക്ഷത്രമിട്ടത് മാറ്റുന്നു."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> സംഭാഷണങ്ങൾക്ക് നക്ഷത്രമിട്ടത് മാറ്റുന്നു."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> സംഭാഷണത്തിന് നക്ഷത്രമിട്ടത് മാറ്റുന്നു"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> സംഭാഷണങ്ങൾക്ക് നക്ഷത്രമിട്ടത് മാറ്റുന്നു"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം മ്യൂട്ടുചെയ്‌തു."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം മ്യൂട്ടുചെയ്‌തു."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം മ്യൂട്ടുചെയ്‌തു"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം മ്യൂട്ടുചെയ്‌തു"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം സ്‌പാമായി റിപ്പോർട്ടുചെയ്‌തു."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം സ്‌പാമായി റിപ്പോർട്ടുചെയ്‌തു."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;എണ്ണം സ്‌പാമായി റിപ്പോർട്ടുചെയ്‌തു"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;എണ്ണം സ്‌പാമായി റിപ്പോർട്ടുചെയ്‌തു"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം സ്‌പാമല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം സ്‌പാമല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം സ്‌പാമല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം സ്‌പാമല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം പ്രധാനമല്ലെന്ന് അടയാളപ്പെടുത്തി."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം പ്രധാനമല്ലെന്ന് അടയാളപ്പെടുത്തി."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം പ്രധാനമല്ലെന്ന് അടയാളപ്പെടുത്തി"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം പ്രധാനമല്ലെന്ന് അടയാളപ്പെടുത്തി"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഫിഷിംഗ് ആയി റിപ്പോർട്ടുചെയ്‌തു."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഫിഷിംഗ് ആയി റിപ്പോർട്ടുചെയ്‌തു."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഫിഷിംഗായി റിപ്പോർട്ടുചെയ്തു"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഫിഷിംഗായി റിപ്പോർട്ടുചെയ്തു"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ആർക്കൈവുചെയ്‌തു."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ആർക്കൈവുചെയ്‌തു."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ആർക്കൈവുചെയ്‌തു"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ആർക്കൈവുചെയ്‌തു"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഇല്ലാതാക്കി."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഇല്ലാതാക്കി."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഇല്ലാതാക്കി"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; എണ്ണം ഇല്ലാതാക്കി"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ഇല്ലാതാക്കി"</string>
     <string name="archived" msgid="6283673603512713022">"ആർക്കൈവുചെയ്‌തു"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> എന്നതിൽ നിന്ന് നീക്കംചെയ്‌തു"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"ഫോൾഡർ മാറ്റി."</item>
-    <item quantity="other" msgid="8815390494333090939">"ഫോൾഡറുകൾ മാറ്റി."</item>
+    <item quantity="one" msgid="7787126147584620603">"ഫോൾഡർ മാറ്റി"</item>
+    <item quantity="other" msgid="6307772984911017972">"ഫോൾഡറുകൾ മാറ്റി"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> എന്നതിലേക്ക് നീക്കി"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ഫലങ്ങള്‍"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ഈ അക്കൗണ്ടിൽ തിരയലിനെ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
     <string name="add_label" msgid="3285338046038610902">"ഫോൾഡർ ചേർക്കുക"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> എന്നയാളിൽ നിന്നുള്ള പുതിയ സന്ദേശം കാണിക്കുക."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> പുതിയ സന്ദേശങ്ങൾ കാണിക്കുക"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> പുതിയ സന്ദേശം"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> പുതിയ സന്ദേശങ്ങൾ"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;വിശദാംശങ്ങൾ കാണുക&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"വിശദാംശങ്ങള്‍ മറയ്‌ക്കുക‍‌"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"മുമ്പത്തേത്"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"വിജയകരം"</item>
-    <item msgid="2972425114100316260">"കണക്ഷനൊന്നുമില്ല."</item>
-    <item msgid="8594593386776437871">"സൈൻ ഇൻ ചെയ്യാനായില്ല."</item>
-    <item msgid="1375193906551623606">"സുരക്ഷാ പിശക്."</item>
-    <item msgid="195177374927979967">"സമന്വയിപ്പിക്കാനായില്ല."</item>
+    <item msgid="2835492307658712596">"കണക്ഷനൊന്നുമില്ല"</item>
+    <item msgid="5932644761344898987">"സൈൻ ഇൻ ചെയ്യാനായില്ല"</item>
+    <item msgid="7335227237106118306">"സുരക്ഷാ പിശക്"</item>
+    <item msgid="8148525741623865182">"സമന്വയിപ്പിക്കാനായില്ല"</item>
     <item msgid="8026148967150231130">"ആന്തരിക പിശക്"</item>
     <item msgid="5442620760791553027">"സെര്‍വര്‍ പിശക്"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> വായിക്കാത്തവ"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ വായിക്കാത്തവ"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"കൂടുതൽ സംഭാഷണങ്ങൾ കാണുക"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"ലോഡുചെയ്യുന്നു..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"സൈൻ ഇൻ ചെയ്യുക"</string>
     <string name="info" msgid="1357564480946178121">"വിവരം"</string>
     <string name="report" msgid="4318141326014579036">"റിപ്പോര്‍ട്ടുചെയ്യുക"</string>
+    <string name="show" msgid="2874876876336599985">"കാണിക്കുക"</string>
     <string name="sync_error" msgid="1795794969006241678">"സമന്വയിപ്പിക്കാനായില്ല."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"നിങ്ങളുടെ ഉപകരണത്തിൽ സമന്വയിപ്പിക്കുന്നതിനാവശ്യമായ സംഭരണമില്ല."</string>
     <string name="storage" msgid="4783683938444150638">"സംഭരണം"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 1a41343..07df586 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Таны зурвасуудыг авч байна"</string>
     <string name="undo" msgid="8256285267701059609">"Буцаах"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> харилцааны одыг арилгаж байна."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> харилцааны одыг арилгаж байна."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> харилцааны одыг арилгасан"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> харилцааны одыг арилгасан"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; хаагдсан."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; хаагдсан."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; хаагдсан"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; хаагдсан"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам гэж мэдээлэгдсэн."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам гэж мэдээлэгдсэн."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам гэж мэдээлэгдсэн"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам гэж мэдээлэгдсэн"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам биш гэж тэмдэглэгдсэн."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам биш гэж тэмдэглэгдсэн."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам бишээр мэдээлэгдсэн"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; спам бишээр мэдээлэгдсэн"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; чухал бус гэж тэмдэглэгдсэн."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; чухал бус гэж тэмдэглэгдсэн."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; чухал бишээр тэмдэглэгдсэн"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; чухал бишээр тэмдэглэгдсэн"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; залилан гэж мэдээлэгдсэн."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; залилан гэж мэдээлэгдсэн."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; фишингээр мэдээлэгдсэн"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; фишингээр мэдээлэгдсэн"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивлагдсан."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивлагдсан."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; архивлагдсан"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; aрхивлагдсан"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; устгагдсан."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; устгагдсан."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; устгагдсан"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; устгагдсан"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Устгасан"</string>
     <string name="archived" msgid="6283673603512713022">"Архивлагдсан"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>-с арилгасан"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Фолдер өөрчилсөн."</item>
-    <item quantity="other" msgid="8815390494333090939">"Фолдеруудыг өөрчилсөн."</item>
+    <item quantity="one" msgid="7787126147584620603">"Фолдер өөрчилсөн"</item>
+    <item quantity="other" msgid="6307772984911017972">"Фолдеруудыг өөрчилсөн"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> руу зөөсөн"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Илэрцүүд"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Энэ акаунтад хайлт дэмжигддэггүй."</string>
     <string name="add_label" msgid="3285338046038610902">"Фолдер нэмэх"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g>-с ирсэн шинэ зурвасыг харуулах."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас харуулах."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Дэлгэрэнгүй үзэх&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Дэлгэрэнгүйг далдлах"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Өмнөх"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Амжилттай"</item>
-    <item msgid="2972425114100316260">"Холбогдоогүй."</item>
-    <item msgid="8594593386776437871">"Нэвтэрч чадсангүй."</item>
-    <item msgid="1375193906551623606">"Аюулгүй байдлын алдаа"</item>
-    <item msgid="195177374927979967">"Синк хийж чадсангүй."</item>
+    <item msgid="2835492307658712596">"Холбогдоогүй"</item>
+    <item msgid="5932644761344898987">"Нэвтэрч чадсангүй"</item>
+    <item msgid="7335227237106118306">"Нууцлалын алдаа"</item>
+    <item msgid="8148525741623865182">"Синк хийж чадсангүй"</item>
     <item msgid="8026148967150231130">"Дотоод алдаа"</item>
     <item msgid="5442620760791553027">"Сервэрийн алдаа"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> уншаагүй"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ уншаагүй"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Өөр харилцаануудыг харах"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Ачаалж байна…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Акаунт сонгох"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Нэвтрэх"</string>
     <string name="info" msgid="1357564480946178121">"Мэдээлэл"</string>
     <string name="report" msgid="4318141326014579036">"Мэдэгдэх"</string>
+    <string name="show" msgid="2874876876336599985">"Харуулах"</string>
     <string name="sync_error" msgid="1795794969006241678">"Синк хийж чадсангүй."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Таны төхөөрөмж синк хийхэд хангалттай зайгүй байна."</string>
     <string name="storage" msgid="4783683938444150638">"Сан"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 91e8b22..b724054 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"आपले संदेश मिळवत आहे"</string>
     <string name="undo" msgid="8256285267701059609">"पूर्ववत करा"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> संभाषणाचे तारांकन रद्द करत आहे."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> संभाषणांचे तारांकन रद्द करत आहे."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> संभाषणाचे तारांकन रद्द करत आहे"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> संभाषणांचे तारांकन रद्द करत आहे"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; निःशब्द केले."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; निःशब्द केले."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; निःशब्द केले"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; निःशब्द केले"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम म्हणून अहवाल दिला."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम म्हणून अहवाल दिला."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम म्हणून अहवाल दिला"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम म्हणून अहवाल दिला"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम नाही म्हणून अहवाल दिला."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम नाही म्हणून अहवाल दिला."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम नाही म्हणून अहवाल दिला"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्पॅम नाही म्हणून अहवाल दिला"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वाचे नाही म्हणून चिन्हांकित केले."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वाचे नाही म्हणून चिन्हांकित केले."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वाचे नाही म्हणून चिन्हांकित केले"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वाचे नाही म्हणून चिन्हांकित केले"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिशिंग म्हणून अहवाल दिला."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिशिंग म्हणून अहवाल दिला."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिशिंग म्हणून अहवाल दिला"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिशिंग म्हणून अहवाल दिला"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; संग्रहित."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; संग्रहित."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; संग्रहित"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; संग्रहित"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; हटविले."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; हटविले."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; हटविले"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; हटविले"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"हटविला"</string>
     <string name="archived" msgid="6283673603512713022">"संग्रहित"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> मधून काढले"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"फोल्डर बदलले."</item>
-    <item quantity="other" msgid="8815390494333090939">"फोल्डर बदलली."</item>
+    <item quantity="one" msgid="7787126147584620603">"फोल्डर बदलले"</item>
+    <item quantity="other" msgid="6307772984911017972">"फोल्डर बदलली"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> वर हलविले"</string>
     <string name="search_results_header" msgid="1529438451150580188">"परिणाम"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"या खात्यावर शोध समर्थित नाही."</string>
     <string name="add_label" msgid="3285338046038610902">"फोल्डर जोडा"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> कडील नवीन संदेश दर्शवा."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> नवीन संदेश दर्शवा."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> नवीन संदेश"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> नवीन संदेश"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"तपशील लपवा"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"मागील"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"यशस्वी"</item>
-    <item msgid="2972425114100316260">"कोणतेही कनेक्शन नाही."</item>
-    <item msgid="8594593386776437871">"साइन इन करू शकलो नाही."</item>
-    <item msgid="1375193906551623606">"सुरक्षितता त्रुटी."</item>
-    <item msgid="195177374927979967">"संकालन करू शकलो नाही."</item>
+    <item msgid="2835492307658712596">"कोणतेही कनेक्शन नाही"</item>
+    <item msgid="5932644761344898987">"साइन इन करू शकलो नाही"</item>
+    <item msgid="7335227237106118306">"सुरक्षा त्रुटी"</item>
+    <item msgid="8148525741623865182">"संकालन करू शकलो नाही"</item>
     <item msgid="8026148967150231130">"अंतर्गत त्रुटी"</item>
     <item msgid="5442620760791553027">"सर्व्हर त्रुटी"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> न वाचलेले"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ न वाचलेले"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"अधिक संभाषणे पहा"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"लोड करीत आहे..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"खाते निवडा"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"साइन-इन करा"</string>
     <string name="info" msgid="1357564480946178121">"माहिती"</string>
     <string name="report" msgid="4318141326014579036">"अहवाल द्या"</string>
+    <string name="show" msgid="2874876876336599985">"दर्शवा"</string>
     <string name="sync_error" msgid="1795794969006241678">"संकालन करू शकलो नाही."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"संकालन करण्यासाठी आपल्या डिव्हाइसमध्ये पुरेसे संचयन स्थान नाही."</string>
     <string name="storage" msgid="4783683938444150638">"संचयन"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dba8fd6..acc0747 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Mendapatkan mesej anda"</string>
     <string name="undo" msgid="8256285267701059609">"Buat asal"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Membuang bintang <xliff:g id="COUNT">%1$d</xliff:g> perbualan."</item>
-    <item quantity="other" msgid="7677305734833709789">"Membuang bintang <xliff:g id="COUNT">%1$d</xliff:g> perbualan."</item>
+    <item quantity="one" msgid="1701235480675303125">"Menyahbintangkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan"</item>
+    <item quantity="other" msgid="1154441830432477256">"Menyahbintangkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diredamkan."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diredamkan."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diredamkan"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diredamkan"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan tidak penting."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan tidak penting."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai tidak penting"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai tidak penting"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarkibkan."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarkibkan."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarkibkan"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarkibkan"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dipadamkan."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dipadamkan."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dipadamkan"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dipadamkan"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Dipadam"</string>
     <string name="archived" msgid="6283673603512713022">"Diarkibkan"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Dialih keluar dari <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Folder yang diubah."</item>
-    <item quantity="other" msgid="8815390494333090939">"Folder yang diubah."</item>
+    <item quantity="one" msgid="7787126147584620603">"Folder ditukar"</item>
+    <item quantity="other" msgid="6307772984911017972">"Folder ditukar"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Dialihkan ke <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Hasil"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Carian tidak disokong pada akaun ini."</string>
     <string name="add_label" msgid="3285338046038610902">"Tambah folder"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Tunjukkan mesej baharu daripada <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Tunjukkan <xliff:g id="COUNT">%1$d</xliff:g> mesej baharu."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Lihat butiran&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Sembunyikan butiran"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Sebelumnya"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Berjaya"</item>
-    <item msgid="2972425114100316260">"Tiada sambungan."</item>
-    <item msgid="8594593386776437871">"Tidak dapat melog masuk."</item>
-    <item msgid="1375193906551623606">"Ralat keselamatan."</item>
-    <item msgid="195177374927979967">"Tidak dapat menyegerakkan."</item>
+    <item msgid="2835492307658712596">"Tiada sambungan"</item>
+    <item msgid="5932644761344898987">"Tidak dapat melog masuk"</item>
+    <item msgid="7335227237106118306">"Ralat keselamatan"</item>
+    <item msgid="8148525741623865182">"Tidak dapat menyegerak"</item>
     <item msgid="8026148967150231130">"Ralat Dalaman"</item>
     <item msgid="5442620760791553027">"Ralat Pelayan"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> belum dibaca"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ belum dibaca"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Lihat lagi perbualan"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Memuatkan…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Pilih akaun"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Log masuk"</string>
     <string name="info" msgid="1357564480946178121">"Maklumat"</string>
     <string name="report" msgid="4318141326014579036">"Laporkan"</string>
+    <string name="show" msgid="2874876876336599985">"Papar"</string>
     <string name="sync_error" msgid="1795794969006241678">"Tidak dapat menyegerakkan."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Peranti anda tidak mempunyai storan mencukupi untuk disegerakkan."</string>
     <string name="storage" msgid="4783683938444150638">"Storan"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 0afcbf6..ff96b53 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -172,51 +172,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"သင်၏ စာများကို ရယူနေ"</string>
     <string name="undo" msgid="8256285267701059609">"ပြန်ဖျက်ရန်"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"စကားဝိုင်း <xliff:g id="COUNT">%1$d</xliff:g> ကို စတားဖြုတ်နေ။"</item>
-    <item quantity="other" msgid="7677305734833709789">"စကားဝိုင်း <xliff:g id="COUNT">%1$d</xliff:g> ခုကို ကြယ်ဖြုတ်နေသည်။"</item>
+    <item quantity="one" msgid="1701235480675303125">"စကားဝိုင်း <xliff:g id="COUNT">%1$d</xliff:g> ခု စတားဖြုတ်နေ"</item>
+    <item quantity="other" msgid="1154441830432477256">"စကားဝိုင်း <xliff:g id="COUNT">%1$d</xliff:g> ခု စတားဖြုတ်နေ"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; အသံတိတ်ခဲ့သည်။"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt အသံတိတ်ခဲ့။"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; အသံတိတ်ခဲ့"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; အသံတိတ်ခဲ့"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;စပမ် အဖြစ် အစီရင်ခံခဲ့။"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt စပမ် အဖြစ် အစီရင်ခံခဲ့သည်။"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; စပမ် အဖြစ် သတင်းပို့ခဲ့"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; စပမ် အဖြစ် သတင်းပို့ခဲ့"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt စပမ် မဟုတ်ဟု အစီရင်ခံခဲ့။"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt စပမ် မဟုတ်ဟု အစီရင်ခံခဲ့သည်။"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; စပမ် မဟုတ် ဆိုပြီး သတင်းပို့ခဲ့"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; စပမ် မဟုတ် ဆိုပြီး သတင်းပို့ခဲ့"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt ကို အရေးမကြီးဟု မှတ်သားခဲ့သည်။"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt ကို အရေးမကြီးဟု မှတ်သားခဲ့သည်။"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ကို အရေးမကြီးကြောင်း မှတ်သားခဲ့"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ကို အရေးမကြီးကြောင်း မှတ်သားခဲ့"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt မျှားယူမှု အဖြစ် အစီရင်ခံခဲ့သည်။"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt မျှားယူမှု အဖြစ် အစီရင်ခံခဲ့သည်။"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; မျှားယူမှု အဖြစ် သတင်းပို့ခဲ့"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; မျှားယူမှု အဖြစ် သတင်းပို့ခဲ့"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; မော်ကွန်းတင်ပြီး။"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt မော်ကွန်းတင်ပြီး။"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; မော်ကွန်းတင်ပြီး။"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; မော်ကွန်းတင်ပြီး။"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt ကို ဖျက်ပြီး။"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp;gt ကို ဖျက်ပြီး။"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ကို ဖျက်ပြီး။"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ကို ဖျက်ပြီး။"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ဖျက်ပြီး"</string>
     <string name="archived" msgid="6283673603512713022">"မော်ကွန်းတင်ထား"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> မှ ဖယ်ရှားခဲ့"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"ပြောင်းထားသည့် ဖိုလ်ဒါ။"</item>
-    <item quantity="other" msgid="8815390494333090939">"ပြောင်းထားသည့် ဖိုလ်ဒါများ။"</item>
+    <item quantity="one" msgid="7787126147584620603">"ပြောင်းထားသည့် ဖိုလ်ဒါ"</item>
+    <item quantity="other" msgid="6307772984911017972">"ပြောင်းထားသည့် ဖိုလ်ဒါများ"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> သို့ ရွှေ့ရန်"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ရလဒ်များ"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ဤအကောင့် ထဲမှာ ရှာဖွေမှုကို ပံ့ပိုးမပေးပါ။"</string>
     <string name="add_label" msgid="3285338046038610902">"ဖိုလ်ဒါကို ထည့်ရန်"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> ထံမှ စာ အသစ်ကို ပြပါ။"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"စာအသစ် <xliff:g id="COUNT">%1$d</xliff:g> စောင်ကို ပြသပါ။"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"စာ အသစ် <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
+    <item quantity="other" msgid="4085982174357328926">"စာ အသစ် <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;သေးစိတ် ကြည့်&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"အသေးစိတ်များ ဝှက်ထားရန်"</string>
@@ -263,10 +263,10 @@
     <string name="previous" msgid="8985379053279804274">"ယခင်"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"အောင်မြင်"</item>
-    <item msgid="2972425114100316260">"ချိတ်ဆက်မှု မရှိပါ။"</item>
-    <item msgid="8594593386776437871">"လက်မှတ်ထိုး မဝင်နိုင်ခဲ့။"</item>
-    <item msgid="1375193906551623606">"လုံခြုံရေး အမှား။"</item>
-    <item msgid="195177374927979967">"စင့်က်လုပ် မရနိုင်ခဲ့ပါ။"</item>
+    <item msgid="2835492307658712596">"ချိတ်ဆက်မှု မရှိ"</item>
+    <item msgid="5932644761344898987">"လက်မှတ်ထိုး မ၀င်နိုင်ခဲ့ပါ"</item>
+    <item msgid="7335227237106118306">"လုံခြုံရေး အမှား"</item>
+    <item msgid="8148525741623865182">"စင့်က် မလုပ်နိုင်ခဲ့ပါ"</item>
     <item msgid="8026148967150231130">"အင်တာနက် အမှား"</item>
     <item msgid="5442620760791553027">"ဆာဗား အမှား"</item>
   </string-array>
@@ -279,7 +279,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"မဖတ်ရသေး <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ မဖတ်ရသေး"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"စကားဝိုင်းများ နောက်ထပ် ကြည့်မည်"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"တင်နေ…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"အကောင့်ကို ရွေးရန်"</string>
@@ -311,6 +310,7 @@
     <string name="signin" msgid="4699091478139791244">"လက်မှတ်ထိုး ဝင်ရန်"</string>
     <string name="info" msgid="1357564480946178121">"အင်ဖို"</string>
     <string name="report" msgid="4318141326014579036">"အစီရင်ခံရန်"</string>
+    <string name="show" msgid="2874876876336599985">"ပြသရန်"</string>
     <string name="sync_error" msgid="1795794969006241678">"စင့်က်လုပ် မရနိုင်ခဲ့။"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"သင်၏ ကိရိယာ ထဲတွင် စင့်က်လုပ်ရန် နေရာ မလုံလောက်ပါ။"</string>
     <string name="storage" msgid="4783683938444150638">"သိုလှောင်မှု"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4c24e10..db79aeb 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Henter e-posten din …"</string>
     <string name="undo" msgid="8256285267701059609">"Angre"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Fjerner stjerne på <xliff:g id="COUNT">%1$d</xliff:g> samtale."</item>
-    <item quantity="other" msgid="7677305734833709789">"Fjerner stjerne på <xliff:g id="COUNT">%1$d</xliff:g> samtaler."</item>
+    <item quantity="one" msgid="1701235480675303125">"Fjerner stjernemerking fra <xliff:g id="COUNT">%1$d</xliff:g> samtale"</item>
+    <item quantity="other" msgid="1154441830432477256">"Fjerner stjernemerking fra <xliff:g id="COUNT">%1$d</xliff:g> samtaler"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorert."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorert."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorert"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorert"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er rapportert som nettsøppel."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er rapportert som nettsøppel."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapportert som søppelpost"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapportert som søppelpost"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapporterte dette som ikke nettsøppel."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapporterte dette som ikke nettsøppel."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapportert som ikke søppelpost"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapportert som ikke søppelpost"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er merket som uviktige."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er merket som uviktige."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merket som ikke viktig"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merket som ikke viktig"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapporterte dette som svindel."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapporterte dette som svindel."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapportert som nettfisking"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; rapportert som nettfisking"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er arkivert."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er arkivert."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkivert"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkivert"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er slettet."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er slettet."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; slettet"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; slettet"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Slettet"</string>
     <string name="archived" msgid="6283673603512713022">"Arkivert"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Fjernet fra <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Endret mappe."</item>
-    <item quantity="other" msgid="8815390494333090939">"Endret mapper."</item>
+    <item quantity="one" msgid="7787126147584620603">"Byttet mappe"</item>
+    <item quantity="other" msgid="6307772984911017972">"Byttet mapper"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Flyttet til <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultater"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Søk støttes ikke på denne kontoen."</string>
     <string name="add_label" msgid="3285338046038610902">"Legg til mappe"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Vis ny e-post fra <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Vis <xliff:g id="COUNT">%1$d</xliff:g> nye e-poster."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ny melding"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nye meldinger"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Se detaljer&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skjul detaljer"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Forrige"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Fullført"</item>
-    <item msgid="2972425114100316260">"Ingen tilkobling."</item>
-    <item msgid="8594593386776437871">"Påloggingen mislyktes."</item>
-    <item msgid="1375193906551623606">"Sikkerhetsfeil."</item>
-    <item msgid="195177374927979967">"Synkroniseringen mislyktes."</item>
+    <item msgid="2835492307658712596">"Ingen nettilkobling"</item>
+    <item msgid="5932644761344898987">"Kunne ikke logge på"</item>
+    <item msgid="7335227237106118306">"Sikkerhetsfeil"</item>
+    <item msgid="8148525741623865182">"Kunne ikke synkronisere"</item>
     <item msgid="8026148967150231130">"Intern feil"</item>
     <item msgid="5442620760791553027">"Tjenerfeil"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> uleste"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ uleste"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Se flere samtaler"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Laster inn …"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Velg konto"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Logg på"</string>
     <string name="info" msgid="1357564480946178121">"Informasjon"</string>
     <string name="report" msgid="4318141326014579036">"Rapportér"</string>
+    <string name="show" msgid="2874876876336599985">"Vis"</string>
     <string name="sync_error" msgid="1795794969006241678">"Synkroniseringen mislyktes."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Enheten din har ikke nok lagringsplass til å synkronisere."</string>
     <string name="storage" msgid="4783683938444150638">"Lagring"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 18a27fc..d1ff287 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"तपाईँका सन्देशहरू प्राप्त गर्दै"</string>
     <string name="undo" msgid="8256285267701059609">"पूर्ववत"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"ताराङ्कन हटाउँदै <xliff:g id="COUNT">%1$d</xliff:g> कुराकानी।"</item>
-    <item quantity="other" msgid="7677305734833709789">"ताराङ्कन हटाउँदै <xliff:g id="COUNT">%1$d</xliff:g> कुराकानीहरू।"</item>
+    <item quantity="one" msgid="1701235480675303125">"ताराङ्कित नरहेको <xliff:g id="COUNT">%1$d</xliff:g> कुराकानी"</item>
+    <item quantity="other" msgid="1154441830432477256">"ताराङ्कित नरहेका <xliff:g id="COUNT">%1$d</xliff:g> कुराकानीहरू"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मौन गरियो।"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मौन गरियो।"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मौन गरियो"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मौन गरियो"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्यामको रूपमा रिपोर्ट गरियो।"</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्यामको रूपमा रिपोर्ट गरियो।"</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्यामको रूपमा रिपोर्ट गरियो"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्यामको रूपमा रिपोर्ट गरियो"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्याम होइन भनी रिपोर्ट गरियो।"</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्याम होइन भनी रिपोर्ट गरियो।"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्याम नभएको रूपमा रिपोर्ट गरियो"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; स्प्याम नभएको रूपमा रिपोर्ट गरियो"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वपूर्ण होइन भनी चिनो लगाइयो।"</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वपूर्ण होइन भनी चिनो लगाइयो।"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वपूर्ण होइन भनी चिन्ह लगाइयो"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; महत्त्वपूर्ण होइन भनी चिन्ह लगाइयो"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिशिंगको रूपमा रिपोर्ट गरियो।"</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिशिंगको रूपमा रिपोर्ट गरियो।"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिसिङको रूपमा रिपोर्ट गरियो"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; फिसिङको रूपमा रिपोर्ट गरियो"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; सङ्ग्रहित।"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; सङ्ग्रहित।"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; सङ्ग्रहित"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; सङ्ग्रहित"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मेटाइयो।"</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मेटाइयो।"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मेटाइयो"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; मेटाइयो"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"मेटाइयो"</string>
     <string name="archived" msgid="6283673603512713022">"भण्डार गरियो"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>बाट निकालियो"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"फोल्डर परिवर्तन भयो।"</item>
-    <item quantity="other" msgid="8815390494333090939">"फोल्डरहरु परिवर्तन भए।"</item>
+    <item quantity="one" msgid="7787126147584620603">"फोल्डर परिवर्तन भयो।"</item>
+    <item quantity="other" msgid="6307772984911017972">"फोल्डरहरू परिवर्तन भए।"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>मा सारियो"</string>
     <string name="search_results_header" msgid="1529438451150580188">"परिणामहरू"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"यस खातामा खोजी समर्थित छैन।"</string>
     <string name="add_label" msgid="3285338046038610902">"फोल्डर थप्नुहोस्"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> बाट नयाँ सन्देश देखाउनुहोस्।"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> नयाँ सन्देशहरू देखाउनुहोस्।"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> नयाँ सन्देश"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> नयाँ सन्देशहरू"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;विवरणहरू हेर्नुहोस्&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"विवरण लुकाउनुहोस्"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"अघिल्लो"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"सफलता"</item>
-    <item msgid="2972425114100316260">"जडान छैन"</item>
-    <item msgid="8594593386776437871">"साइन इन गर्न सकिँदैन।"</item>
-    <item msgid="1375193906551623606">"सुरक्षा त्रुटि।"</item>
-    <item msgid="195177374927979967">"सिङ्क हुन सकेन"</item>
+    <item msgid="2835492307658712596">"जडान छैन"</item>
+    <item msgid="5932644761344898987">"साइन इन गर्न सकेन"</item>
+    <item msgid="7335227237106118306">"सुरक्षा त्रुटि"</item>
+    <item msgid="8148525741623865182">"सिङ्क गर्न सकेन"</item>
     <item msgid="8026148967150231130">"आन्तरिक त्रुटि"</item>
     <item msgid="5442620760791553027">"सर्भर त्रुटि"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> नपढेको"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ अपठित"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"थप कुराकानीहरू हेर्नुहोस्"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"लोड हुँदै..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"खाता छान्नुहोस्"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"साइन- इन गर्नुहोस्"</string>
     <string name="info" msgid="1357564480946178121">"जानकारी"</string>
     <string name="report" msgid="4318141326014579036">"रिपोर्ट गर्नुहोस्"</string>
+    <string name="show" msgid="2874876876336599985">"देखाउनुहोस्"</string>
     <string name="sync_error" msgid="1795794969006241678">"सिङ्क हुन सकेन"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"तपाईँको उपकरणसँग सिङ्क गर्नको लागि पर्याप्त भण्डारण स्थान छैन।"</string>
     <string name="storage" msgid="4783683938444150638">"भण्डारण"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 74bafe0..20e011f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Uw berichten ophalen"</string>
     <string name="undo" msgid="8256285267701059609">"Ongedaan maken"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Ster verwijderen uit <xliff:g id="COUNT">%1$d</xliff:g> conversatie."</item>
-    <item quantity="other" msgid="7677305734833709789">"Ster verwijderen uit <xliff:g id="COUNT">%1$d</xliff:g> conversaties."</item>
+    <item quantity="one" msgid="1701235480675303125">"Ster verwijderen uit <xliff:g id="COUNT">%1$d</xliff:g> gesprek"</item>
+    <item quantity="other" msgid="1154441830432477256">"Sterren verwijderen uit <xliff:g id="COUNT">%1$d</xliff:g> gesprekken"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gedempt."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gedempt."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; genegeerd"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; genegeerd"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemeld als spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als geen spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als geen spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als geen spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als geen spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemarkeerd als niet belangrijk."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemarkeerd als niet belangrijk."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemarkeerd als niet belangrijk"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemarkeerd als niet belangrijk"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gerapporteerd als phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gearchiveerd."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gearchiveerd."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gearchiveerd"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gearchiveerd"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; verwijderd."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; verwijderd."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; verwijderd"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; verwijderd"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Verwijderd"</string>
     <string name="archived" msgid="6283673603512713022">"Gearchiveerd"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Verwijderd uit <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Map gewijzigd."</item>
-    <item quantity="other" msgid="8815390494333090939">"Mappen gewijzigd."</item>
+    <item quantity="one" msgid="7787126147584620603">"Map gewijzigd"</item>
+    <item quantity="other" msgid="6307772984911017972">"Mappen gewijzigd"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Verplaatst naar <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultaten"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Zoeken wordt niet ondersteund in dit account."</string>
     <string name="add_label" msgid="3285338046038610902">"Map toevoegen"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Nieuw bericht van <xliff:g id="SENDER">%s</xliff:g> weergeven."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten weergeven."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nieuw bericht"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Details bekijken&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Details verbergen"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Vorige"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Geslaagd"</item>
-    <item msgid="2972425114100316260">"Geen verbinding."</item>
-    <item msgid="8594593386776437871">"Kan niet inloggen."</item>
-    <item msgid="1375193906551623606">"Beveiligingsfout."</item>
-    <item msgid="195177374927979967">"Kan niet synchroniseren."</item>
+    <item msgid="2835492307658712596">"Geen verbinding"</item>
+    <item msgid="5932644761344898987">"Kan niet inloggen"</item>
+    <item msgid="7335227237106118306">"Beveiligingsfout"</item>
+    <item msgid="8148525741623865182">"Kan niet synchroniseren"</item>
     <item msgid="8026148967150231130">"Interne fout"</item>
     <item msgid="5442620760791553027">"Serverfout"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ongelezen"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Meer dan <xliff:g id="COUNT">%1$d</xliff:g> ongelezen"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Meer conversaties bekijken"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Laden..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Account kiezen"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Inloggen"</string>
     <string name="info" msgid="1357564480946178121">"Info"</string>
     <string name="report" msgid="4318141326014579036">"Rapporteren"</string>
+    <string name="show" msgid="2874876876336599985">"Weergeven"</string>
     <string name="sync_error" msgid="1795794969006241678">"Kan niet synchroniseren."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Uw apparaat heeft niet voldoende opslagruimte om te synchroniseren."</string>
     <string name="storage" msgid="4783683938444150638">"Opslag"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 73b53f9..e2614a7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Wczytuję wiadomości"</string>
     <string name="undo" msgid="8256285267701059609">"Cofnij"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Cofanie oznaczenia gwiazdką <xliff:g id="COUNT">%1$d</xliff:g> wątku."</item>
-    <item quantity="other" msgid="7677305734833709789">"Cofanie oznaczenia gwiazdką <xliff:g id="COUNT">%1$d</xliff:g> wątków."</item>
+    <item quantity="one" msgid="1701235480675303125">"Cofanie oznaczenia gwiazdką <xliff:g id="COUNT">%1$d</xliff:g> wątku"</item>
+    <item quantity="other" msgid="1154441830432477256">"Cofanie oznaczenia gwiazdką <xliff:g id="COUNT">%1$d</xliff:g> wątków"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zignorowano."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zignorowano."</item>
+    <item quantity="one" msgid="3622533556738049499">"Zignorowane: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4559007262578295280">"Zignorowane: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zgłoszono jako spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zgłoszono jako spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"Zgłoszone jako spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="664292592683692920">"Zgłoszone jako spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Zgłoszone jako nie spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4966164423991098144">"Zgłoszone jako nie spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3680479171846552641">"Zgłoszone jako nie spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6351739502184556635">"Zgłoszone jako nie spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; oznaczono jako mało ważny."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; oznaczono jako mało ważny."</item>
+    <item quantity="one" msgid="7432667428974709669">"Oznaczone jako mało ważne: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4823331037057239763">"Oznaczone jako mało ważne: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Zgłoszone jako wyłudzanie informacji: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="9218674052779504277">"Zgłoszone jako wyłudzanie informacji: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3511804715065046338">"Zgłoszone jako wyłudzanie informacji: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8400382886585779414">"Zgłoszone jako wyłudzanie informacji: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zarchiwizowany."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zarchiwizowane(ych)."</item>
+    <item quantity="one" msgid="4859172326053399351">"Zarchiwizowane: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8520761617935818623">"Zarchiwizowane: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; usunięty."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; usunięte(ych)."</item>
+    <item quantity="one" msgid="4819167474123685161">"Usunięte: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6287534453625638257">"Usunięte: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Usunięty"</string>
     <string name="archived" msgid="6283673603512713022">"Zarchiwizowany"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Usunięto z: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Zmieniono folder."</item>
-    <item quantity="other" msgid="8815390494333090939">"Zmieniono foldery."</item>
+    <item quantity="one" msgid="7787126147584620603">"Zmieniono folder"</item>
+    <item quantity="other" msgid="6307772984911017972">"Zmieniono foldery"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Przeniesiono do: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Wyniki"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Wyszukiwanie nie jest obsługiwane na tym koncie."</string>
     <string name="add_label" msgid="3285338046038610902">"Dodaj folder"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Pokaż nową wiadomość od: <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Pokaż nowe wiadomości (<xliff:g id="COUNT">%1$d</xliff:g>)."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nowa wiadomość"</item>
+    <item quantity="other" msgid="4085982174357328926">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Wyświetl szczegóły&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ukryj szczegóły"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Wstecz"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Udało się"</item>
-    <item msgid="2972425114100316260">"Brak połączenia."</item>
-    <item msgid="8594593386776437871">"Nie można się zalogować."</item>
-    <item msgid="1375193906551623606">"Błąd zabezpieczeń."</item>
-    <item msgid="195177374927979967">"Błąd synchronizacji."</item>
+    <item msgid="2835492307658712596">"Brak połączenia"</item>
+    <item msgid="5932644761344898987">"Nie można się zalogować"</item>
+    <item msgid="7335227237106118306">"Błąd zabezpieczeń"</item>
+    <item msgid="8148525741623865182">"Błąd synchronizacji"</item>
     <item msgid="8026148967150231130">"Błąd wewnętrzny"</item>
     <item msgid="5442620760791553027">"Błąd serwera"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Nieprzeczytane: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Nieprzeczytane: ponad <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Wyświetl więcej rozmów"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Wczytuję…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Wybierz konto"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Zaloguj się"</string>
     <string name="info" msgid="1357564480946178121">"Informacje"</string>
     <string name="report" msgid="4318141326014579036">"Zgłoś"</string>
+    <string name="show" msgid="2874876876336599985">"Wyświetl"</string>
     <string name="sync_error" msgid="1795794969006241678">"Błąd synchronizacji."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"W Twoim urządzeniu jest za mało miejsca na przeprowadzenie synchronizacji."</string>
     <string name="storage" msgid="4783683938444150638">"Pamięć"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5adf8a6..3651233 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"A obter as mensagens"</string>
     <string name="undo" msgid="8256285267701059609">"Anular"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"A remover a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversa."</item>
-    <item quantity="other" msgid="7677305734833709789">"A remover a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversas."</item>
+    <item quantity="one" msgid="1701235480675303125">"A desmarcar com estrela <xliff:g id="COUNT">%1$d</xliff:g> conversa"</item>
+    <item quantity="other" msgid="1154441830432477256">"A desmarcar com estrela <xliff:g id="COUNT">%1$d</xliff:g> conversas"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorada."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignoradas."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorada"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignoradas"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como não sendo spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como não sendo spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como não sendo spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como não sendo spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;  marcadas como não importantes."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não importantes."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não importantes"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivada."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivada."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivada"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivadas"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminadas."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminadas."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminada"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; eliminadas"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Eliminada"</string>
     <string name="archived" msgid="6283673603512713022">"Arquivada"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Removida de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Pasta alterada."</item>
-    <item quantity="other" msgid="8815390494333090939">"Pastas alteradas."</item>
+    <item quantity="one" msgid="7787126147584620603">"Pasta alterada"</item>
+    <item quantity="other" msgid="6307772984911017972">"Pastas alteradas"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Movida para <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultados"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"A pesquisa não é suportada nesta conta."</string>
     <string name="add_label" msgid="3285338046038610902">"Adicionar pasta"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostrar nova mensagem de <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostrar <xliff:g id="COUNT">%1$d</xliff:g> novas mensagens."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem nova"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalhes&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalhes"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Anterior"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Êxito"</item>
-    <item msgid="2972425114100316260">"Sem ligação."</item>
-    <item msgid="8594593386776437871">"Não foi possível iniciar sessão."</item>
-    <item msgid="1375193906551623606">"Erro de segurança"</item>
-    <item msgid="195177374927979967">"Não foi possível sincronizar."</item>
+    <item msgid="2835492307658712596">"Sem ligação"</item>
+    <item msgid="5932644761344898987">"Não foi possível iniciar sessão."</item>
+    <item msgid="7335227237106118306">"Erro de segurança"</item>
+    <item msgid="8148525741623865182">"Não foi possível sincronizar"</item>
     <item msgid="8026148967150231130">"Erro Interno"</item>
     <item msgid="5442620760791553027">"Erro no servidor"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> não lidas"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ não lidas"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ver mais conversas"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"A carregar…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Selecionar conta"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Iniciar sessão"</string>
     <string name="info" msgid="1357564480946178121">"Informações"</string>
     <string name="report" msgid="4318141326014579036">"Relatório"</string>
+    <string name="show" msgid="2874876876336599985">"Mostrar"</string>
     <string name="sync_error" msgid="1795794969006241678">"Não foi possível sincronizar."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"O dispositivo não tem espaço de armazenamento suficiente para sincronizar."</string>
     <string name="storage" msgid="4783683938444150638">"Armazenamento"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 87262a2..00c7abc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Recuperando suas mensagens"</string>
     <string name="undo" msgid="8256285267701059609">"Desfazer"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Removendo a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversa."</item>
-    <item quantity="other" msgid="7677305734833709789">"Removendo a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversas."</item>
+    <item quantity="one" msgid="1701235480675303125">"Removendo estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversa"</item>
+    <item quantity="other" msgid="1154441830432477256">"Removendo estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversas"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorada."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignoradas."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorada"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignoradas"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não sendo spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não sendo spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não sendo spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não sendo spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não importante."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não importantes."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não importante"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não importantes"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivada."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivadas."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivada"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arquivadas"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; excluída."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; excluídas."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; excluída"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; excluídas"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Excluída"</string>
     <string name="archived" msgid="6283673603512713022">"Arquivada"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Removido de <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Pasta alterada."</item>
-    <item quantity="other" msgid="8815390494333090939">"Pastas alteradas."</item>
+    <item quantity="one" msgid="7787126147584620603">"Pasta alterada"</item>
+    <item quantity="other" msgid="6307772984911017972">"Pastas alteradas"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Movida para <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultados"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Não há suporte para pesquisa nesta conta."</string>
     <string name="add_label" msgid="3285338046038610902">"Adicionar pasta"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Mostrar nova mensagem de <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Mostrar <xliff:g id="COUNT">%1$d</xliff:g> novas mensagens."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nova mensagem"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalhes&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalhes"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Anterior"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Êxito"</item>
-    <item msgid="2972425114100316260">"Sem conexão."</item>
-    <item msgid="8594593386776437871">"Falha ao fazer login."</item>
-    <item msgid="1375193906551623606">"Erro de segurança."</item>
-    <item msgid="195177374927979967">"Não foi possível sincronizar."</item>
+    <item msgid="2835492307658712596">"Sem conexão"</item>
+    <item msgid="5932644761344898987">"Não foi possível fazer o login"</item>
+    <item msgid="7335227237106118306">"Erro de segurança"</item>
+    <item msgid="8148525741623865182">"Não foi possível sincronizar"</item>
     <item msgid="8026148967150231130">"Erro interno"</item>
     <item msgid="5442620760791553027">"Erro no servidor"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> não lidas"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ não lidas"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ver mais conversas"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Carregando…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Escolher conta"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Fazer login"</string>
     <string name="info" msgid="1357564480946178121">"Informações"</string>
     <string name="report" msgid="4318141326014579036">"Informar"</string>
+    <string name="show" msgid="2874876876336599985">"Mostrar"</string>
     <string name="sync_error" msgid="1795794969006241678">"Não foi possível sincronizar."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"O dispositivo não tem espaço de armazenamento suficiente para sincronizar."</string>
     <string name="storage" msgid="4783683938444150638">"Armazenamento"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 53bcf51..14ad6eb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Mesaje în curs de încărcare"</string>
     <string name="undo" msgid="8256285267701059609">"Anulaţi"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Se elimină steaua pentru <xliff:g id="COUNT">%1$d</xliff:g> conversaţie."</item>
-    <item quantity="other" msgid="7677305734833709789">"Se elimină steaua pentru <xliff:g id="COUNT">%1$d</xliff:g> (de) conversaţii."</item>
+    <item quantity="one" msgid="1701235480675303125">"Se anulează marcarea cu stea pentru <xliff:g id="COUNT">%1$d</xliff:g> conversație"</item>
+    <item quantity="other" msgid="1154441830432477256">"Se anulează marcarea cu stea pentru <xliff:g id="COUNT">%1$d</xliff:g> (de) conversații"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; suprimată."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; suprimate."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorată"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ignorate"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost raportată ca spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost raportate ca spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raportată ca spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raportate ca spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost raportată că nu este spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost raportate că nu sunt spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raportată ca nefiind spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raportate ca nefiind spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost marcată ca neimportantă."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost marcate ca neimportante."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcată ca neimportant"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcate ca neimportante"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost raportată ca phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost raportate ca phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raportată ca phising"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raportate ca phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost arhivată."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost arhivate."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhivată"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhivate"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost ştearsă."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost şterse."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ștearsă"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; șterse"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Ștearsă"</string>
     <string name="archived" msgid="6283673603512713022">"Arhivată"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Eliminat din <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Dosar modificat."</item>
-    <item quantity="other" msgid="8815390494333090939">"Dosare modificate."</item>
+    <item quantity="one" msgid="7787126147584620603">"S-a schimbat dosarul."</item>
+    <item quantity="other" msgid="6307772984911017972">"S-au schimbat dosarele."</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Mutată în <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Rezultate"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Căutarea nu este acceptată pentru acest cont."</string>
     <string name="add_label" msgid="3285338046038610902">"Adăugați un dosar"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Afișați mesajul nou de la <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Afișați <xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj nou"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Vedeți detalii&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ascundeți detaliile"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Înapoi"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Finalizat"</item>
-    <item msgid="2972425114100316260">"Nicio conexiune."</item>
-    <item msgid="8594593386776437871">"Conectarea a eşuat."</item>
-    <item msgid="1375193906551623606">"Eroare de securitate."</item>
-    <item msgid="195177374927979967">"Sincronizarea a eşuat."</item>
+    <item msgid="2835492307658712596">"Nicio conexiune"</item>
+    <item msgid="5932644761344898987">"Nu s-a putut conecta"</item>
+    <item msgid="7335227237106118306">"Eroare de securitate"</item>
+    <item msgid="8148525741623865182">"Nu s-a putut sincroniza"</item>
     <item msgid="8026148967150231130">"Eroare internă"</item>
     <item msgid="5442620760791553027">"Eroare de server"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> necitite"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Peste <xliff:g id="COUNT">%1$d</xliff:g> necitite"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Afişaţi mai multe conversaţii"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Se încarcă…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Alegeţi un cont"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Conectaţi-vă"</string>
     <string name="info" msgid="1357564480946178121">"Informaţii"</string>
     <string name="report" msgid="4318141326014579036">"Raportaţi"</string>
+    <string name="show" msgid="2874876876336599985">"Afișați"</string>
     <string name="sync_error" msgid="1795794969006241678">"Sincronizarea a eşuat."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Dispozitivul dvs. nu are suficient spaţiu de stocare pentru a se efectua sincronizarea."</string>
     <string name="storage" msgid="4783683938444150638">"Stocare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 679804a..261bf0f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Загрузка…"</string>
     <string name="undo" msgid="8256285267701059609">"Отмена"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Цепочек, с которых снимается пометка: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="7677305734833709789">"Цепочек, с которых снимается пометка: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="1701235480675303125">"С <xliff:g id="COUNT">%1$d</xliff:g> цепочки снята пометка"</item>
+    <item quantity="other" msgid="1154441830432477256">"Пометки сняты с нескольких цепочек: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Скрытых цепочек: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4276111931404654219">"Скрытых цепочек: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка игнорируется"</item>
+    <item quantity="other" msgid="4559007262578295280">"Цепочки игнорируются: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка помечена как спам"</item>
-    <item quantity="other" msgid="5900913789259199137">"Цепочек, помеченных как спам: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка помечена как спам"</item>
+    <item quantity="other" msgid="664292592683692920">"Цепочки помечены как спам: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Цепочек, помеченных как спам: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="4966164423991098144">"Цепочек, помеченных как нужные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка удалена из спама"</item>
+    <item quantity="other" msgid="6351739502184556635">"Цепочки удалены из спама: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Цепочек, помеченных как неважные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="1215472798075869124">"Цепочек, помеченных как неважные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка помечена как неважная"</item>
+    <item quantity="other" msgid="4823331037057239763">"Цепочки помечены как неважные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Цепочек, помеченных как фишинг: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="9218674052779504277">"Цепочек, помеченных как фишинг: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка помечена как фишинг"</item>
+    <item quantity="other" msgid="8400382886585779414">"Цепочки помечены как фишинг: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Архивировано: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Архивировано: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка архивирована"</item>
+    <item quantity="other" msgid="8520761617935818623">"Цепочки архивированы: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Удалено цепочек: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7060256058737892078">"Удалено цепочек: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; цепочка удалена"</item>
+    <item quantity="other" msgid="6287534453625638257">"Цепочки удалены: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Удалено"</string>
     <string name="archived" msgid="6283673603512713022">"Отправлено в архив"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Удалено из папки \"<xliff:g id="FOLDERNAME">%1$s</xliff:g>\""</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Папка изменена."</item>
-    <item quantity="other" msgid="8815390494333090939">"Папки изменены."</item>
+    <item quantity="one" msgid="7787126147584620603">"Папка изменена"</item>
+    <item quantity="other" msgid="6307772984911017972">"Папки изменены"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Перемещено в папку \"<xliff:g id="FOLDERNAME">%1$s</xliff:g>\""</string>
     <string name="search_results_header" msgid="1529438451150580188">"Результаты"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"В этом аккаунте не поддерживается поиск."</string>
     <string name="add_label" msgid="3285338046038610902">"Добавить папку"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Показать новое сообщение (автор: <xliff:g id="SENDER">%s</xliff:g>)"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Показать новые сообщения (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> новое сообщение"</item>
+    <item quantity="other" msgid="4085982174357328926">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Подробности&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Скрыть"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Назад"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Без ошибок"</item>
-    <item msgid="2972425114100316260">"Нет соединения"</item>
-    <item msgid="8594593386776437871">"Не удалось войти"</item>
-    <item msgid="1375193906551623606">"Ошибка системы безопасности"</item>
-    <item msgid="195177374927979967">"Ошибка синхронизации"</item>
+    <item msgid="2835492307658712596">"Нет подключения"</item>
+    <item msgid="5932644761344898987">"Не удалось войти в аккаунт"</item>
+    <item msgid="7335227237106118306">"Ошибка безопасности"</item>
+    <item msgid="8148525741623865182">"Не удалось синхронизировать"</item>
     <item msgid="8026148967150231130">"Внутренняя ошибка"</item>
     <item msgid="5442620760791553027">"Ошибка сервера"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Новых: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Новых: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Другие цепочки писем"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Загрузка..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Выбрать аккаунт"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Вход"</string>
     <string name="info" msgid="1357564480946178121">"Детали"</string>
     <string name="report" msgid="4318141326014579036">"Отчет"</string>
+    <string name="show" msgid="2874876876336599985">"Показать"</string>
     <string name="sync_error" msgid="1795794969006241678">"Ошибка синхронизации"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Недостаточно места для синхронизации"</string>
     <string name="storage" msgid="4783683938444150638">"Память"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 877ed5b..1b468d3 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"ඔබගේ පණිවිඩ ලබාගනිමින්"</string>
     <string name="undo" msgid="8256285267701059609">"අස් කරන්න"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> සංවාදක් තරු සලකුණු නොකරයි."</item>
-    <item quantity="other" msgid="7677305734833709789">"සංවාද <xliff:g id="COUNT">%1$d</xliff:g> ක් තරු නොකරයි."</item>
+    <item quantity="one" msgid="1701235480675303125">"සංවාද <xliff:g id="COUNT">%1$d</xliff:g> කින් තරු ඉවත් කරමින්"</item>
+    <item quantity="other" msgid="1154441830432477256">"සංවාද <xliff:g id="COUNT">%1$d</xliff:g> කින් තරු ඉවත් කරමින්"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් නිශ්ශබ්ද .කරන ලදී"</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් නිශ්ශබ්ද කරන ලදී."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් නිහඬ කරන ලදි"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් නිහඬ කරන ලදි"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් අයාවිත තැපැල් ලෙස වාර්තා කරන ලදි."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් අයාවිත තැපෑලක් ලෙස වාර්තා කරන ලදි."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ආයාචිත ලෙස සලකුණු කරන ලදි"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ආයාචිත ලෙස සලකුණු කරන ලදි"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් අයාවිත තැපෑලක් ලෙස වාර්තා නොකරන ලදි."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් අයාවිත තැපෑලක් ලෙස වාර්තා කරන ලදි."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් ආයාචිත නොවන බව වාර්තා කරන ලදි"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් ආයාචිත නොවන බව වාර්තා කරන ලදි"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් වැදගත් නොවන ලෙස සලකුණු කරන ලදි."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් වැදගත් නොවන ලෙස සලකුණු කරන ලදි."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් වැදගත් නොවන බව සලකුණු කරන ලදි"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් වැදගත් නොවන බව සලකුණු කරන ලදි"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් තතුබෑමක් ලෙස වාර්තා කරන ලදි."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් තතුබෑමක් ලෙස වාර්තා කරන ලදි."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් තතුබෑම ලෙස වාර්තා කරන ලදි"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් තතුබෑම ලෙස වාර්තා කරන ලදි"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් සංරක්ෂණය කරන ලදි."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් සංරක්ෂණය කරන ලදි."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් සංරක්ෂිත කරන ලදි"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් සංරක්ෂිත කරන ලදි"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් මකන ලදි."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් මකාදමන ලදි."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් මකා දමන ලදි"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ක් මකා දමන ලදි"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"මකාදමන ලදී"</string>
     <string name="archived" msgid="6283673603512713022">"සංරක්ෂිත"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> වෙතින් ඉවත් කරන ලදි"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"වෙනස් කරන ලද ෆෝල්ඩරය."</item>
-    <item quantity="other" msgid="8815390494333090939">"වෙනස් කරන ලද ෆෝල්ඩර."</item>
+    <item quantity="one" msgid="7787126147584620603">"ෆෝල්ඩරය වෙනස් කරන ලදි"</item>
+    <item quantity="other" msgid="6307772984911017972">"ෆෝල්ඩර වෙනස් කරන ලදි"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> වෙත ගෙනයන ලදි"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ප්‍රතිඵල"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"මෙම ගිණුම සෙවුමට සහය නොදෙයි."</string>
     <string name="add_label" msgid="3285338046038610902">"ෆෝල්ඩරය එකතු කරන්න"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> වෙතින් නව පණිවිඩ පෙන්වන්න."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"නව පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g> ක් පෙන්වන්න."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"අලුත් පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="4085982174357328926">"අලුත් පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;විස්තර පෙන්වන්න&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"විස්තර සඟවන්න"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"පෙර"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"සාර්ථකයි"</item>
-    <item msgid="2972425114100316260">"සම්බන්ධතාවය නැත."</item>
-    <item msgid="8594593386776437871">"පුරනය වීමට නොහැකි විය."</item>
-    <item msgid="1375193906551623606">"ආරක්‍ෂිත දෝෂයකි."</item>
-    <item msgid="195177374927979967">"සමමුහුර්තකරන කළ නොහැක."</item>
+    <item msgid="2835492307658712596">"සම්බන්ධතාවය නැත"</item>
+    <item msgid="5932644761344898987">"පුරනය වීමට නොහැකි විය"</item>
+    <item msgid="7335227237106118306">"ආරක්‍ෂිත දෝෂය"</item>
+    <item msgid="8148525741623865182">"සමමුහුර්ත කළ නොහැක"</item>
     <item msgid="8026148967150231130">"අභ්‍යන්තර දෝෂය"</item>
     <item msgid="5442620760791553027">"සේවාදායකයේ දෝෂයකි"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"නොකියවූ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"නොකියවූ <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"තවත් සංවාද පෙන්වන්න"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"පූරණය වෙමින්..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"ගිණුම තෝරන්න"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"පුරනය වන්න"</string>
     <string name="info" msgid="1357564480946178121">"තොරතුරු"</string>
     <string name="report" msgid="4318141326014579036">"වාර්තාව"</string>
+    <string name="show" msgid="2874876876336599985">"පෙන්වන්න"</string>
     <string name="sync_error" msgid="1795794969006241678">"සමමුහුර්ත කළ නොහැක."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"ඔබගේ උපාංගයේ සමමුහුර්ත කිරීමට ඇති තරම් ආචනය ඉඩ නොමැත."</string>
     <string name="storage" msgid="4783683938444150638">"ආචයනය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5192fdc..563680a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Prebieha načítavanie správ"</string>
     <string name="undo" msgid="8256285267701059609">"Späť"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Zrušenie označenia hviezdičkou (počet konverzácií: <xliff:g id="COUNT">%1$d</xliff:g>)."</item>
-    <item quantity="other" msgid="7677305734833709789">"Zrušenie označenia hviezdičkou (počet konverzácií: <xliff:g id="COUNT">%1$d</xliff:g>)."</item>
+    <item quantity="one" msgid="1701235480675303125">"Ruší sa označenie <xliff:g id="COUNT">%1$d</xliff:g> konverzácie hviezdičkou"</item>
+    <item quantity="other" msgid="1154441830432477256">"Ruší sa označenie <xliff:g id="COUNT">%1$d</xliff:g> konverzácií hviezdičkou"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"Konverzácie boli ignorované (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
-    <item quantity="other" msgid="4276111931404654219">"Konverzácie boli ignorované (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola ignorovaná"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli ignorované"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola nahlásená ako spam"</item>
-    <item quantity="other" msgid="5900913789259199137">"Konverzácie boli nahlásené ako spam (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola nahlásená ako spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli nahlásené ako spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Počet konverzácií, ktoré boli nahlásené ako Nie je to spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="4966164423991098144">"Počet konverzácií, ktoré boli nahlásené ako Nie je to spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola nahlásená, že nie je spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli nahlásené, že nie sú spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Konverzácie boli označené ako nedôležité (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
-    <item quantity="other" msgid="1215472798075869124">"Konverzácie boli označené ako nedôležité (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola označená ako nedôležitá"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli označené ako nedôležité"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Počet konverzácií nahlásených ako phishing: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
-    <item quantity="other" msgid="9218674052779504277">"Počet konverzácií nahlásených ako phishing: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola nahlásená ako phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli nahlásené ako phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Konverzácie boli archivované (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
-    <item quantity="other" msgid="7789480176789922968">"Konverzácie boli archivované (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola archivovaná"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli archivované"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"Konverzácie boli odstránené (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
-    <item quantity="other" msgid="7060256058737892078">"Konverzácie boli odstránené (počet: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;)."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; konverzácia bola odstránená"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;Konverzácie b&gt;(<xliff:g id="COUNT">%1$d</xliff:g>)&lt;/b&gt; boli odstránené"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Odstránené"</string>
     <string name="archived" msgid="6283673603512713022">"Archivované"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Odstránené z priečinka <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Zmenený priečinok."</item>
-    <item quantity="other" msgid="8815390494333090939">"Zmenené priečinky."</item>
+    <item quantity="one" msgid="7787126147584620603">"Zmenený priečinok"</item>
+    <item quantity="other" msgid="6307772984911017972">"Zmenené priečinky"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Presunuté do priečinka <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Výsledky"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Hľadanie nie je v tomto účte podporované."</string>
     <string name="add_label" msgid="3285338046038610902">"Pridať priečinok"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Zobraziť novú správu od odosielateľa <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Zobraziť nové správy (celkom <xliff:g id="COUNT">%1$d</xliff:g>)."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nová správa"</item>
+    <item quantity="other" msgid="4085982174357328926">"Počet nových správ: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.sk\'&gt;Podrobnosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skryť podrobnosti"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Späť"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Úspech"</item>
-    <item msgid="2972425114100316260">"Žiadne pripojenie."</item>
-    <item msgid="8594593386776437871">"Nepodarilo sa prihlásiť."</item>
-    <item msgid="1375193906551623606">"Chyba zabezpečenia."</item>
-    <item msgid="195177374927979967">"Nepodarilo sa synchronizovať."</item>
+    <item msgid="2835492307658712596">"Bez pripojenia"</item>
+    <item msgid="5932644761344898987">"Nepodarilo sa prihlásiť"</item>
+    <item msgid="7335227237106118306">"Chyba zabezpečenia"</item>
+    <item msgid="8148525741623865182">"Nepodarilo sa synchronizovať"</item>
     <item msgid="8026148967150231130">"Interná chyba"</item>
     <item msgid="5442620760791553027">"Chyba servera"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Počet neprečítaných správ: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ neprečítaných správ"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Zobraziť ďalšie konverzácie"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Prebieha načítavanie..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Vybrať účet"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Prihlásiť sa"</string>
     <string name="info" msgid="1357564480946178121">"Informácie"</string>
     <string name="report" msgid="4318141326014579036">"Prehľad"</string>
+    <string name="show" msgid="2874876876336599985">"Zobraziť"</string>
     <string name="sync_error" msgid="1795794969006241678">"Nepodarilo sa synchronizovať."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Vaše zariadenie nemá dostatočný ukladací priestor potrebný na synchronizáciu."</string>
     <string name="storage" msgid="4783683938444150638">"Úložisko"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1d1a483..9d9535e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Pridobivanje vaših sporočil"</string>
     <string name="undo" msgid="8256285267701059609">"Razveljavi"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Odstranjevanje zvezdice z <xliff:g id="COUNT">%1$d</xliff:g> pogovora."</item>
-    <item quantity="other" msgid="7677305734833709789">"Odstranjevanje zvezdice s toliko pogovorov: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> pogovor z odstranjeno zvezdico"</item>
+    <item quantity="other" msgid="1154441830432477256">"Št. pogovorov z odstranjeno zvezdico: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; prezrt pogovor."</item>
-    <item quantity="other" msgid="4276111931404654219">"Št. prezrtih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; prezrt pogovor"</item>
+    <item quantity="other" msgid="4559007262578295280">"Št. prezrtih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor je prijavljen kot neželen."</item>
-    <item quantity="other" msgid="5900913789259199137">"Št. pogovorov, prijavljenih kot neželenih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor, prijavljen kot neželen"</item>
+    <item quantity="other" msgid="664292592683692920">"Št. pogovorov, prijavljenih kot neželenih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor je bil prijavljen kot neželen."</item>
-    <item quantity="other" msgid="4966164423991098144">"Št. pogovorov, prijavljenih kot neželenih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor, prijavljen kot nevsiljen"</item>
+    <item quantity="other" msgid="6351739502184556635">"Št. pogovorov, prijavljenih kot nevsiljenih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"Označeno kot nepomembno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="1215472798075869124">"Označeno kot pomembno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor, označen kot pomemben"</item>
+    <item quantity="other" msgid="4823331037057239763">"Št. pogovorov, označenih kot pomembnih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor je bil prijavljen kot lažno predstavljanje."</item>
-    <item quantity="other" msgid="9218674052779504277">"Št. pogovorov, prijavljenih kot lažno predstavljanje: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor, prijavljen kot lažno predstavljanje"</item>
+    <item quantity="other" msgid="8400382886585779414">"Št. pogovorov, prijavljenih kot lažno predstavljanje: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"Št. arhiviranih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="7789480176789922968">"Št. arhiviranih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhiviran pogovor"</item>
+    <item quantity="other" msgid="8520761617935818623">"Št. arhiviranih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; izbrisan pogovor."</item>
-    <item quantity="other" msgid="7060256058737892078">"Št. izbrisanih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; izbrisan pogovor"</item>
+    <item quantity="other" msgid="6287534453625638257">"Št. izbrisanih pogovorov: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Izbrisan"</string>
     <string name="archived" msgid="6283673603512713022">"Arhiviran"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Odstranjeno iz <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Spremenjena mapa."</item>
-    <item quantity="other" msgid="8815390494333090939">"Spremenjene mape."</item>
+    <item quantity="one" msgid="7787126147584620603">"Spremenjena mapa"</item>
+    <item quantity="other" msgid="6307772984911017972">"Spremenjene mape"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Premaknjeno v: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Rezultati"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Iskanje ni podprto za ta račun."</string>
     <string name="add_label" msgid="3285338046038610902">"Dodaj mapo"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Prikaži novo sporočilo pošiljatelja <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Prikaži toliko novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> novo sporočilo"</item>
+    <item quantity="other" msgid="4085982174357328926">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ogled podrobnosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skrij podrobnosti"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Nazaj"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Uspešno"</item>
-    <item msgid="2972425114100316260">"Ni povezave."</item>
-    <item msgid="8594593386776437871">"Prijava ni mogoča."</item>
-    <item msgid="1375193906551623606">"Varnostna napaka."</item>
-    <item msgid="195177374927979967">"Sinhroniziranje ni mogoče."</item>
+    <item msgid="2835492307658712596">"Ni povezave"</item>
+    <item msgid="5932644761344898987">"Prijava ni uspela"</item>
+    <item msgid="7335227237106118306">"Varnostna napaka"</item>
+    <item msgid="8148525741623865182">"Sinhroniziranje ni mogoče"</item>
     <item msgid="8026148967150231130">"Notranja napaka"</item>
     <item msgid="5442620760791553027">"Napaka strežnika"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Št. neprebranih: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Št. neprebranih: več kot <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Oglejte si več pogovorov"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Nalaganje ..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Izberite račun"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Prijava"</string>
     <string name="info" msgid="1357564480946178121">"Informacije"</string>
     <string name="report" msgid="4318141326014579036">"Obvestite nas"</string>
+    <string name="show" msgid="2874876876336599985">"Pokaži"</string>
     <string name="sync_error" msgid="1795794969006241678">"Sinhroniziranje ni mogoče."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Naprava nima dovolj prostora za sinhronizacijo."</string>
     <string name="storage" msgid="4783683938444150638">"Shranjevanje"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ea30daa..529f084 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Преузимање порука"</string>
     <string name="undo" msgid="8256285267701059609">"Опозови"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Уклањање звездица са <xliff:g id="COUNT">%1$d</xliff:g> преписке."</item>
-    <item quantity="other" msgid="7677305734833709789">"Уклањање звездица са преписки (<xliff:g id="COUNT">%1$d</xliff:g>)."</item>
+    <item quantity="one" msgid="1701235480675303125">"Уклања се звездица са <xliff:g id="COUNT">%1$d</xliff:g> преписке"</item>
+    <item quantity="other" msgid="1154441830432477256">"Уклања се звездица са преписки (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; преписка је игнорисана."</item>
-    <item quantity="other" msgid="4276111931404654219">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су игнорисане."</item>
+    <item quantity="one" msgid="3622533556738049499">"Игнорисаних: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4559007262578295280">"Игнорисаних: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; је пријављена као непожељна."</item>
-    <item quantity="other" msgid="5900913789259199137">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су пријављене као непожељне."</item>
+    <item quantity="one" msgid="1749550834135461470">"Пријављених као непожељне: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="664292592683692920">"Пријављених као непожељне: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; преписка је пријављена да није непожељна."</item>
-    <item quantity="other" msgid="4966164423991098144">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су пријављене да нису непожељне."</item>
+    <item quantity="one" msgid="3680479171846552641">"Пријављених да нису непожељне: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6351739502184556635">"Пријављених да нису непожељне: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; преписка је означена као неважна."</item>
-    <item quantity="other" msgid="1215472798075869124">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су означене као неважне."</item>
+    <item quantity="one" msgid="7432667428974709669">"Означених као неважне: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4823331037057239763">"Означених као неважне: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; преписка је пријављена као „пецање“."</item>
-    <item quantity="other" msgid="9218674052779504277">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су пријављене као „пецање“."</item>
+    <item quantity="one" msgid="3511804715065046338">"Пријављених као „пецање“: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8400382886585779414">"Пријављених као „пецање“: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; преписка је архивирана."</item>
-    <item quantity="other" msgid="7789480176789922968">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су архивиране."</item>
+    <item quantity="one" msgid="4859172326053399351">"Архивираних: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8520761617935818623">"Архивираних: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; преписка је избрисана."</item>
-    <item quantity="other" msgid="7060256058737892078">"Преписке (&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;) су избрисане."</item>
+    <item quantity="one" msgid="4819167474123685161">"Избрисаних: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6287534453625638257">"Избрисаних: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Избрисано"</string>
     <string name="archived" msgid="6283673603512713022">"Архивирано"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Уклоњено из директоријума <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Директоријум је промењен."</item>
-    <item quantity="other" msgid="8815390494333090939">"Директоријуми су промењени."</item>
+    <item quantity="one" msgid="7787126147584620603">"Промењен је директоријум"</item>
+    <item quantity="other" msgid="6307772984911017972">"Промењени су директоријуми"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Премештена је у <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Резултати"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Претрага није подржана на овом налогу."</string>
     <string name="add_label" msgid="3285338046038610902">"Додај директоријум"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Прикажи нову поруку пошиљаоца <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Прикажи нове поруке (<xliff:g id="COUNT">%1$d</xliff:g>)."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="4085982174357328926">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Прикажи детаље&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Сакриј детаље"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Претходно"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Успешно"</item>
-    <item msgid="2972425114100316260">"Веза није успостављена."</item>
-    <item msgid="8594593386776437871">"Пријављивање није могуће."</item>
-    <item msgid="1375193906551623606">"Безбедносна грешка."</item>
-    <item msgid="195177374927979967">"Синхронизација није могућа."</item>
+    <item msgid="2835492307658712596">"Веза није успостављена"</item>
+    <item msgid="5932644761344898987">"Пријављивање није успело"</item>
+    <item msgid="7335227237106118306">"Безбедносна грешка"</item>
+    <item msgid="8148525741623865182">"Синхронизација није успела"</item>
     <item msgid="8026148967150231130">"Интерна грешка"</item>
     <item msgid="5442620760791553027">"Грешка сервера"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Непрочитаних: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Непрочитаних: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Прикажи још преписки"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Учитава се..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Избор налога"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Пријави ме"</string>
     <string name="info" msgid="1357564480946178121">"Информације"</string>
     <string name="report" msgid="4318141326014579036">"Направи извештај"</string>
+    <string name="show" msgid="2874876876336599985">"Прикажи"</string>
     <string name="sync_error" msgid="1795794969006241678">"Синхронизација није могућа."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"На уређају нема довољно складишног простора за синхронизацију."</string>
     <string name="storage" msgid="4783683938444150638">"Складиштење"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ac92dac..5f601fa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Dina meddelanden hämtas"</string>
     <string name="undo" msgid="8256285267701059609">"Ångra"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Tar bort stjärnmärkning från <xliff:g id="COUNT">%1$d</xliff:g> konversation."</item>
-    <item quantity="other" msgid="7677305734833709789">"Tar bort stjärnmärkning från <xliff:g id="COUNT">%1$d</xliff:g> konversationer."</item>
+    <item quantity="one" msgid="1701235480675303125">"Tar bort stjärnmarkering för <xliff:g id="COUNT">%1$d</xliff:g> konversation"</item>
+    <item quantity="other" msgid="1154441830432477256">"Tar bort stjärnmarkering för <xliff:g id="COUNT">%1$d</xliff:g> konversationer"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har ignorerats."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har ignorerats."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har ignorerats"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har ignorerats"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har anmälts som skräppost."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som skräppost."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som skräppost"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som skräppost"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som Inte skräppost."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som Inte skräppost."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som ej skräppost"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som ej skräppost"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har markerats som icke viktig."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har markerats som icke viktig."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; markerades som ej viktig"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; markerades som ej viktig"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som nätfiske."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som nätfiske."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som nätfiske"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har rapporterats som nätfiske"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har arkiverats."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har arkiverats."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkiverades"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkiverades"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har tagits bort."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; har tagits bort."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raderades"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; raderades"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Borttagen"</string>
     <string name="archived" msgid="6283673603512713022">"Arkiverad"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Borttagen från <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Mappen har ändrats."</item>
-    <item quantity="other" msgid="8815390494333090939">"Mapparna har ändrats."</item>
+    <item quantity="one" msgid="7787126147584620603">"Ändrad mapp"</item>
+    <item quantity="other" msgid="6307772984911017972">"Ändrade mappar"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Flyttades till <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Resultat"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Det går inte att söka i det här kontot."</string>
     <string name="add_label" msgid="3285338046038610902">"Lägg till mapp"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Visa nytt meddelande från <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Visa <xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> nytt meddelande"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Visa information&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Dölj detaljer"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Föregående"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Färdigt"</item>
-    <item msgid="2972425114100316260">"Ingen anslutning."</item>
-    <item msgid="8594593386776437871">"Det gick inte att logga in"</item>
-    <item msgid="1375193906551623606">"Säkerhetsfel."</item>
-    <item msgid="195177374927979967">"Det gick inte att synkronisera."</item>
+    <item msgid="2835492307658712596">"Ingen anslutning"</item>
+    <item msgid="5932644761344898987">"Det gick inte att logga in."</item>
+    <item msgid="7335227237106118306">"Säkerhetsfel"</item>
+    <item msgid="8148525741623865182">"Det gick inte att synkronisera"</item>
     <item msgid="8026148967150231130">"Internt fel"</item>
     <item msgid="5442620760791553027">"Serverfel"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> olästa"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Mer än <xliff:g id="COUNT">%1$d</xliff:g> olästa"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Visa fler konversationer"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Läser in …"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Välj konto"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Logga in"</string>
     <string name="info" msgid="1357564480946178121">"Info"</string>
     <string name="report" msgid="4318141326014579036">"Rapport"</string>
+    <string name="show" msgid="2874876876336599985">"Visa"</string>
     <string name="sync_error" msgid="1795794969006241678">"Det gick inte att synkronisera."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Det finns inte tillräckligt mycket utrymme på lagringsenheten för synkronisering."</string>
     <string name="storage" msgid="4783683938444150638">"Lagring"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 56b11d4..714ba8c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Inaleta barua pepe zako"</string>
     <string name="undo" msgid="8256285267701059609">"Tendua"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Inaondoa nyota kwenye mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="7677305734833709789">"Inaondoa nyota kwenye mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="1701235480675303125">"Inaondoa nyota kwenye mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="1154441830432477256">"Inaondoa nyota kwenye mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamenyamazishwa."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt; <xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamenyamazishwa."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamekomeshwa"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamekomeshwa"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimeripotiwa kama barua taka."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama barua taka."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama barua taka"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama barua taka"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imeripotiwa kuwa siyo barua taka."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imeripotiwa kuwa siyo barua taka."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kuwa si barua taka"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kuwa si barua taka"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kuwa isiyo muhimu."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kuwa isiyo muhimu."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kuwa siyo muhimu"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kuwa siyo muhimu"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imeripotiwa kuwa hadaa."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imeripotiwa kuwa hadaa."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama hadaa"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama hadaa"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;gt: zimehifadhiwa"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;gt: zimehifadhiwa"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamewekwa kwenye kumbukumbu"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamewekwa kwenye kumbukumbu"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imefutwa."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imefutwa."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&gt; yamefutwa"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&gt; yamefutwa"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Imefutwa"</string>
     <string name="archived" msgid="6283673603512713022">"Imewekwa kwenye kumbukumbu"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Imeondolewa kutoka <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Folda iliyobadilishwa."</item>
-    <item quantity="other" msgid="8815390494333090939">"Folda zilizobadilishwa."</item>
+    <item quantity="one" msgid="7787126147584620603">"Folda iliyobadilishwa"</item>
+    <item quantity="other" msgid="6307772984911017972">"Folda zilizobadilishwa"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Imehamishwa kwenda <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Matokeo"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Utafutaji hauauniwi kwenye akaunti hii."</string>
     <string name="add_label" msgid="3285338046038610902">"Ongeza folda"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Onyesha barua pepe mpya kutoka kwa <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Onyesha barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+    <item quantity="other" msgid="4085982174357328926">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tazama maelezo&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ficha maelezo"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Iliyotangulia"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Mafanikio"</item>
-    <item msgid="2972425114100316260">"Hakuna muunganisho."</item>
-    <item msgid="8594593386776437871">"Haikuweza kuingia"</item>
-    <item msgid="1375193906551623606">"Hitilafu ya usalama."</item>
-    <item msgid="195177374927979967">"Haikuweza kusawazisha."</item>
+    <item msgid="2835492307658712596">"Hakuna muunganisho"</item>
+    <item msgid="5932644761344898987">"Haikuweza kuingia"</item>
+    <item msgid="7335227237106118306">"Hitilafu ya usalama"</item>
+    <item msgid="8148525741623865182">"Haikuweza kusawazisha"</item>
     <item msgid="8026148967150231130">"Hitilafu ya Ndani"</item>
     <item msgid="5442620760791553027">"Hitilafu katika Seva"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Hujasoma barua pepe <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Hujasoma zaidi ya barua pepe <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ona mazungumzo zaidi"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Inapakia…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Chagua akaunti"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Ingia"</string>
     <string name="info" msgid="1357564480946178121">"Maelezo"</string>
     <string name="report" msgid="4318141326014579036">"Ripoti"</string>
+    <string name="show" msgid="2874876876336599985">"Onyesha"</string>
     <string name="sync_error" msgid="1795794969006241678">"Haikuweza kusawazisha."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Kifaa chako hakina nafasi ya kutosha ya hifadhi ili kusawazisha."</string>
     <string name="storage" msgid="4783683938444150638">"Hifadhi"</string>
diff --git a/res/values-sw600dp/colors.xml b/res/values-sw600dp/colors.xml
index e18b293..ddd1dee 100644
--- a/res/values-sw600dp/colors.xml
+++ b/res/values-sw600dp/colors.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="conversation_view_item_background_color">@android:color/white</color>
     <color name="folder_list_divider_color">#b2b2b2</color>
 </resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 56201a6..550e444 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -19,7 +19,7 @@
     <dimen name="conversation_message_content_margin_side">32dp</dimen>
     <dimen name="conversation_view_margin_side">24dp</dimen>
     <dimen name="conversation_view_snack_bar_margin">16dp</dimen>
-    <dimen name="conversation_header_padding_side">24dp</dimen>
+    <dimen name="conversation_header_padding_side">36dp</dimen>
     <dimen name="conversation_header_star_size">55dp</dimen>
     <dimen name="conversation_border_margin_side">24dp</dimen>
 
@@ -54,4 +54,6 @@
     <dimen name="empty_view_space">16dip</dimen>
 
     <dimen name="chip_wrapper_start_padding">64dp</dimen>
+
+    <dimen name="action_bar_content_inset_start">60dp</dimen>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 2968af6..0a8b869 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"செய்திகளைப் பெறுகிறது"</string>
     <string name="undo" msgid="8256285267701059609">"செயல்தவிர்"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> உரையாடலில் இருந்து நட்சத்திரம் நீக்கப்படுகிறது."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> உரையாடல்களிலிருந்து நட்சத்திரம் நீக்கப்படுகிறது."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> உரையாடலில் இருந்து நட்சத்திரம் நீக்கப்படுகிறது"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> உரையாடல்களிலிருந்து நட்சத்திரம் நீக்கப்படுகிறது"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் முடக்கப்பட்டது."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல்கள் முடக்கப்பட்டன."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; முடக்கப்பட்டது"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; முடக்கப்பட்டன"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் ஸ்பேம் எனப் புகாரளிக்கப்பட்டது."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல்கள் ஸ்பேம் எனப் புகாரளிக்கப்பட்டன."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ஸ்பேம் எனப் புகாரளிக்கப்பட்டது"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ஸ்பேம் எனப் புகாரளிக்கப்பட்டன"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் ஸ்பேம் அல்ல என அறிவிக்கப்பட்டது."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல்கள் ஸ்பேம் அல்ல என அறிவிக்கப்பட்டன."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ஸ்பேம் அல்ல என புகாரளிக்கப்பட்டது"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ஸ்பேம் அல்ல என புகாரளிக்கப்பட்டன"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் முக்கியமில்லாதததாகக் குறிக்கப்பட்டது."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் முக்கியமில்லாதவையாகக் குறிக்கப்பட்டன"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; முக்கியமில்லாதது எனக் குறிக்கப்பட்டது"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; முக்கியமில்லாதவை எனக் குறிக்கப்பட்டன"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் ஃபிஷிங் எனப் புகாரளிக்கப்பட்டது."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல்கள் ஃபிஷிங் எனப் புகாரளிக்கப்பட்டன."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ஃபிஷிங் எனப் புகாரளிக்கப்பட்டது"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ஃபிஷிங் எனப் புகாரளிக்கப்பட்டன"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் காப்பகப்படுத்தப்பட்டது."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல்கள் காப்பகப்படுத்தப்பட்டன."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; காப்பகப்படுத்தப்பட்டது"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; காப்பகப்படுத்தப்பட்டன"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல் நீக்கப்பட்டது."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; உரையாடல்கள் நீக்கப்பட்டன."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; நீக்கப்பட்டது"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; நீக்கப்பட்டன"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"நீக்கப்பட்டது"</string>
     <string name="archived" msgid="6283673603512713022">"காப்பகப்படுத்தப்பட்டது"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> இலிருந்து நீக்கப்பட்டது"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"மாற்றப்பட்ட கோப்புறை."</item>
-    <item quantity="other" msgid="8815390494333090939">"மாற்றப்பட்ட கோப்புறைகள்."</item>
+    <item quantity="one" msgid="7787126147584620603">"கோப்புறை மாற்றப்பட்டது"</item>
+    <item quantity="other" msgid="6307772984911017972">"கோப்புறைகள் மாற்றப்பட்டன"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> க்கு நகர்த்தப்பட்டது"</string>
     <string name="search_results_header" msgid="1529438451150580188">"முடிவுகள்"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"இந்தக் கணக்கில் தேடல் ஆதரிக்கப்படவில்லை."</string>
     <string name="add_label" msgid="3285338046038610902">"கோப்புறையைச் சேர்"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> இடமிருந்து வந்த புதிய செய்தியை காட்டு."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> புதிய செய்திகளைக் காட்டு."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> புதிய செய்தி"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> புதிய செய்திகள்"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;விவரங்களைக் காட்டு&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"விவரங்களை மறை"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"முந்தையது"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"வெற்றி"</item>
-    <item msgid="2972425114100316260">"இணைப்பு இல்லை."</item>
-    <item msgid="8594593386776437871">"உள்நுழைய முடியவில்லை."</item>
-    <item msgid="1375193906551623606">"பாதுகாப்புப் பிழை."</item>
-    <item msgid="195177374927979967">"ஒத்திசைக்க முடியவில்லை."</item>
+    <item msgid="2835492307658712596">"இணைப்பு இல்லை"</item>
+    <item msgid="5932644761344898987">"உள்நுழைய முடியவில்லை"</item>
+    <item msgid="7335227237106118306">"பாதுகாப்புப் பிழை"</item>
+    <item msgid="8148525741623865182">"ஒத்திசைக்க முடியவில்லை"</item>
     <item msgid="8026148967150231130">"அகப் பிழை"</item>
     <item msgid="5442620760791553027">"சேவையகப் பிழை"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> படிக்காத செய்திகள்"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ படிக்காதவை"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"மேலும் உரையாடல்களைக் காட்டு"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"ஏற்றுகிறது..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"கணக்கைத் தேர்வுசெய்"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"உள்நுழைக"</string>
     <string name="info" msgid="1357564480946178121">"தகவல்"</string>
     <string name="report" msgid="4318141326014579036">"அறிக்கையிடு"</string>
+    <string name="show" msgid="2874876876336599985">"காட்டு"</string>
     <string name="sync_error" msgid="1795794969006241678">"ஒத்திசைக்க முடியவில்லை."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"உங்கள் சாதனத்தில் ஒத்திசைக்கப் போதுமான சேமிப்பிடம் இல்லை."</string>
     <string name="storage" msgid="4783683938444150638">"சேமிப்பிடம்"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index f66ca01..2d20c28 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"మీ సందేశాలను పొందుతోంది"</string>
     <string name="undo" msgid="8256285267701059609">"చర్యరద్దు చేయి"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణకు నక్షత్రం గుర్తు తీసివేస్తోంది."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణలకు నక్షత్రం గుర్తు తీసివేస్తోంది."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణకు నక్షత్రం గుర్తు తీసివేస్తోంది"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణలకు నక్షత్రం గుర్తు తీసివేస్తోంది"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; మ్యూట్ చేయబడింది."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; మ్యూట్ చేయబడ్డాయి."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; మ్యూట్ చేయబడింది"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; మ్యూట్ చేయబడ్డాయి"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్ వలె నివేదించబడింది."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్ అని నివేదించబడ్డాయి."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్‌గా నివేదించబడింది"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్‌గా నివేదించబడ్డాయి"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్ కాదని నివేదించబడింది."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్ కావని నివేదించబడ్డాయి."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్ కాదని నివేదించబడింది"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; స్పామ్ కావని నివేదించబడ్డాయి"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ముఖ్యం కానిదిగా గుర్తు పెట్టబడింది."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ముఖ్యం కానిదిగా గుర్తు పెట్టబడింది."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ముఖ్యం కానిదిగా గుర్తు పెట్టబడింది"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ముఖ్యం కానివిగా గుర్తు పెట్టబడ్డాయి"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఫిషింగ్ అని నివేదించబడింది."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఫిషింగ్ అని నివేదించబడ్డాయి."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఫిషింగ్ అని నివేదించబడింది"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఫిషింగ్ అని నివేదించబడ్డాయి"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఆర్కైవ్ చేయబడింది."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఆర్కైవ్ చేయబడ్డాయి."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఆర్కైవ్ చేయబడింది"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ఆర్కైవ్ చేయబడ్డాయి"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; తొలగించబడింది."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; తొలగించబడ్డాయి."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; తొలగించబడింది"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; తొలగించబడ్డాయి"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"తొలగించబడింది"</string>
     <string name="archived" msgid="6283673603512713022">"ఆర్కైవ్ చేయబడింది"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> నుండి తీసివేయబడింది"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"ఫోల్డర్ మార్చబడింది."</item>
-    <item quantity="other" msgid="8815390494333090939">"ఫోల్డర్‌లు మార్చబడ్డాయి."</item>
+    <item quantity="one" msgid="7787126147584620603">"ఫోల్డర్ మార్చబడింది"</item>
+    <item quantity="other" msgid="6307772984911017972">"ఫోల్డర్‌లు మార్చబడ్డాయి"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>కి తరలించబడింది"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ఫలితాలు"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"ఈ ఖాతాలో శోధనకు మద్దతు లేదు."</string>
     <string name="add_label" msgid="3285338046038610902">"ఫోల్డర్‌ను జోడించండి"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> నుండి కొత్త సందేశాన్ని చూపు."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> కొత్త సందేశాలను చూపు."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> కొత్త సందేశం"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> కొత్త సందేశాలు"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;వివరాలు వీక్షించండి&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"వివరాలను దాచు"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"మునుపటి"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"విజయవంతం"</item>
-    <item msgid="2972425114100316260">"కనెక్షన్ లేదు."</item>
-    <item msgid="8594593386776437871">"సైన్ ఇన్ చేయడం సాధ్యపడలేదు."</item>
-    <item msgid="1375193906551623606">"భద్రతా లోపం."</item>
-    <item msgid="195177374927979967">"సమకాలీకరణ సాధ్యపడలేదు."</item>
+    <item msgid="2835492307658712596">"కనెక్షన్ లేదు"</item>
+    <item msgid="5932644761344898987">"సైన్ ఇన్ చేయడం సాధ్యపడలేదు"</item>
+    <item msgid="7335227237106118306">"భద్రతా లోపం"</item>
+    <item msgid="8148525741623865182">"సమకాలీకరించడం సాధ్యపడలేదు"</item>
     <item msgid="8026148967150231130">"అంతర్గత లోపం"</item>
     <item msgid="5442620760791553027">"సర్వర్ లోపం"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> చదవనివి"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ చదవనివి"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"మరిన్ని సంభాషణలను వీక్షించండి"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"లోడ్ చేస్తోంది…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"ఖాతాను ఎంచుకోండి"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"సైన్-ఇన్ చేయి"</string>
     <string name="info" msgid="1357564480946178121">"సమాచారం"</string>
     <string name="report" msgid="4318141326014579036">"నివేదించు"</string>
+    <string name="show" msgid="2874876876336599985">"చూపు"</string>
     <string name="sync_error" msgid="1795794969006241678">"సమకాలీకరణ సాధ్యపడలేదు."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"మీ పరికరంలో సమకాలీకరించడానికి తగినంత నిల్వ స్థలం లేదు."</string>
     <string name="storage" msgid="4783683938444150638">"నిల్వ"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 7433729..0f4b55b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"กำลังโหลดข้อความของคุณ"</string>
     <string name="undo" msgid="8256285267701059609">"เลิกทำ"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"กำลังยกเลิกการติดดาวการสนทนา <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item>
-    <item quantity="other" msgid="7677305734833709789">"กำลังยกเลิกการติดดาวการสนทนา <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item>
+    <item quantity="one" msgid="1701235480675303125">"กำลังเลิกติดดาวการสนทนา <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item>
+    <item quantity="other" msgid="1154441830432477256">"กำลังเลิกติดดาวการสนทนา <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"ปิดรับ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="4276111931404654219">"ปิดรับ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="3622533556738049499">"ปิดเสียง &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการแล้ว"</item>
+    <item quantity="other" msgid="4559007262578295280">"ปิดเสียง &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการแล้ว"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"รายงานว่าเป็นสแปม &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="5900913789259199137">"รายงานว่าเป็นจดหมายขยะ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="1749550834135461470">"รายงาน &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าเป็นจดหมายขยะแล้ว"</item>
+    <item quantity="other" msgid="664292592683692920">"รายงาน &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าเป็นจดหมายขยะแล้ว"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"ได้รับการรายงานว่าไม่ใช่สแปม &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="4966164423991098144">"ได้รับการรายงานว่าไม่ใช่สแปม &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="3680479171846552641">"รายงาน &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าไม่ใช่จดหมายขยะแล้ว"</item>
+    <item quantity="other" msgid="6351739502184556635">"รายงาน &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าไม่ใช่จดหมายขยะแล้ว"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"ทำเครื่องหมายว่าไม่สำคัญ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="1215472798075869124">"ทำเครื่องหมายว่าไม่สำคัญ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="7432667428974709669">"ทำเครื่องหมาย &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าไม่สำคัญแล้ว"</item>
+    <item quantity="other" msgid="4823331037057239763">"ทำเครื่องหมาย &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าไม่สำคัญแล้ว"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"ได้รับการรายงานว่าเป็นฟิชชิง &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="9218674052779504277">"ได้รับการรายงานว่าเป็นฟิชชิง &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="3511804715065046338">"รายงาน &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าเป็นฟิชชิงแล้ว"</item>
+    <item quantity="other" msgid="8400382886585779414">"รายงาน &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการว่าเป็นฟิชชิงแล้ว"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"เก็บ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="7789480176789922968">"เก็บ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="4859172326053399351">"เก็บ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการแล้ว"</item>
+    <item quantity="other" msgid="8520761617935818623">"เก็บ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการแล้ว"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"ลบ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
-    <item quantity="other" msgid="7060256058737892078">"ลบ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="one" msgid="4819167474123685161">"ลบ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการแล้ว"</item>
+    <item quantity="other" msgid="6287534453625638257">"ลบ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการแล้ว"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ลบแล้ว"</string>
     <string name="archived" msgid="6283673603512713022">"เก็บถาวร"</string>
     <string name="folder_removed" msgid="5656281444688183676">"ลบจาก <xliff:g id="FOLDERNAME">%1$s</xliff:g> แล้ว"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"เปลี่ยนโฟลเดอร์แล้ว"</item>
-    <item quantity="other" msgid="8815390494333090939">"เปลี่ยนโฟลเดอร์แล้ว"</item>
+    <item quantity="one" msgid="7787126147584620603">"เปลี่ยนโฟลเดอร์แล้ว"</item>
+    <item quantity="other" msgid="6307772984911017972">"เปลี่ยนโฟลเดอร์แล้ว"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"ย้ายไปยัง <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"ผลการค้นหา"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"บัญชีนี้ไม่สนับสนุนการค้นหา"</string>
     <string name="add_label" msgid="3285338046038610902">"เพิ่มโฟลเดอร์"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"แสดงข้อความใหม่จาก <xliff:g id="SENDER">%s</xliff:g>"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"แสดงข้อความใหม่ <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;ดูรายละเอียด&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ซ่อนรายละเอียด"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"ก่อนหน้า"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"สำเร็จ"</item>
-    <item msgid="2972425114100316260">"ไม่มีการเชื่อมต่อ"</item>
-    <item msgid="8594593386776437871">"ไม่สามารถลงชื่อเข้าใช้"</item>
-    <item msgid="1375193906551623606">"ข้อผิดพลาดเกี่ยวกับความปลอดภัย"</item>
-    <item msgid="195177374927979967">"ไม่สามารถซิงค์"</item>
+    <item msgid="2835492307658712596">"ไม่มีการเชื่อมต่อ"</item>
+    <item msgid="5932644761344898987">"ไม่สามารถลงชื่อเข้าใช้"</item>
+    <item msgid="7335227237106118306">"ข้อผิดพลาดของการรักษาความปลอดภัย"</item>
+    <item msgid="8148525741623865182">"ไม่สามารถซิงค์"</item>
     <item msgid="8026148967150231130">"ข้อผิดพลาดภายใน"</item>
     <item msgid="5442620760791553027">"เกิดข้อผิดพลาดที่เซิร์ฟเวอร์"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"ยังไม่ได้อ่าน <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"ยังไม่ได้อ่านมากกว่า <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"ดูการสนทนาเพิ่มเติม"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"กำลังโหลด…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"เลือกบัญชี"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"ลงชื่อเข้าใช้"</string>
     <string name="info" msgid="1357564480946178121">"ข้อมูล"</string>
     <string name="report" msgid="4318141326014579036">"รายงาน"</string>
+    <string name="show" msgid="2874876876336599985">"แสดง"</string>
     <string name="sync_error" msgid="1795794969006241678">"ไม่สามารถซิงค์"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"อุปกรณ์ของคุณมีพื้นที่จัดเก็บไม่เพียงพอสำหรับการซิงค์"</string>
     <string name="storage" msgid="4783683938444150638">"พื้นที่จัดเก็บ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2f5a240..99f858a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Kinukuha ang iyong mga mensahe"</string>
     <string name="undo" msgid="8256285267701059609">"I-undo"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Inaalisan ng star ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap."</item>
-    <item quantity="other" msgid="7677305734833709789">"Inaalisan ng star ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap."</item>
+    <item quantity="one" msgid="1701235480675303125">"Inaalis ang star sa <xliff:g id="COUNT">%1$d</xliff:g> pag-uusap"</item>
+    <item quantity="other" msgid="1154441830432477256">"Inaalis ang star sa <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-mute."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-mute."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang naka-mute"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang naka-mute"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat bilang spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat na spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat na spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang hindi spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang hindi spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat na hindi spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat na hindi spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang minarkahang hindi mahalaga."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang minarkahang hindi mahalaga."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang minarkahang hindi mahalaga"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang minarkahang hindi mahalaga"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang phishing."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang phishing."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat na phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang inulat na phishing"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-archive."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-archive."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-archive"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-archive"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang tinanggal."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang tinanggal."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-delete"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang na-delete"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Tinanggal"</string>
     <string name="archived" msgid="6283673603512713022">"Naka-archive"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Inalis sa <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Binagong folder."</item>
-    <item quantity="other" msgid="8815390494333090939">"Mga binagong folder."</item>
+    <item quantity="one" msgid="7787126147584620603">"Binagong folder"</item>
+    <item quantity="other" msgid="6307772984911017972">"Mga binagong folder"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Inilipat sa <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Mga resulta"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Hindi sinusuportahan ang paghahanap sa account na ito."</string>
     <string name="add_label" msgid="3285338046038610902">"Magdagdag ng folder"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Ipakita mga bagong mensahe mula kay <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Ipakita ang <xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> bagong mensahe"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tingnan ang mga detalye&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Itago ang mga detalye"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Nakaraan"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Tagumpay"</item>
-    <item msgid="2972425114100316260">"Walang koneksyon."</item>
-    <item msgid="8594593386776437871">"Hindi makapag-sign in."</item>
-    <item msgid="1375193906551623606">"Error sa seguridad."</item>
-    <item msgid="195177374927979967">"Hindi makapag-sync."</item>
+    <item msgid="2835492307658712596">"Walang koneksyon"</item>
+    <item msgid="5932644761344898987">"Hindi makapag-sign in"</item>
+    <item msgid="7335227237106118306">"Error sa seguridad"</item>
+    <item msgid="8148525741623865182">"Hindi ma-sync"</item>
     <item msgid="8026148967150231130">"Panloob na Error"</item>
     <item msgid="5442620760791553027">"Error sa Server"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> ang hindi pa nababasa"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ na hindi pa nababasa"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Tumingin ng higit pang pag-uusap"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Naglo-load…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Pumili ng account"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Mag-sign-in"</string>
     <string name="info" msgid="1357564480946178121">"Impormasyon"</string>
     <string name="report" msgid="4318141326014579036">"Mag-ulat"</string>
+    <string name="show" msgid="2874876876336599985">"Ipakita"</string>
     <string name="sync_error" msgid="1795794969006241678">"Hindi makapag-sync."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Walang sapat na espasyo ng storage ang iyong device upang makapag-sync."</string>
     <string name="storage" msgid="4783683938444150638">"Storage"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9358a55..b4be7c8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"İletileriniz alınıyor"</string>
     <string name="undo" msgid="8256285267701059609">"Geri Al"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinin yıldızı kaldırılıyor."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinin yıldızı kaldırılıyor."</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinin yıldızı kaldırılıyor"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinin yıldızı kaldırılıyor"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi yoksayıldı."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi yoksayıldı."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi yoksayıldı"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi yoksayıldı"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; öğe spam olarak bildirildi."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi spam olarak bildirildi."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi spam olarak bildirildi"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi spam olarak bildirildi"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisinin spam olmadığı bildirildi."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisinin spam olmadığı bildirildi."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisinin spam olmadığı bildirildi"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisinin spam olmadığı bildirildi"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi önemsiz olarak işaretlendi."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi önemsiz olarak işaretlendi."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi önemli değil olarak işaretlendi"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi önemli değil olarak işaretlendi"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi kimlik avı olarak bildirildi."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi kimlik avı olarak bildirildi."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi kimlik avı olarak bildirildi"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi kimlik avı olarak bildirildi"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi arşivlendi."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi arşivlendi."</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi arşivlendi"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi arşivlendi"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi silindi."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi silindi."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi silindi"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi silindi"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Silindi"</string>
     <string name="archived" msgid="6283673603512713022">"Arşivlendi"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> adlı klasörden kaldırıldı"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Klasör değişti."</item>
-    <item quantity="other" msgid="8815390494333090939">"Klasörler değişti."</item>
+    <item quantity="one" msgid="7787126147584620603">"Klasör değişti"</item>
+    <item quantity="other" msgid="6307772984911017972">"Klasörler değişti"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> klasörüne taşındı"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Sonuçlar"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Bu hesapta arama desteklenmiyor"</string>
     <string name="add_label" msgid="3285338046038610902">"Klasör ekle"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> adlı kişiden gelen yeni mesajı göster."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesajı göster."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ayrıntıları görüntüle&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ayrıntıları gizle"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Önceki"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Başarılı"</item>
-    <item msgid="2972425114100316260">"Bağlantı yok."</item>
-    <item msgid="8594593386776437871">"Oturum açılamadı."</item>
-    <item msgid="1375193906551623606">"Güvenlik hatası."</item>
-    <item msgid="195177374927979967">"Senkronize edilemedi."</item>
+    <item msgid="2835492307658712596">"Bağlantı yok"</item>
+    <item msgid="5932644761344898987">"Oturum açılamadı"</item>
+    <item msgid="7335227237106118306">"Güvenlik hatası"</item>
+    <item msgid="8148525741623865182">"Senkronize edilemedi"</item>
     <item msgid="8026148967150231130">"Dahili Hata"</item>
     <item msgid="5442620760791553027">"Sunucu Hatası"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> tane okunmadı"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ tane okunmadı"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Diğer ileti dizilerini görüntüle"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Yükleniyor..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Hesap seç"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Oturum aç"</string>
     <string name="info" msgid="1357564480946178121">"Bilgi"</string>
     <string name="report" msgid="4318141326014579036">"Bildir"</string>
+    <string name="show" msgid="2874876876336599985">"Göster"</string>
     <string name="sync_error" msgid="1795794969006241678">"Senkronize edilemedi."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Cihazınızda senkronizasyon için yeterli depolama alanı yok."</string>
     <string name="storage" msgid="4783683938444150638">"Depolama"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1e7f718..d0d2746 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Завантаження повідомлень"</string>
     <string name="undo" msgid="8256285267701059609">"Відмінити"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Видалення зірочки з <xliff:g id="COUNT">%1$d</xliff:g> бесіди."</item>
-    <item quantity="other" msgid="7677305734833709789">"Видалення зірочки з бесід: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="1701235480675303125">"Видалення зірочки з <xliff:g id="COUNT">%1$d</xliff:g> ланцюжка повідомлень"</item>
+    <item quantity="other" msgid="1154441830432477256">"Видалення зірочки з ланцюжків повідомлень (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; проігноровано."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; проігноровано."</item>
+    <item quantity="one" msgid="3622533556738049499">"Проігноровано &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4559007262578295280">"Проігноровано &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"Про &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; повідомлено як про спам."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; повідомлено як спам."</item>
+    <item quantity="one" msgid="1749550834135461470">"Позначено як спам &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="664292592683692920">"Позначено як спам &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як не спам."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як не спам."</item>
+    <item quantity="one" msgid="3680479171846552641">"Позначено як не спам &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6351739502184556635">"Позначено як не спам &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як неважливу."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як неважливі."</item>
+    <item quantity="one" msgid="7432667428974709669">"Позначено як неважливий &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4823331037057239763">"Позначено як неважливі &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як фішинг."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як фішинг."</item>
+    <item quantity="one" msgid="3511804715065046338">"Позначено як фішинг &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8400382886585779414">"Позначено як фішинг &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; заархівовано."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; заархівовано."</item>
+    <item quantity="one" msgid="4859172326053399351">"Заархівовано &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8520761617935818623">"Заархівовано &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; видалено."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; видалено."</item>
+    <item quantity="one" msgid="4819167474123685161">"Видалено &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6287534453625638257">"Видалено &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Видалено"</string>
     <string name="archived" msgid="6283673603512713022">"Заархівовано"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Видалено з папки <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Змінено папку."</item>
-    <item quantity="other" msgid="8815390494333090939">"Змінено папки."</item>
+    <item quantity="one" msgid="7787126147584620603">"Змінено папку"</item>
+    <item quantity="other" msgid="6307772984911017972">"Змінено папки"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Переміщено в папку <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Результати"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Функція пошуку в цьому обліковому записі не підтримується."</string>
     <string name="add_label" msgid="3285338046038610902">"Додати папку"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Показати нове повідомлення (автор <xliff:g id="SENDER">%s</xliff:g>)."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Показати нові повідомлення (<xliff:g id="COUNT">%1$d</xliff:g>)."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> нове повідомлення"</item>
+    <item quantity="other" msgid="4085982174357328926">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Див. деталі&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Сховати деталі"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Назад"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Виконано"</item>
-    <item msgid="2972425114100316260">"Немає з’єднання."</item>
-    <item msgid="8594593386776437871">"Не вдалося ввійти."</item>
-    <item msgid="1375193906551623606">"Помилка безпеки."</item>
-    <item msgid="195177374927979967">"Не вдалося синхронізувати."</item>
+    <item msgid="2835492307658712596">"Немає з’єднання"</item>
+    <item msgid="5932644761344898987">"Не вдалося ввійти"</item>
+    <item msgid="7335227237106118306">"Помилка безпеки"</item>
+    <item msgid="8148525741623865182">"Не вдалося синхронізувати"</item>
     <item msgid="8026148967150231130">"Внутрішня помилка"</item>
     <item msgid="5442620760791553027">"Помилка сервера"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"Не прочитано: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"Не прочитано: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Переглянути інші бесіди"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Завантаження…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Вибрати обліковий запис"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Увійти"</string>
     <string name="info" msgid="1357564480946178121">"Інформація"</string>
     <string name="report" msgid="4318141326014579036">"Повідомити"</string>
+    <string name="show" msgid="2874876876336599985">"Показати"</string>
     <string name="sync_error" msgid="1795794969006241678">"Не вдалося синхронізувати."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"У вашому пристрої не вистачає пам’яті для синхронізації."</string>
     <string name="storage" msgid="4783683938444150638">"Пам’ять"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 27c57dc..1cb0b7a 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"آپ کے پیغامات کو حاصل کیا جا رہا ہے"</string>
     <string name="undo" msgid="8256285267701059609">"کالعدم کریں"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> گفتگو سے ستارہ کا نشان ہٹایا جا رہا ہے۔"</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> گفتگوؤں سے ستارے کا نشان ہٹایا جا رہا ہے۔"</item>
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> گفتگو سے ستارے کا نشان ہٹایا جا رہا ہے"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> گفتگوؤں سے ستارے کا نشان ہٹایا جا رہا ہے"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو خاموش کر دیا گیا۔"</item>
-    <item quantity="other" msgid="4276111931404654219">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو خاموش کر دیا گیا۔"</item>
+    <item quantity="one" msgid="3622533556738049499">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو خاموش کر دیا گیا"</item>
+    <item quantity="other" msgid="4559007262578295280">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو خاموش کر دیا گیا"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام کے بطور اطلاع دی گئی۔"</item>
-    <item quantity="other" msgid="5900913789259199137">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام کے بطور اطلاع دی گئی۔"</item>
+    <item quantity="one" msgid="1749550834135461470">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام کے بطور اطلاع دی گئی"</item>
+    <item quantity="other" msgid="664292592683692920">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام کے بطور اطلاع دی گئی"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام نہیں کے بطور اطلاع دی گئی۔"</item>
-    <item quantity="other" msgid="4966164423991098144">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام نہیں کے بطور اطلاع دی گئی۔"</item>
+    <item quantity="one" msgid="3680479171846552641">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام نہیں کے بطور اطلاع دی گئی"</item>
+    <item quantity="other" msgid="6351739502184556635">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی سپام نہیں کے بطور اطلاع دی گئی"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ پر غیر اہم کا نشان لگایا گیا۔"</item>
-    <item quantity="other" msgid="1215472798075869124">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ پر اہم نہیں کا نشان لگایا گیا۔"</item>
+    <item quantity="one" msgid="7432667428974709669">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو غیر اہم کے بطور نشان زد کر دیا گیا"</item>
+    <item quantity="other" msgid="4823331037057239763">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو غیر اہم کے بطور نشان زد کر دیا گیا"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی فریب دہی کے بطور اطلاع دی گئی۔"</item>
-    <item quantity="other" msgid="9218674052779504277">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی فریب دہی کے بطور اطلاع دی گئی۔"</item>
+    <item quantity="one" msgid="3511804715065046338">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی فریب دہی کے بطور اطلاع دی گئی"</item>
+    <item quantity="other" msgid="8400382886585779414">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کی فریب دہی کے بطور اطلاع دی گئی"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ آرکائیو ہوگئی۔"</item>
-    <item quantity="other" msgid="7789480176789922968">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ آرکائیو ہوگئیں۔"</item>
+    <item quantity="one" msgid="4859172326053399351">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو آرکائیو کر دیا گیا"</item>
+    <item quantity="other" msgid="8520761617935818623">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو آرکائیو کر دیا گیا"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ حذف ہوگئی۔"</item>
-    <item quantity="other" msgid="7060256058737892078">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ حذف ہو گئیں۔"</item>
+    <item quantity="one" msgid="4819167474123685161">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو حذف کر دیا گیا"</item>
+    <item quantity="other" msgid="6287534453625638257">"‏‎&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;‎ کو حذف کر دیا گیا"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"حذف ہو گئی"</string>
     <string name="archived" msgid="6283673603512713022">"آرکائیو ہو گئی"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> سے ہٹا دی گئی"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"فولڈر تبدیل کردیا۔"</item>
-    <item quantity="other" msgid="8815390494333090939">"فولڈرز تبدیل کردیے۔"</item>
+    <item quantity="one" msgid="7787126147584620603">"فولڈر تبدیل کر دیا گیا"</item>
+    <item quantity="other" msgid="6307772984911017972">"فولڈرز تبدیل کر دیے گئے"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> میں منتقل کر دی گئی"</string>
     <string name="search_results_header" msgid="1529438451150580188">"نتائج"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"تلاش اس اکاؤنٹ پر تعاون یافتہ نہیں ہے۔"</string>
     <string name="add_label" msgid="3285338046038610902">"فولڈر شامل کریں"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"<xliff:g id="SENDER">%s</xliff:g> کی جانب سے نیا پیغام دکھائیں۔"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"<xliff:g id="COUNT">%1$d</xliff:g> نئے پیغامات دکھائیں۔"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> نیا پیغام"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> نئے پیغامات"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;تفصیل دیکھیں&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"تفصیلات چھپائیں"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"پچھلا"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"کامیابی"</item>
-    <item msgid="2972425114100316260">"کوئی کنکشن نہیں ہے۔"</item>
-    <item msgid="8594593386776437871">"سائن ان نہیں کر سکے۔"</item>
-    <item msgid="1375193906551623606">"سیکیورٹی کی خرابی۔"</item>
-    <item msgid="195177374927979967">"مطابقت پذیری نہیں کی جا سکی۔"</item>
+    <item msgid="2835492307658712596">"کوئی کنکشن نہیں ہے"</item>
+    <item msgid="5932644761344898987">"سائن ان نہیں کیا جا سکا"</item>
+    <item msgid="7335227237106118306">"سیکیورٹی سے متعلق خرابی"</item>
+    <item msgid="8148525741623865182">"مطابقت پذیری نہیں کی جا سکی"</item>
     <item msgid="8026148967150231130">"داخلی خرابی"</item>
     <item msgid="5442620760791553027">"سرور کی خرابی"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> بغیر پڑھے ہوئے"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"‏<xliff:g id="COUNT">%1$d</xliff:g>+‎ بغیر پڑھا ہوا"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"مزید گفتگوئیں دیکھیں"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"لوڈ ہو رہی ہے…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"اکاؤنٹ منتخب کریں"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"سائن ان کریں"</string>
     <string name="info" msgid="1357564480946178121">"معلومات"</string>
     <string name="report" msgid="4318141326014579036">"اطلاع دیں"</string>
+    <string name="show" msgid="2874876876336599985">"دکھائیں"</string>
     <string name="sync_error" msgid="1795794969006241678">"مطابقت پذیر نہیں بنایا جا سکا۔"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"مطابقت پذیر بنانے کیلئے آپ کے آلہ میں کافی اسٹوریج نہیں ہے۔"</string>
     <string name="storage" msgid="4783683938444150638">"اسٹوریج"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 18d08a7..bf8826c 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -174,53 +174,33 @@
     <string name="empty_folder" msgid="3227552635613553855">"Bu yerda hech narsa yo‘q."</string>
     <string name="getting_messages" msgid="8403333791332403244">"Xabarlar yuklanmoqda…"</string>
     <string name="undo" msgid="8256285267701059609">"Qaytarish"</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"<xliff:g id="COUNT">%1$d</xliff:g> ta suhbatdagi yulduzcha olib tashlanmoqda."</item>
-    <item quantity="other" msgid="7677305734833709789">"<xliff:g id="COUNT">%1$d</xliff:g> ta suhbatdan yulduzcha olib tashlanmoqda."</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat ko‘rsatilmaydigan qilindi."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat ko‘rsatilmaydigan qilindi."</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat spam deb belgilandi."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat spam deb belgilandi."</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat spam emas deb belgilandi."</item>
-    <item quantity="other" msgid="4966164423991098144">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat spam emas deb belgilandi."</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat muhim emas deb belgilandi."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat muhim emas deb belgilandi."</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat fishing deb belgilandi."</item>
-    <item quantity="other" msgid="9218674052779504277">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat fishing deb belgilandi."</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat arxivlandi."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat arxivlandi."</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat o‘chirib tashlandi."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ta suhbat o‘chirib tashlandi."</item>
-  </plurals>
+    <!-- no translation found for conversation_unstarred:one (1701235480675303125) -->
+    <!-- no translation found for conversation_unstarred:other (1154441830432477256) -->
+    <!-- no translation found for conversation_muted:one (3622533556738049499) -->
+    <!-- no translation found for conversation_muted:other (4559007262578295280) -->
+    <!-- no translation found for conversation_spammed:one (1749550834135461470) -->
+    <!-- no translation found for conversation_spammed:other (664292592683692920) -->
+    <!-- no translation found for conversation_not_spam:one (3680479171846552641) -->
+    <!-- no translation found for conversation_not_spam:other (6351739502184556635) -->
+    <!-- no translation found for conversation_not_important:one (7432667428974709669) -->
+    <!-- no translation found for conversation_not_important:other (4823331037057239763) -->
+    <!-- no translation found for conversation_phished:one (3511804715065046338) -->
+    <!-- no translation found for conversation_phished:other (8400382886585779414) -->
+    <!-- no translation found for conversation_archived:one (4859172326053399351) -->
+    <!-- no translation found for conversation_archived:other (8520761617935818623) -->
+    <!-- no translation found for conversation_deleted:one (4819167474123685161) -->
+    <!-- no translation found for conversation_deleted:other (6287534453625638257) -->
     <string name="deleted" msgid="7378013910782008375">"O‘chirib tashlandi"</string>
     <string name="archived" msgid="6283673603512713022">"Arxivlandi"</string>
     <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> jildidan olib tashlandi"</string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Jild o‘zgartirildi."</item>
-    <item quantity="other" msgid="8815390494333090939">"Jildlar o‘zgartirildi."</item>
-  </plurals>
+    <!-- no translation found for conversation_folder_changed:one (7787126147584620603) -->
+    <!-- no translation found for conversation_folder_changed:other (6307772984911017972) -->
     <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> jildiga ko‘chirildi"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Natijalar"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Ushbu hisobda qidiruv qo‘llab-quvvatlanmaydi."</string>
     <string name="add_label" msgid="3285338046038610902">"Jild qo‘shish"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Yangi xabarni ko‘rsatish (muallif: <xliff:g id="SENDER">%s</xliff:g>)"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Yangi xabarlarni ko‘rsatish (<xliff:g id="COUNT">%1$d</xliff:g>)."</item>
-  </plurals>
+    <!-- no translation found for new_incoming_messages:one (1532079301006372605) -->
+    <!-- no translation found for new_incoming_messages:other (4085982174357328926) -->
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tafsilotlarni ko‘rish&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Tafsilotlarni yashirish"</string>
     <string name="to_message_header" msgid="3954385178027011919">"Kimga: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
@@ -263,15 +243,10 @@
     <string name="clear" msgid="765949970989448022">"Tozalash"</string>
     <string name="next" msgid="2662478712866255138">"Keyingi"</string>
     <string name="previous" msgid="8985379053279804274">"Avval"</string>
-  <string-array name="sync_status">
-    <item msgid="4600303222943450797">"Bajarildi"</item>
-    <item msgid="2972425114100316260">"Internetga ulanmagan."</item>
-    <item msgid="8594593386776437871">"Tizimga kirib bo‘lmadi."</item>
-    <item msgid="1375193906551623606">"Xavfsizlik xatosi."</item>
-    <item msgid="195177374927979967">"Sinxronlab bo‘lmadi."</item>
-    <item msgid="8026148967150231130">"Ichki xatolik"</item>
-    <item msgid="5442620760791553027">"Server xatosi"</item>
-  </string-array>
+    <!-- no translation found for sync_status:1 (2835492307658712596) -->
+    <!-- no translation found for sync_status:2 (5932644761344898987) -->
+    <!-- no translation found for sync_status:3 (7335227237106118306) -->
+    <!-- no translation found for sync_status:4 (8148525741623865182) -->
     <string name="tap_to_configure" msgid="137172348280050643">"Sozlash uchun bosing"</string>
     <string name="non_synced_folder_description" msgid="3044618511909304701">"Suhbatlarni ko‘rish uchun ushbu jildni sinxronlang."</string>
     <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Jildni sinxronlash"</string>
@@ -281,7 +256,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"O‘qilmagan: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"O‘qilmagan: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Ko‘proq suhbatlarni ko‘rish"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Yuklanmoqda…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Hisobni tanlash"</string>
@@ -315,6 +289,8 @@
     <string name="signin" msgid="4699091478139791244">"Kirish"</string>
     <string name="info" msgid="1357564480946178121">"Ma’lumot"</string>
     <string name="report" msgid="4318141326014579036">"Xabar yuborish"</string>
+    <!-- no translation found for show (2874876876336599985) -->
+    <skip />
     <string name="sync_error" msgid="1795794969006241678">"Sinxronlab bo‘lmadi."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Sinxronlash uchun qurilmangizda yetarli joy yo‘q."</string>
     <string name="storage" msgid="4783683938444150638">"Xotira"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 33f918f..c6d9436 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Đang nhận thư của bạn"</string>
     <string name="undo" msgid="8256285267701059609">"Hoàn tác"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Bỏ gắn dấu sao <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại."</item>
-    <item quantity="other" msgid="7677305734833709789">"Bỏ gắn dấu sao <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại."</item>
+    <item quantity="one" msgid="1701235480675303125">"Đang bỏ dấu sao <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại"</item>
+    <item quantity="other" msgid="1154441830432477256">"Đang bỏ dấu sao <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã ẩn."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã ẩn."</item>
+    <item quantity="one" msgid="3622533556738049499">"Đã bỏ qua &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="4559007262578295280">"Đã bỏ qua &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã báo cáo là spam."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã báo cáo là spam."</item>
+    <item quantity="one" msgid="1749550834135461470">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là spam"</item>
+    <item quantity="other" msgid="664292592683692920">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là spam"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; không phải spam."</item>
-    <item quantity="other" msgid="4966164423991098144">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; không phải spam."</item>
+    <item quantity="one" msgid="3680479171846552641">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; không phải là spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; không phải là spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; được đánh dấu là không quan trọng."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; được đánh dấu là không quan trọng."</item>
+    <item quantity="one" msgid="7432667428974709669">"Đã đánh dấu &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là không quan trọng"</item>
+    <item quantity="other" msgid="4823331037057239763">"Đã đánh dấu &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là không quan trọng"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là lừa đảo."</item>
-    <item quantity="other" msgid="9218674052779504277">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là lừa đảo."</item>
+    <item quantity="one" msgid="3511804715065046338">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là lừa đảo"</item>
+    <item quantity="other" msgid="8400382886585779414">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là lừa đảo"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã lưu trữ."</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã lưu trữ."</item>
+    <item quantity="one" msgid="4859172326053399351">"Đã lưu trữ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="8520761617935818623">"Đã lưu trữ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã xóa."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; đã xóa."</item>
+    <item quantity="one" msgid="4819167474123685161">"Đã xóa &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6287534453625638257">"Đã xóa &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Đã xóa"</string>
     <string name="archived" msgid="6283673603512713022">"Đã lưu trữ"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Đã xóa khỏi <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Đã thay đổi thư mục."</item>
-    <item quantity="other" msgid="8815390494333090939">"Đã thay đổi thư mục."</item>
+    <item quantity="one" msgid="7787126147584620603">"Đã thay đổi thư mục"</item>
+    <item quantity="other" msgid="6307772984911017972">"Đã thay đổi các thư mục"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Đã chuyển vào <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Kết quả"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Không hỗ trợ tính năng tìm kiếm trên tài khoản này."</string>
     <string name="add_label" msgid="3285338046038610902">"Thêm thư mục"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Hiển thị tin nhắn mới từ <xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Hiển thị <xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> thư mới"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> thư mới"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Xem chi tiết&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ẩn chi tiết"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Trước"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Thành công"</item>
-    <item msgid="2972425114100316260">"Không có kết nối."</item>
-    <item msgid="8594593386776437871">"Không thể đăng nhập."</item>
-    <item msgid="1375193906551623606">"Lỗi bảo mật."</item>
-    <item msgid="195177374927979967">"Không thể đồng bộ hóa."</item>
+    <item msgid="2835492307658712596">"Không có kết nối"</item>
+    <item msgid="5932644761344898987">"Không thể đăng nhập"</item>
+    <item msgid="7335227237106118306">"Lỗi bảo mật"</item>
+    <item msgid="8148525741623865182">"Không thể đồng bộ hóa"</item>
     <item msgid="8026148967150231130">"Lỗi nội bộ"</item>
     <item msgid="5442620760791553027">"Lỗi máy chủ"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> chưa đọc"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ chưa đọc"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Xem các cuộc hội thoại khác"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Đang tải…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Chọn tài khoản"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Đăng nhập"</string>
     <string name="info" msgid="1357564480946178121">"Thông tin"</string>
     <string name="report" msgid="4318141326014579036">"Báo cáo"</string>
+    <string name="show" msgid="2874876876336599985">"Hiển thị"</string>
     <string name="sync_error" msgid="1795794969006241678">"Không thể đồng bộ hóa."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Thiết bị của bạn không có đủ dung lượng lưu trữ để đồng bộ hóa."</string>
     <string name="storage" msgid="4783683938444150638">"Dung lượng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6b57ca7..ce6a42e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"正在获取您的邮件"</string>
     <string name="undo" msgid="8256285267701059609">"撤消"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"正在取消 <xliff:g id="COUNT">%1$d</xliff:g> 个会话的星标。"</item>
-    <item quantity="other" msgid="7677305734833709789">"正在取消 <xliff:g id="COUNT">%1$d</xliff:g> 个会话的星标。"</item>
+    <item quantity="one" msgid="1701235480675303125">"正在删除<xliff:g id="COUNT">%1$d</xliff:g>个会话的星标"</item>
+    <item quantity="other" msgid="1154441830432477256">"正在删除<xliff:g id="COUNT">%1$d</xliff:g>个会话的星标"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"已忽略 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话。"</item>
-    <item quantity="other" msgid="4276111931404654219">"已忽略 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话。"</item>
+    <item quantity="one" msgid="3622533556738049499">"已忽略&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话"</item>
+    <item quantity="other" msgid="4559007262578295280">"已忽略&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话列为垃圾邮件。"</item>
-    <item quantity="other" msgid="5900913789259199137">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾邮件。"</item>
+    <item quantity="one" msgid="1749550834135461470">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话举报为垃圾邮件"</item>
+    <item quantity="other" msgid="664292592683692920">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话举报为垃圾邮件"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为非垃圾邮件。"</item>
-    <item quantity="other" msgid="4966164423991098144">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为非垃圾邮件。"</item>
+    <item quantity="one" msgid="3680479171846552641">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话标记为非垃圾邮件"</item>
+    <item quantity="other" msgid="6351739502184556635">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话标记为非垃圾邮件"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为不重要。"</item>
-    <item quantity="other" msgid="1215472798075869124">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为不重要。"</item>
+    <item quantity="one" msgid="7432667428974709669">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话标记为不重要"</item>
+    <item quantity="other" msgid="4823331037057239763">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话标记为不重要"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为网上诱骗。"</item>
-    <item quantity="other" msgid="9218674052779504277">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为网上诱骗。"</item>
+    <item quantity="one" msgid="3511804715065046338">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话举报为网上诱骗"</item>
+    <item quantity="other" msgid="8400382886585779414">"已将&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话举报为网上诱骗"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话归档。"</item>
-    <item quantity="other" msgid="7789480176789922968">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话归档。"</item>
+    <item quantity="one" msgid="4859172326053399351">"已归档&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话"</item>
+    <item quantity="other" msgid="8520761617935818623">"已归档&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"已删除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话。"</item>
-    <item quantity="other" msgid="7060256058737892078">"已删除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话。"</item>
+    <item quantity="one" msgid="4819167474123685161">"已删除&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话"</item>
+    <item quantity="other" msgid="6287534453625638257">"已删除&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;个会话"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"已删除"</string>
     <string name="archived" msgid="6283673603512713022">"已归档"</string>
     <string name="folder_removed" msgid="5656281444688183676">"已从“<xliff:g id="FOLDERNAME">%1$s</xliff:g>”中移除"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"已更改文件夹。"</item>
-    <item quantity="other" msgid="8815390494333090939">"已更改文件夹。"</item>
+    <item quantity="one" msgid="7787126147584620603">"已更改文件夹"</item>
+    <item quantity="other" msgid="6307772984911017972">"已更改文件夹"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"已移至“<xliff:g id="FOLDERNAME">%1$s</xliff:g>”"</string>
     <string name="search_results_header" msgid="1529438451150580188">"结果"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"此帐户不支持搜索。"</string>
     <string name="add_label" msgid="3285338046038610902">"添加文件夹"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"显示来自<xliff:g id="SENDER">%s</xliff:g>的新邮件。"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"显示<xliff:g id="COUNT">%1$d</xliff:g>封新邮件。"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
+    <item quantity="other" msgid="4085982174357328926">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g>&lt;a href=\'http://www.example.com\'&gt;查看详情&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"隐藏详细信息"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"上一步"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"成功"</item>
-    <item msgid="2972425114100316260">"无网络连接。"</item>
-    <item msgid="8594593386776437871">"无法登录。"</item>
-    <item msgid="1375193906551623606">"安全错误。"</item>
-    <item msgid="195177374927979967">"无法同步。"</item>
+    <item msgid="2835492307658712596">"无连接"</item>
+    <item msgid="5932644761344898987">"无法登录"</item>
+    <item msgid="7335227237106118306">"安全错误"</item>
+    <item msgid="8148525741623865182">"无法同步"</item>
     <item msgid="8026148967150231130">"内部错误"</item>
     <item msgid="5442620760791553027">"服务器错误"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"超过<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"查看更多会话"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"正在加载..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"选择帐户"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"登录"</string>
     <string name="info" msgid="1357564480946178121">"信息"</string>
     <string name="report" msgid="4318141326014579036">"提交反馈"</string>
+    <string name="show" msgid="2874876876336599985">"显示"</string>
     <string name="sync_error" msgid="1795794969006241678">"无法同步。"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"您的设备存储空间不足,无法同步。"</string>
     <string name="storage" msgid="4783683938444150638">"存储"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e8a8960..e38660e 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"正在取得訊息"</string>
     <string name="undo" msgid="8256285267701059609">"撤銷"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"正在移除 <xliff:g id="COUNT">%1$d</xliff:g> 個對話群組的星號。"</item>
-    <item quantity="other" msgid="7677305734833709789">"正在移除 <xliff:g id="COUNT">%1$d</xliff:g> 個對話群組的星號。"</item>
+    <item quantity="one" msgid="1701235480675303125">"正在將 <xliff:g id="COUNT">%1$d</xliff:g> 個對話群組的星號移除"</item>
+    <item quantity="other" msgid="1154441830432477256">"正在將 <xliff:g id="COUNT">%1$d</xliff:g> 個對話群組的星號移除"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組。"</item>
-    <item quantity="other" msgid="4276111931404654219">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組。"</item>
+    <item quantity="one" msgid="3622533556738049499">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組"</item>
+    <item quantity="other" msgid="4559007262578295280">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組報告為垃圾郵件。"</item>
-    <item quantity="other" msgid="5900913789259199137">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組舉報為垃圾郵件。"</item>
+    <item quantity="one" msgid="1749550834135461470">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組回報為垃圾郵件"</item>
+    <item quantity="other" msgid="664292592683692920">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組回報為垃圾郵件"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組報告為非垃圾郵件。"</item>
-    <item quantity="other" msgid="4966164423991098144">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組報告為非垃圾郵件。"</item>
+    <item quantity="one" msgid="3680479171846552641">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組回報為非垃圾郵件"</item>
+    <item quantity="other" msgid="6351739502184556635">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組回報為非垃圾郵件"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組標示為不重要。"</item>
-    <item quantity="other" msgid="1215472798075869124">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組標示為不重要。"</item>
+    <item quantity="one" msgid="7432667428974709669">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組標示為不重要"</item>
+    <item quantity="other" msgid="4823331037057239763">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組標示為不重要"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組舉報為詐騙郵件。"</item>
-    <item quantity="other" msgid="9218674052779504277">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組舉報為詐騙郵件。"</item>
+    <item quantity="one" msgid="3511804715065046338">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組回報為詐騙郵件"</item>
+    <item quantity="other" msgid="8400382886585779414">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組回報為詐騙郵件"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組。"</item>
-    <item quantity="other" msgid="7789480176789922968">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組。"</item>
+    <item quantity="one" msgid="4859172326053399351">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組"</item>
+    <item quantity="other" msgid="8520761617935818623">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組。"</item>
-    <item quantity="other" msgid="7060256058737892078">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組。"</item>
+    <item quantity="one" msgid="4819167474123685161">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組"</item>
+    <item quantity="other" msgid="6287534453625638257">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個對話群組"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"已刪除"</string>
     <string name="archived" msgid="6283673603512713022">"已封存"</string>
     <string name="folder_removed" msgid="5656281444688183676">"已從「<xliff:g id="FOLDERNAME">%1$s</xliff:g>」中移除"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"已更改資料夾。"</item>
-    <item quantity="other" msgid="8815390494333090939">"已更改資料夾。"</item>
+    <item quantity="one" msgid="7787126147584620603">"已變更資料夾"</item>
+    <item quantity="other" msgid="6307772984911017972">"已變更資料夾"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"已移至「<xliff:g id="FOLDERNAME">%1$s</xliff:g>」"</string>
     <string name="search_results_header" msgid="1529438451150580188">"結果"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"這個帳戶不支援搜尋功能。"</string>
     <string name="add_label" msgid="3285338046038610902">"新增資料夾"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"顯示來自<xliff:g id="SENDER">%s</xliff:g>的新郵件。"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"顯示 <xliff:g id="COUNT">%1$d</xliff:g> 封新郵件。"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;查看詳細資料&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"隱藏詳細資料"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"上一步"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"成功"</item>
-    <item msgid="2972425114100316260">"沒有連線。"</item>
-    <item msgid="8594593386776437871">"無法登入。"</item>
-    <item msgid="1375193906551623606">"安全錯誤。"</item>
-    <item msgid="195177374927979967">"無法保持同步。"</item>
+    <item msgid="2835492307658712596">"沒有網絡連線"</item>
+    <item msgid="5932644761344898987">"無法登入"</item>
+    <item msgid="7335227237106118306">"安全性錯誤"</item>
+    <item msgid="8148525741623865182">"無法同步處理"</item>
     <item msgid="8026148967150231130">"內部錯誤"</item>
     <item msgid="5442620760791553027">"伺服器錯誤"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> 封未閱讀的郵件"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"超過 <xliff:g id="COUNT">%1$d</xliff:g> 封未閱讀的郵件"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"查看更多對話群組"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"正在載入..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"選擇帳戶"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"登入"</string>
     <string name="info" msgid="1357564480946178121">"資訊"</string>
     <string name="report" msgid="4318141326014579036">"報告"</string>
+    <string name="show" msgid="2874876876336599985">"顯示"</string>
     <string name="sync_error" msgid="1795794969006241678">"無法保持同步。"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"裝置的儲存空間不足,無法保持同步。"</string>
     <string name="storage" msgid="4783683938444150638">"儲存空間"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 07a5661..3407411 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"正在擷取您的郵件"</string>
     <string name="undo" msgid="8256285267701059609">"復原"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"正在移除 <xliff:g id="COUNT">%1$d</xliff:g> 個會話群組的星號。"</item>
-    <item quantity="other" msgid="7677305734833709789">"正在移除 <xliff:g id="COUNT">%1$d</xliff:g> 個會話群組的星號。"</item>
+    <item quantity="one" msgid="1701235480675303125">"正在將 <xliff:g id="COUNT">%1$d</xliff:g> 個會話群組的星號移除"</item>
+    <item quantity="other" msgid="1154441830432477256">"正在將 <xliff:g id="COUNT">%1$d</xliff:g> 個會話群組的星號移除"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組。"</item>
-    <item quantity="other" msgid="4276111931404654219">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組。"</item>
+    <item quantity="one" msgid="3622533556738049499">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組"</item>
+    <item quantity="other" msgid="4559007262578295280">"已略過 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為垃圾郵件。"</item>
-    <item quantity="other" msgid="5900913789259199137">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為垃圾郵件。"</item>
+    <item quantity="one" msgid="1749550834135461470">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為垃圾郵件"</item>
+    <item quantity="other" msgid="664292592683692920">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為垃圾郵件"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為非垃圾郵件。"</item>
-    <item quantity="other" msgid="4966164423991098144">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為非垃圾郵件。"</item>
+    <item quantity="one" msgid="3680479171846552641">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為非垃圾郵件"</item>
+    <item quantity="other" msgid="6351739502184556635">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為非垃圾郵件"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組標示為不重要。"</item>
-    <item quantity="other" msgid="1215472798075869124">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組標示為不重要。"</item>
+    <item quantity="one" msgid="7432667428974709669">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組標示為不重要"</item>
+    <item quantity="other" msgid="4823331037057239763">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組標示為不重要"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為詐騙郵件。"</item>
-    <item quantity="other" msgid="9218674052779504277">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為詐騙郵件。"</item>
+    <item quantity="one" msgid="3511804715065046338">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為詐騙郵件"</item>
+    <item quantity="other" msgid="8400382886585779414">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為詐騙郵件"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組。"</item>
-    <item quantity="other" msgid="7789480176789922968">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組。"</item>
+    <item quantity="one" msgid="4859172326053399351">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組"</item>
+    <item quantity="other" msgid="8520761617935818623">"已封存 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組。"</item>
-    <item quantity="other" msgid="7060256058737892078">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組。"</item>
+    <item quantity="one" msgid="4819167474123685161">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組"</item>
+    <item quantity="other" msgid="6287534453625638257">"已刪除 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"已刪除"</string>
     <string name="archived" msgid="6283673603512713022">"已封存"</string>
     <string name="folder_removed" msgid="5656281444688183676">"已從「<xliff:g id="FOLDERNAME">%1$s</xliff:g>」中移除"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"已變更資料夾。"</item>
-    <item quantity="other" msgid="8815390494333090939">"已變更資料夾。"</item>
+    <item quantity="one" msgid="7787126147584620603">"已變更資料夾"</item>
+    <item quantity="other" msgid="6307772984911017972">"已變更資料夾"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"已移至「<xliff:g id="FOLDERNAME">%1$s</xliff:g>」"</string>
     <string name="search_results_header" msgid="1529438451150580188">"搜尋結果"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"這個帳戶不支援搜尋功能。"</string>
     <string name="add_label" msgid="3285338046038610902">"新增資料夾"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"顯示來自<xliff:g id="SENDER">%s</xliff:g>的新郵件。"</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"顯示 <xliff:g id="COUNT">%1$d</xliff:g> 封新郵件。"</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;查看詳細資料&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"隱藏詳細資料"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"上一步"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"成功"</item>
-    <item msgid="2972425114100316260">"沒有網路連線。"</item>
-    <item msgid="8594593386776437871">"無法登入。"</item>
-    <item msgid="1375193906551623606">"安全性錯誤。"</item>
-    <item msgid="195177374927979967">"無法同步處理。"</item>
+    <item msgid="2835492307658712596">"沒有網路連線"</item>
+    <item msgid="5932644761344898987">"無法登入"</item>
+    <item msgid="7335227237106118306">"安全性錯誤"</item>
+    <item msgid="8148525741623865182">"無法同步處理"</item>
     <item msgid="8026148967150231130">"發生內部錯誤"</item>
     <item msgid="5442620760791553027">"伺服器錯誤"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"超過 <xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"查看更多會話群組"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"載入中…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"選擇帳戶"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"登入"</string>
     <string name="info" msgid="1357564480946178121">"資訊"</string>
     <string name="report" msgid="4318141326014579036">"回報"</string>
+    <string name="show" msgid="2874876876336599985">"顯示"</string>
     <string name="sync_error" msgid="1795794969006241678">"無法同步處理。"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"裝置的儲存空間不足,無法進行同步處理。"</string>
     <string name="storage" msgid="4783683938444150638">"儲存空間"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f4f5c82..47b7ff5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -171,51 +171,51 @@
     <string name="getting_messages" msgid="8403333791332403244">"Ithola imilayezo yakho"</string>
     <string name="undo" msgid="8256285267701059609">"Hlehlisa"</string>
   <plurals name="conversation_unstarred">
-    <item quantity="one" msgid="839233699150563831">"Isusa izinkanyezi engxoxweni engu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="7677305734833709789">"Isusa izinkanyezi ezingxoxweni ezingu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="1701235480675303125">"Isusa inkanyezi kungxoxo engu-<xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="1154441830432477256">"Isusa inkanyezi kuzingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3339638225564408438">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithulisiwe."</item>
-    <item quantity="other" msgid="4276111931404654219">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithulisiwe."</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithulisiwe"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithulisiwe"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="6986172030710967687">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/i-b&gt; ibikwe njengogaxekile."</item>
-    <item quantity="other" msgid="5900913789259199137">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/i-b&gt; ibikwe njengogaxekile."</item>
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengogaxekile"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengogaxekile"</item>
   </plurals>
   <plurals name="conversation_not_spam">
-    <item quantity="one" msgid="2294904093653094150">"Okungu-&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengokungayena ugaxekile."</item>
-    <item quantity="other" msgid="4966164423991098144">"Okungu-&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengokungayena ugaxekile."</item>
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kumakwe njengokungawona ugaxekile"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kumakwe njengokungawona ugaxekile"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="3824809189993339030">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kumakwe njengokungabalulekile."</item>
-    <item quantity="other" msgid="1215472798075869124">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kumakwe njengokungabalulekile."</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kumakwe njengokungabalulekile"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kumakwe njengokungabalulekile"</item>
   </plurals>
   <plurals name="conversation_phished">
-    <item quantity="one" msgid="4330095881258771201">"Okungu-&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengokuyengayo."</item>
-    <item quantity="other" msgid="9218674052779504277">"Okungu-&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengokuyengayo."</item>
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengobugebengu bokweba imininingwane ebucayi"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kubikwe njengobugebengu bokweba imininingwane ebucayi"</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="4127890884907503696">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kufakwe kungobo yomlando"</item>
-    <item quantity="other" msgid="7789480176789922968">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kufakwe kungobo yomlando"</item>
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kufakwe kungobo yomlando"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kufakwe kungobo yomlando"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="5591889079235938982">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; isusiwe."</item>
-    <item quantity="other" msgid="7060256058737892078">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; isusiwe."</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kususiwe"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kususiwe"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Kususiwe"</string>
     <string name="archived" msgid="6283673603512713022">"Okufakwe kungobo yomlando"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Kususiwe ku-<xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="6463727361987396734">"Ifolda eshintshiwe."</item>
-    <item quantity="other" msgid="8815390494333090939">"Amafolda ashintshiwe."</item>
+    <item quantity="one" msgid="7787126147584620603">"Ifolda eshintshiwe"</item>
+    <item quantity="other" msgid="6307772984911017972">"Amafolda ashintshiwe"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Kuhanjiswe ku-<xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Imiphumela"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Usesho alusekelwe kule akhawunti."</string>
     <string name="add_label" msgid="3285338046038610902">"Engeza ifolda"</string>
-    <string name="new_incoming_messages_one" msgid="5933087567495998661">"Bonisa umlayezo omusha osuka ku-<xliff:g id="SENDER">%s</xliff:g>."</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="other" msgid="4394042684501388790">"Bonisa imilayezo emisha engu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo omusha"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Fihla imininingwane"</string>
@@ -262,10 +262,10 @@
     <string name="previous" msgid="8985379053279804274">"Okwangaphambilini"</string>
   <string-array name="sync_status">
     <item msgid="4600303222943450797">"Impumelelo"</item>
-    <item msgid="2972425114100316260">"Akukho ukuxhumana."</item>
-    <item msgid="8594593386776437871">"Ayikwazanga ukungena ngemvume."</item>
-    <item msgid="1375193906551623606">"Iphutha lokuphepha."</item>
-    <item msgid="195177374927979967">"Ayikwazanga ukuvumelanisa."</item>
+    <item msgid="2835492307658712596">"Akukho ukuxhumana"</item>
+    <item msgid="5932644761344898987">"Ayikwazanga ukungena ngemvume."</item>
+    <item msgid="7335227237106118306">"Iphutha lokuphepha"</item>
+    <item msgid="8148525741623865182">"Ayikwazanga ukuvumelanisa"</item>
     <item msgid="8026148967150231130">"Iphutha langaphakathi"</item>
     <item msgid="5442620760791553027">"Iphutha Leseva"</item>
   </string-array>
@@ -278,7 +278,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> akufundiwe"</item>
   </plurals>
-    <string name="actionbar_large_unread_count" msgid="753635978542372792">"<xliff:g id="COUNT">%1$d</xliff:g>+ akufundiwe"</string>
     <string name="view_more_conversations" msgid="8377920000247101901">"Buka izingxoxo ezengeziwe"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Iyalayisha…"</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Khetha i-akhawunti"</string>
@@ -310,6 +309,7 @@
     <string name="signin" msgid="4699091478139791244">"Ngena ngemvume"</string>
     <string name="info" msgid="1357564480946178121">"Ulwazi"</string>
     <string name="report" msgid="4318141326014579036">"Bika"</string>
+    <string name="show" msgid="2874876876336599985">"Bonisa"</string>
     <string name="sync_error" msgid="1795794969006241678">"Ayikwazanga ukuvumelanisa."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Idivayisi yakho ayinaso isikhala sokulondoloza esanele ukuvumelanisa."</string>
     <string name="storage" msgid="4783683938444150638">"Ukugcina"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ccfbb09..8a03c07 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -72,7 +72,7 @@
     <color name="conversation_view_border_color">@color/divider_color</color>
     <color name="conversation_view_background_color">#f5f5f5</color>
     <!-- Overridden on tablet to give a white background -->
-    <color name="conversation_view_item_background_color">@color/conversation_view_background_color</color>
+    <color name="conversation_view_item_background_color">@android:color/white</color>
     <color name="conversation_view_text_color_light">@color/text_color_grey</color>
     <color name="conversation_view_text_color_dark">@color/text_color_black</color>
     <color name="conversation_view_text_color_link_blue">@color/text_color_blue</color>
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 6ca1297..5acb506 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -49,7 +49,7 @@
     <!-- The smallest amount of time the toast bar must remain visible -->
     <integer name="toast_bar_min_duration_ms">500</integer>
     <!-- The largest amount of time the toast bar can remain visible -->
-    <integer name="toast_bar_max_duration_ms">5000</integer>
+    <integer name="toast_bar_max_duration_ms">8000</integer>
     <integer name="conversation_desired_font_size_px">14</integer>
     <!-- matches 'font-size' style in template_conversation_upper.html -->
     <integer name="conversation_unstyled_font_size_px">13</integer>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 791a8ab..6ec24cb 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -223,4 +223,6 @@
 
     <dimen name="account_item_name_start_padding">16dp</dimen>
     <dimen name="account_item_name_end_padding">8dp</dimen>
+
+    <dimen name="action_bar_content_inset_start">72dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9986e5..25e4923 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -91,10 +91,6 @@
     <string name="attachment_permission_denied">Permission denied for the attachment.</string>
     <!-- Displayed for one second after trying to send with no recipients in To field [CHAR LIMIT=200]-->
     <string name="recipient_needed">Add at least one recipient.</string>
-    <!-- Title for recipient error dialog [CHAR LIMIT=200]-->
-    <string name="recipient_error_dialog_title">Recipient error</string>
-    <!-- Title for send confirmation dialog [CHAR LIMIT=200]-->
-    <string name="confirm_send_title">Send message?</string>
     <!-- Messages for send confirmation dialog [CHAR LIMIT=100]-->
     <string name="confirm_send_message_with_no_subject">There\'s no text in the message subject.</string>
     <string name="confirm_send_message_with_no_body">There\'s no text in the message body.</string>
@@ -225,12 +221,6 @@
     <string name="preview_attachment">Preview</string>
     <!-- Read email screen, button name. Save an attachment to sd card. [CHAR LIMIT=10] -->
     <string name="save_attachment">Save</string>
-    <!-- Read email screen, button name. Cancel a downloading attachment. [CHAR LIMIT=10] -->
-    <string name="cancel_attachment">Cancel</string>
-    <!-- Read email screen, button name. Open an attachment. [CHAR LIMIT=10] -->
-    <string name="open_attachment">Open</string>
-    <!-- Read email screen, button name. Install an attachment. [CHAR LIMIT=10] -->
-    <string name="install_attachment">Install</string>
     <!-- Read email screen, button name. Redownload an attachment [CHAR LIMIT=20]-->
     <string name="download_again">Download again</string>
     <!-- A supplemental option on attachments for apps to override. This string intentionally blank here. [CHAR LIMIT=20] -->
@@ -281,10 +271,6 @@
     <string name="contextmenu_map">Map</string>
     <!-- Menu item to share link  [CHAR LIMIT=50]-->
     <string name="contextmenu_sharelink">Share link</string>
-    <!-- Menu item that displays the help page for Gmail.  [CHAR LIMIT=50]-->
-    <string name="contextmenu_help">Help</string>
-    <!-- Solicit feedback string in about screen [CHAR LIMIT=50]-->
-    <string name="contextmenu_feedback">Send feedback</string>
 
     <!-- Browse list item strings -->
     <!-- Formatting string for the content description field of a conversation list item when device is in accessibility mode. [CHAR LIMIT=250] -->
@@ -469,12 +455,6 @@
     <plurals name="show_messages_read">
         <item quantity="other"><xliff:g id="count" example="4">%1$d</xliff:g> older messages</item>
     </plurals>
-    <!-- This string is used for accessibility purposes only. It is used when the user
-         taps on the collapsed block in collapsed mode when a conversation
-         has more than one read message. [CHAR LIMIT=UNLIMITED] -->
-    <plurals name="super_collapsed_loading_content_description">
-        <item quantity="other">Loading <xliff:g id="count" example="4">%1$d</xliff:g> older messages</item>
-    </plurals>
     <!-- Shown to display the from address of the message [CHAR LIMIT=10] -->
     <string name="from_heading">From:</string>
     <!-- Shown to display the reply to address of the message [CHAR LIMIT=20] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 13be0d1..bfbffcc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -271,6 +271,7 @@
     </style>
 
     <style name="ConversationSubjectStyle">
+        <item name="android:lineSpacingExtra">4sp</item>
         <item name="android:textColor">@color/conversation_view_text_color_dark</item>
         <item name="android:textSize">@dimen/conversation_header_font_size</item>
     </style>
@@ -302,7 +303,6 @@
     </style>
 
     <style name="AbstractMessageHeaderSubtitleStyle">
-        <item name="android:maxLines">1</item>
         <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
         <item name="android:textColor">@color/conversation_view_text_color_light</item>
         <item name="android:textColorLink">@color/conversation_view_text_color_link_blue</item>
@@ -310,6 +310,7 @@
 
     <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
         <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:singleLine">true</item>
     </style>
 
     <style name="MessageHeaderSnippetStyle">
diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java
index 6c4c3cf..3fef7b3 100644
--- a/src/com/android/mail/MailIntentService.java
+++ b/src/com/android/mail/MailIntentService.java
@@ -21,7 +21,7 @@
 import android.net.Uri;
 
 import com.android.mail.analytics.Analytics;
-import com.android.mail.photo.ContactPhotoFetcher;
+import com.android.mail.photo.ContactFetcher;
 import com.android.mail.providers.Account;
 import com.android.mail.providers.Folder;
 import com.android.mail.utils.FolderUri;
@@ -74,7 +74,7 @@
 
         if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
             NotificationUtils.cancelAndResendNotificationsOnLocaleChange(
-                    this, getContactPhotoFetcher());
+                    this, getContactFetcher());
         } else if (ACTION_CLEAR_NEW_MAIL_NOTIFICATIONS.equals(action)) {
             final Account account = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
             final Folder folder = intent.getParcelableExtra(Utils.EXTRA_FOLDER);
@@ -87,7 +87,7 @@
             final Uri folderUri = intent.getParcelableExtra(Utils.EXTRA_FOLDER_URI);
 
             NotificationUtils.resendNotifications(this, false, accountUri,
-                    new FolderUri(folderUri), getContactPhotoFetcher());
+                    new FolderUri(folderUri), getContactFetcher());
         } else if (ACTION_RESEND_NOTIFICATIONS_WEAR.equals(action)) {
             final Account account = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
             final Folder folder = intent.getParcelableExtra(Utils.EXTRA_FOLDER);
@@ -97,7 +97,7 @@
             // when user replies to a conversation remotely from a Wear device.
             NotificationUtils.markConversationAsReadAndSeen(this, conversationUri);
             NotificationUtils.resendNotifications(this, false, account.uri,
-                    folder.folderUri, getContactPhotoFetcher());
+                    folder.folderUri, getContactFetcher());
         } else if (ACTION_SEND_SET_NEW_EMAIL_INDICATOR.equals(action)) {
             final int unreadCount = intent.getIntExtra(NotificationUtils.EXTRA_UNREAD_COUNT, 0);
             final int unseenCount = intent.getIntExtra(NotificationUtils.EXTRA_UNSEEN_COUNT, 0);
@@ -107,7 +107,7 @@
                     intent.getBooleanExtra(NotificationUtils.EXTRA_GET_ATTENTION, false);
 
             NotificationUtils.setNewEmailIndicator(this, unreadCount, unseenCount,
-                    account, folder, getAttention, getContactPhotoFetcher());
+                    account, folder, getAttention, getContactFetcher());
         } else if (Intent.ACTION_DEVICE_STORAGE_LOW.equals(action)) {
             // The storage_low state is recorded centrally even though
             // no handler might be present to change application state
@@ -125,11 +125,11 @@
     }
 
     /**
-     * Derived classes should override this method if they wish to provide their
-     * own photo loading behavior separate from the ContactProvider-based default.
-     * The default behavior of this method returns null.
+     * Derived classes should override this method if they wish to provide their own contact loading
+     * behavior separate from the ContactProvider-based default, primarily contact photo and contact
+     * lookup uri fetching. The default behavior of this method returns null.
      */
-    public ContactPhotoFetcher getContactPhotoFetcher() {
+    public ContactFetcher getContactFetcher() {
         return null;
     }
 }
diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index 9305c6d..091de9c 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java
@@ -1012,8 +1012,11 @@
 
     @Override
     protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) {
-        mOverlayAdapter.focusFirstMessageHeader();
-        return true;
+        if (mOverlayAdapter != null) {
+            mOverlayAdapter.focusFirstMessageHeader();
+            return true;
+        }
+        return false;
     }
 
     public void focusFirstMessageHeader() {
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 3aa93c5..028c3e1 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -67,6 +67,7 @@
 import com.android.mail.bitmap.CheckableContactFlipDrawable;
 import com.android.mail.bitmap.ContactDrawable;
 import com.android.mail.perf.Timer;
+import com.android.mail.providers.Account;
 import com.android.mail.providers.Conversation;
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider;
@@ -77,7 +78,6 @@
 import com.android.mail.ui.ControllableActivity;
 import com.android.mail.ui.ConversationCheckedSet;
 import com.android.mail.ui.ConversationSetObserver;
-import com.android.mail.ui.DividedImageCanvas.InvalidateCallback;
 import com.android.mail.ui.FolderDisplayer;
 import com.android.mail.ui.SwipeableItemView;
 import com.android.mail.ui.SwipeableListView;
@@ -89,12 +89,11 @@
 import com.android.mail.utils.ViewUtils;
 import com.google.common.annotations.VisibleForTesting;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 public class ConversationItemView extends View
-        implements SwipeableItemView, ToggleableItem, InvalidateCallback, ConversationSetObserver,
+        implements SwipeableItemView, ToggleableItem, ConversationSetObserver,
         BadgeSpan.BadgeSpanDimensions {
 
     // Timer.
@@ -109,6 +108,8 @@
     private static final String PERF_TAG_CALCULATE_COORDINATES = "CCHV.coordinates";
     private static final String LOG_TAG = LogTag.getLogTag();
 
+    private static final Typeface SANS_SERIF_BOLD = Typeface.create("sans-serif", Typeface.BOLD);
+
     private static final Typeface SANS_SERIF_LIGHT = Typeface.create("sans-serif-light",
             Typeface.NORMAL);
 
@@ -182,7 +183,7 @@
 
     private final Context mContext;
 
-    public ConversationItemViewModel mHeader;
+    private ConversationItemViewModel mHeader;
     private boolean mDownEvent;
     private boolean mChecked = false;
     private ConversationCheckedSet mCheckedConversationSet;
@@ -192,7 +193,7 @@
     private boolean mDividerEnabled;
     private AnimatedAdapter mAdapter;
     private float mAnimatedHeightFraction = 1.0f;
-    private final String mAccount;
+    private final Account mAccount;
     private ControllableActivity mActivity;
     private final TextView mSendersTextView;
     private final TextView mSubjectTextView;
@@ -510,7 +511,7 @@
         }
     }
 
-    public ConversationItemView(Context context, String account) {
+    public ConversationItemView(Context context, Account account) {
         super(context);
         Utils.traceBeginSection("CIVC constructor");
         setClickable(true);
@@ -638,8 +639,8 @@
             final boolean swipeEnabled, final boolean importanceMarkersEnabled,
             final boolean showChevronsEnabled, final AnimatedAdapter adapter) {
         Utils.traceBeginSection("CIVC.bind");
-        bind(ConversationItemViewModel.forConversation(mAccount, conversation), activity,
-                null /* conversationItemAreaClickListener */,
+        bind(ConversationItemViewModel.forConversation(mAccount.getEmailAddress(), conversation),
+                activity, null /* conversationItemAreaClickListener */,
                 set, folder, checkboxOrSenderImage, swipeEnabled, importanceMarkersEnabled,
                 showChevronsEnabled, adapter, -1 /* backgroundOverrideResId */,
                 null /* photoBitmap */, false /* useFullMargins */, true /* mDividerEnabled */);
@@ -678,8 +679,7 @@
             final boolean newlyBound = header.conversation.id != mHeader.conversation.id;
             // If this was previously bound to a different conversation, remove any contact photo
             // manager requests.
-            if (newlyBound || (mHeader.displayableNames != null && !mHeader
-                    .displayableNames.equals(header.displayableNames))) {
+            if (newlyBound || (!mHeader.displayableNames.equals(header.displayableNames))) {
                 mSendersImageView.getContactDrawable().unbind();
             }
 
@@ -949,18 +949,20 @@
                     .createMessageInfo(context, mHeader.conversation, true);
             int maxChars = ConversationItemViewCoordinates.getSendersLength(context,
                     mCoordinates.getMode(), mHeader.conversation.hasAttachments);
-            mHeader.displayableEmails = new ArrayList<String>();
-            mHeader.displayableNames = new ArrayList<String>();
-            mHeader.styledNames = new ArrayList<SpannableString>();
+
+            mHeader.mSenderAvatarModel.clear();
+            mHeader.displayableNames.clear();
+            mHeader.styledNames.clear();
 
             SendersView.format(context, mHeader.conversation.conversationInfo,
                     mHeader.messageInfoString.toString(), maxChars, mHeader.styledNames,
-                    mHeader.displayableNames, mHeader.displayableEmails, mAccount,
-                    mDisplayedFolder.shouldShowRecipients(), true);
+                    mHeader.displayableNames, mHeader.mSenderAvatarModel,
+                    mAccount.getEmailAddress(), mDisplayedFolder.shouldShowRecipients(), true);
 
-            if (mHeader.displayableEmails.isEmpty() && mHeader.hasDraftMessage) {
-                mHeader.displayableEmails.add(mAccount);
-                mHeader.displayableNames.add(mAccount);
+            if (mHeader.mSenderAvatarModel.isNotPopulated() && mHeader.hasDraftMessage) {
+                mHeader.mSenderAvatarModel.populate(mAccount.getDisplayName(),
+                        mAccount.getEmailAddress());
+                mHeader.displayableNames.add(mAccount.getDisplayName());
             }
 
             // If we have displayable senders, load their thumbnails
@@ -994,8 +996,7 @@
     // is immutable.
     private void loadImages() {
         if (mGadgetMode != ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO
-                || mHeader.displayableEmails == null
-                || mHeader.displayableEmails.isEmpty()) {
+                || mHeader.mSenderAvatarModel.isNotPopulated()) {
             return;
         }
         if (mCoordinates.contactImagesWidth <= 0 || mCoordinates.contactImagesHeight <= 0) {
@@ -1013,7 +1014,8 @@
         final ContactDrawable drawable = mSendersImageView.getContactDrawable();
         drawable.setDecodeDimensions(mCoordinates.contactImagesWidth,
                 mCoordinates.contactImagesHeight);
-        drawable.bind(mHeader.displayableNames.get(0), mHeader.displayableEmails.get(0));
+        drawable.bind(mHeader.mSenderAvatarModel.getName(),
+                mHeader.mSenderAvatarModel.getEmailAddress());
         Utils.traceEndSection();
     }
 
@@ -1424,7 +1426,7 @@
 
         // Date.
         sPaint.setTextSize(mCoordinates.dateFontSize);
-        sPaint.setTypeface(isUnread ? Typeface.SANS_SERIF : SANS_SERIF_LIGHT);
+        sPaint.setTypeface(isUnread ? SANS_SERIF_BOLD : SANS_SERIF_LIGHT);
         sPaint.setColor(isUnread ? sDateTextColorUnread : sDateTextColorRead);
         drawText(canvas, mHeader.dateText, mDateX, mCoordinates.dateYBaseline, sPaint);
 
@@ -1933,7 +1935,7 @@
         return sScrollSlop;
     }
 
-    public String getAccount() {
-        return mAccount;
+    public String getAccountEmailAddress() {
+        return mAccount.getEmailAddress();
     }
 }
diff --git a/src/com/android/mail/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
index cc30d85..84cf59a 100644
--- a/src/com/android/mail/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java
@@ -24,7 +24,6 @@
 import android.text.StaticLayout;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
-import android.text.style.CharacterStyle;
 import android.util.LruCache;
 import android.util.Pair;
 
@@ -119,21 +118,20 @@
     private String mContentDescription;
 
     /**
-     * Email addresses corresponding to the senders/recipients that will be displayed on the top
-     * line; used to generate the conversation icon.
+     * The email address and name of the sender whose avatar will be drawn as a conversation icon.
      */
-    public ArrayList<String> displayableEmails;
+    public final SenderAvatarModel mSenderAvatarModel = new SenderAvatarModel();
 
     /**
      * Display names corresponding to the email address for the senders/recipients that will be
      * displayed on the top line.
      */
-    public ArrayList<String> displayableNames;
+    public final ArrayList<String> displayableNames = new ArrayList<>();
 
     /**
      * A styled version of the {@link #displayableNames} to be displayed on the top line.
      */
-    public ArrayList<SpannableString> styledNames;
+    public final ArrayList<SpannableString> styledNames = new ArrayList<>();
 
     /**
      * Returns the view model for a conversation. If the model doesn't exist for this conversation
@@ -318,4 +316,45 @@
             sConversationHeaderMap.evictAll();
         }
     }
+
+    /**
+     * This mutable model stores the name and email address of the sender for whom an avatar will
+     * be drawn as the conversation icon.
+     */
+    public static final class SenderAvatarModel {
+        private String mEmailAddress;
+        private String mName;
+
+        public String getEmailAddress() {
+            return mEmailAddress;
+        }
+
+        public String getName() {
+            return mName;
+        }
+
+        /**
+         * Removes the name and email address of the participant of this avatar.
+         */
+        public void clear() {
+            populate(null, null);
+        }
+
+        /**
+         * @param name the name of the participant of this avatar
+         * @param emailAddress the email address of the participant of this avatar
+         */
+        public void populate(String name, String emailAddress) {
+            mName = name;
+            mEmailAddress = emailAddress;
+        }
+
+        /**
+         * @return <tt>true</tt> if this model does not yet contain enough data to produce an
+         *      avatar image; <tt>false</tt> otherwise
+         */
+        public boolean isNotPopulated() {
+            return mEmailAddress == null;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/mail/browse/SendersView.java b/src/com/android/mail/browse/SendersView.java
index 3f05ab5..734a59a 100644
--- a/src/com/android/mail/browse/SendersView.java
+++ b/src/com/android/mail/browse/SendersView.java
@@ -36,15 +36,19 @@
 import com.android.mail.providers.ConversationInfo;
 import com.android.mail.providers.ParticipantInfo;
 import com.android.mail.providers.UIProvider;
-import com.android.mail.ui.DividedImageCanvas;
 import com.android.mail.utils.ObjectCache;
 import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class SendersView {
+    /** The maximum number of senders to display for a given conversation */
+    private static final int MAX_SENDER_COUNT = 4;
+
     private static final Integer DOES_NOT_EXIST = -5;
     // FIXME(ath): make all of these statics instance variables, and have callers hold onto this
     // instance as long as appropriate (e.g. activity lifetime).
@@ -220,12 +224,13 @@
 
     public static void format(Context context, ConversationInfo conversationInfo,
             String messageInfo, int maxChars, ArrayList<SpannableString> styledSenders,
-            ArrayList<String> displayableSenderNames, ArrayList<String> displayableSenderEmails,
+            ArrayList<String> displayableSenderNames,
+            ConversationItemViewModel.SenderAvatarModel senderAvatarModel,
             String account, final boolean showToHeader, final boolean resourceCachingRequired) {
         try {
             getSenderResources(context, resourceCachingRequired);
             format(context, conversationInfo, messageInfo, maxChars, styledSenders,
-                    displayableSenderNames, displayableSenderEmails, account,
+                    displayableSenderNames, senderAvatarModel, account,
                     sUnreadStyleSpan, sReadStyleSpan, showToHeader, resourceCachingRequired);
         } finally {
             if (!resourceCachingRequired) {
@@ -236,14 +241,15 @@
 
     public static void format(Context context, ConversationInfo conversationInfo,
             String messageInfo, int maxChars, ArrayList<SpannableString> styledSenders,
-            ArrayList<String> displayableSenderNames, ArrayList<String> displayableSenderEmails,
+            ArrayList<String> displayableSenderNames,
+            ConversationItemViewModel.SenderAvatarModel senderAvatarModel,
             String account, final TextAppearanceSpan notificationUnreadStyleSpan,
             final CharacterStyle notificationReadStyleSpan, final boolean showToHeader,
             final boolean resourceCachingRequired) {
         try {
             getSenderResources(context, resourceCachingRequired);
             handlePriority(maxChars, messageInfo, conversationInfo, styledSenders,
-                    displayableSenderNames, displayableSenderEmails, account,
+                    displayableSenderNames, senderAvatarModel, account,
                     notificationUnreadStyleSpan, notificationReadStyleSpan, showToHeader);
         } finally {
             if (!resourceCachingRequired) {
@@ -254,10 +260,12 @@
 
     private static void handlePriority(int maxChars, String messageInfoString,
             ConversationInfo conversationInfo, ArrayList<SpannableString> styledSenders,
-            ArrayList<String> displayableSenderNames, ArrayList<String> displayableSenderEmails,
+            ArrayList<String> displayableSenderNames,
+            ConversationItemViewModel.SenderAvatarModel senderAvatarModel,
             String account, final TextAppearanceSpan unreadStyleSpan,
             final CharacterStyle readStyleSpan, final boolean showToHeader) {
-        boolean shouldAddPhotos = displayableSenderEmails != null;
+        final boolean shouldSelectSenders = displayableSenderNames != null;
+        final boolean shouldSelectAvatar = senderAvatarModel != null;
         int maxPriorityToInclude = -1; // inclusive
         int numCharsUsed = messageInfoString.length(); // draft, number drafts,
                                                        // count
@@ -297,18 +305,15 @@
         } finally {
             PRIORITY_LENGTH_MAP_CACHE.release(priorityToLength);
         }
-        // We want to include this entry if
-        // 1) The onlyShowUnread flags is not set
-        // 2) The above flag is set, and the message is unread
-        ParticipantInfo currentParticipant;
+
         SpannableString spannableDisplay;
-        CharacterStyle style;
         boolean appendedElided = false;
-        Map<String, Integer> displayHash = Maps.newHashMap();
-        String firstDisplayableSenderEmail = null;
-        String firstDisplayableSender = null;
+        final Map<String, Integer> displayHash = Maps.newHashMap();
+        final List<String> senderEmails = Lists.newArrayListWithExpectedSize(MAX_SENDER_COUNT);
+        String firstSenderEmail = null;
+        String firstSenderName = null;
         for (int i = 0; i < conversationInfo.participantInfos.size(); i++) {
-            currentParticipant = conversationInfo.participantInfos.get(i);
+            final ParticipantInfo currentParticipant = conversationInfo.participantInfos.get(i);
             final String currentEmail = currentParticipant.email;
 
             final String currentName = currentParticipant.name;
@@ -323,8 +328,8 @@
             }
 
             final int priority = currentParticipant.priority;
-            style = CharacterStyle.wrap(currentParticipant.readConversation ? readStyleSpan :
-                    unreadStyleSpan);
+            final CharacterStyle style = CharacterStyle.wrap(currentParticipant.readConversation ?
+                    readStyleSpan : unreadStyleSpan);
             if (priority <= maxPriorityToInclude) {
                 spannableDisplay = new SpannableString(sBidiFormatter.unicodeWrap(nameString));
                 // Don't duplicate senders; leave the first instance, unless the
@@ -340,8 +345,8 @@
                             && oldPos < styledSenders.size()) {
                         // Remove the old one!
                         styledSenders.set(oldPos, null);
-                        if (shouldAddPhotos && !TextUtils.isEmpty(currentEmail)) {
-                            displayableSenderEmails.remove(currentEmail);
+                        if (shouldSelectSenders && !TextUtils.isEmpty(currentEmail)) {
+                            senderEmails.remove(currentEmail);
                             displayableSenderNames.remove(currentName);
                         }
                     }
@@ -357,38 +362,67 @@
                     styledSenders.add(spannableDisplay);
                 }
             }
-            if (shouldAddPhotos) {
-                String senderEmail = TextUtils.isEmpty(currentName) ?
-                        account :
-                            TextUtils.isEmpty(currentEmail) ? currentName : currentEmail;
+
+            final String senderEmail = TextUtils.isEmpty(currentName) ? account :
+                    TextUtils.isEmpty(currentEmail) ? currentName : currentEmail;
+
+            if (shouldSelectSenders) {
                 if (i == 0) {
                     // Always add the first sender!
-                    firstDisplayableSenderEmail = senderEmail;
-                    firstDisplayableSender = currentName;
+                    firstSenderEmail = senderEmail;
+                    firstSenderName = currentName;
                 } else {
-                    if (!Objects.equal(firstDisplayableSenderEmail, senderEmail)) {
-                        int indexOf = displayableSenderEmails.indexOf(senderEmail);
+                    if (!Objects.equal(firstSenderEmail, senderEmail)) {
+                        int indexOf = senderEmails.indexOf(senderEmail);
                         if (indexOf > -1) {
-                            displayableSenderEmails.remove(indexOf);
+                            senderEmails.remove(indexOf);
                             displayableSenderNames.remove(indexOf);
                         }
-                        displayableSenderEmails.add(senderEmail);
+                        senderEmails.add(senderEmail);
                         displayableSenderNames.add(currentName);
-                        if (displayableSenderEmails.size() > DividedImageCanvas.MAX_DIVISIONS) {
-                            displayableSenderEmails.remove(0);
+                        if (senderEmails.size() > MAX_SENDER_COUNT) {
+                            senderEmails.remove(0);
                             displayableSenderNames.remove(0);
                         }
                     }
                 }
             }
+
+            // if the corresponding message from this participant is unread and no sender avatar
+            // is yet chosen, choose this one
+            if (shouldSelectAvatar && senderAvatarModel.isNotPopulated() &&
+                    !currentParticipant.readConversation) {
+                senderAvatarModel.populate(currentName, senderEmail);
+            }
         }
-        if (shouldAddPhotos && !TextUtils.isEmpty(firstDisplayableSenderEmail)) {
-            if (displayableSenderEmails.size() < DividedImageCanvas.MAX_DIVISIONS) {
-                displayableSenderEmails.add(0, firstDisplayableSenderEmail);
-                displayableSenderNames.add(0, firstDisplayableSender);
+
+        // always add the first sender to the display
+        if (shouldSelectSenders && !TextUtils.isEmpty(firstSenderEmail)) {
+            if (displayableSenderNames.size() < MAX_SENDER_COUNT) {
+                displayableSenderNames.add(0, firstSenderName);
             } else {
-                displayableSenderEmails.set(0, firstDisplayableSenderEmail);
-                displayableSenderNames.set(0, firstDisplayableSender);
+                displayableSenderNames.set(0, firstSenderName);
+            }
+        }
+
+        // if all messages in the thread were read, we must search for an appropriate avatar
+        if (shouldSelectAvatar && senderAvatarModel.isNotPopulated() &&
+                !conversationInfo.participantInfos.isEmpty()) {
+
+            // search for the last sender that is not the current account
+            for (int i = conversationInfo.participantInfos.size() - 1; i >= 0; i--) {
+                final ParticipantInfo participant = conversationInfo.participantInfos.get(i);
+                if (!TextUtils.isEmpty(participant.name)) {
+                    senderAvatarModel.populate(participant.name, participant.email);
+                    break;
+                }
+            }
+
+            // if we still don't have an avatar, the account is emailing itself; use the last sender
+            if (senderAvatarModel.isNotPopulated()) {
+                final int lastIndex = conversationInfo.participantInfos.size() - 1;
+                final ParticipantInfo lastSender = conversationInfo.participantInfos.get(lastIndex);
+                senderAvatarModel.populate(lastSender.name, lastSender.email);
             }
         }
     }
diff --git a/src/com/android/mail/browse/SwipeableConversationItemView.java b/src/com/android/mail/browse/SwipeableConversationItemView.java
index a08c028..866653a 100644
--- a/src/com/android/mail/browse/SwipeableConversationItemView.java
+++ b/src/com/android/mail/browse/SwipeableConversationItemView.java
@@ -23,6 +23,7 @@
 import android.widget.FrameLayout;
 import android.widget.ListView;
 
+import com.android.mail.providers.Account;
 import com.android.mail.providers.Conversation;
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider;
@@ -34,7 +35,7 @@
 
     private final ConversationItemView mConversationItemView;
 
-    public SwipeableConversationItemView(Context context, String account) {
+    public SwipeableConversationItemView(Context context, Account account) {
         super(context);
         mConversationItemView = new ConversationItemView(context, account);
         addView(mConversationItemView);
diff --git a/src/com/android/mail/photo/ContactPhotoFetcher.java b/src/com/android/mail/photo/ContactFetcher.java
similarity index 80%
rename from src/com/android/mail/photo/ContactPhotoFetcher.java
rename to src/com/android/mail/photo/ContactFetcher.java
index 2bb03ca..b571251 100644
--- a/src/com/android/mail/photo/ContactPhotoFetcher.java
+++ b/src/com/android/mail/photo/ContactFetcher.java
@@ -17,12 +17,19 @@
 package com.android.mail.photo;
 
 import android.content.Context;
+import android.net.Uri;
 
 import com.android.mail.utils.NotificationUtils;
 
-public interface ContactPhotoFetcher {
+/**
+ * Interface for retrieving contact details for senders (given an account name).
+ */
+public interface ContactFetcher {
+
     NotificationUtils.ContactIconInfo getContactPhoto(
             Context context, String accountName, String senderAddress,
             int idealIconWidth, int idealIconHeight,
             int idealWearableBgWidth, int idealWearableBgHeight);
+
+    public Uri getContactLookupUri(Context context, String accountName, String senderAddress);
 }
diff --git a/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java b/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
index 05667c7..e3f8809 100644
--- a/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
+++ b/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
@@ -24,11 +24,8 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.os.SystemClock;
-import android.text.TextUtils;
 
 import com.android.mail.R;
-import com.android.mail.utils.LogUtils;
 
 import java.util.ArrayList;
 
@@ -40,9 +37,17 @@
 
     // general database configuration and tables
     private SQLiteOpenHelper mOpenHelper;
-    private static final String sDatabaseName = "suggestions.db";
-    private static final String sSuggestions = "suggestions";
-    private static final String ORDER_BY = "date DESC";
+    private static final String DATABASE_NAME = "suggestions.db";
+    private static final String SUGGESTIONS_TABLE = "suggestions";
+
+    private static final String QUERY =
+            " SELECT _id" +
+            "   , display1 AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 +
+            "   , ? || query AS " + SearchManager.SUGGEST_COLUMN_QUERY +
+            "   , ? AS " + SearchManager.SUGGEST_COLUMN_ICON_1 +
+            " FROM " + SUGGESTIONS_TABLE +
+            " WHERE display1 LIKE ?" +
+            " ORDER BY date DESC";
 
     // Table of database versions.  Don't forget to update!
     // NOTE:  These version values are shifted left 8 bits (x 256) in order to create space for
@@ -56,14 +61,18 @@
     private static final int DATABASE_VERSION_2 = 2 * 256;
     private static final int DATABASE_VERSION_3 = 3 * 256;
 
-    private String mSuggestSuggestionClause;
-    private String[] mSuggestionProjection;
+    private String mHistoricalIcon;
 
     protected final Context mContext;
+    private ArrayList<String> mFullQueryTerms;
 
     public SearchRecentSuggestionsProvider(Context context) {
         mContext = context;
         mOpenHelper = new DatabaseHelper(mContext, DATABASE_VERSION);
+
+        // The URI of the icon that we will include on every suggestion here.
+        mHistoricalIcon = ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
+                + mContext.getPackageName() + "/" + R.drawable.ic_history_24dp;
     }
 
     public void cleanup() {
@@ -79,19 +88,18 @@
      */
     private static class DatabaseHelper extends SQLiteOpenHelper {
         public DatabaseHelper(Context context, int newVersion) {
-            super(context, sDatabaseName, null, newVersion);
+            super(context, DATABASE_NAME, null, newVersion);
         }
 
         @Override
         public void onCreate(SQLiteDatabase db) {
-            StringBuilder builder = new StringBuilder();
-            builder.append("CREATE TABLE suggestions (" +
+            final String create = "CREATE TABLE suggestions (" +
                     "_id INTEGER PRIMARY KEY" +
                     ",display1 TEXT UNIQUE ON CONFLICT REPLACE" +
                     ",query TEXT" +
                     ",date LONG" +
-                    ");");
-            db.execSQL(builder.toString());
+                    ");";
+            db.execSQL(create);
         }
 
         @Override
@@ -109,56 +117,6 @@
     }
 
     /**
-     * In order to use this class, you must extend it, and call this setup function from your
-     * constructor.  In your application or activities, you must provide the same values when
-     * you create the {@link android.provider.SearchRecentSuggestions} helper.
-     */
-    protected void setupSuggestions() {
-        // The URI of the icon that we will include on every suggestion here.
-        final String historicalIcon = ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
-                + mContext.getPackageName() + "/" + R.drawable.ic_history_24dp;
-
-        mSuggestSuggestionClause = "display1 LIKE ?";
-        mSuggestionProjection = new String [] {
-                "_id",
-                "display1 AS " + SearchManager.SUGGEST_COLUMN_TEXT_1,
-                "query AS " + SearchManager.SUGGEST_COLUMN_QUERY,
-                "'" + historicalIcon + "' AS " + SearchManager.SUGGEST_COLUMN_ICON_1
-        };
-    }
-
-    private ArrayList<String> mFullQueryTerms;
-
-    /**
-     *  Copy the projection, and change the query field alone.
-     * @param selectionArgs
-     * @return projection
-     */
-    private String[] createProjection(String[] selectionArgs) {
-        String[] newProjection = new String[mSuggestionProjection.length];
-        String queryAs;
-        int fullSize = (mFullQueryTerms != null) ? mFullQueryTerms.size() : 0;
-        if (fullSize > 0) {
-            String realQuery = "'";
-            for (int i = 0; i < fullSize; i++) {
-                realQuery+= mFullQueryTerms.get(i);
-                if (i < fullSize -1) {
-                    realQuery += QUERY_TOKEN_SEPARATOR;
-                }
-            }
-            queryAs = realQuery + " ' || query AS " + SearchManager.SUGGEST_COLUMN_QUERY;
-        } else {
-            queryAs = "query AS " + SearchManager.SUGGEST_COLUMN_QUERY;
-        }
-        for (int i = 0; i < mSuggestionProjection.length; i++) {
-            newProjection[i] = mSuggestionProjection[i];
-        }
-        // Assumes that newProjection[length-2] is the query field.
-        newProjection[mSuggestionProjection.length - 2] = queryAs;
-        return newProjection;
-    }
-
-    /**
      * Set the other query terms to be included in the user's query.
      * These are in addition to what is being looked up for suggestions.
      * @param terms
@@ -167,26 +125,19 @@
         mFullQueryTerms = terms;
     }
 
-    // TODO: Confirm no injection attacks here, or rewrite.
-    public Cursor query(String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
+    public Cursor query(String query) {
         SQLiteDatabase db = mOpenHelper.getReadableDatabase();
 
-        // special case for actual suggestions (from search manager)
-        String suggestSelection;
-        String[] myArgs;
-        if (TextUtils.isEmpty(selectionArgs[0])) {
-            suggestSelection = null;
-            myArgs = null;
-        } else {
-            String like = "%" + selectionArgs[0] + "%";
-            myArgs = new String[] { like };
-            suggestSelection = mSuggestSuggestionClause;
+        final StringBuilder builder = new StringBuilder();
+        if (mFullQueryTerms != null) {
+            for (String token : mFullQueryTerms) {
+                builder.append(token).append(QUERY_TOKEN_SEPARATOR);
+            }
         }
-        // Suggestions are always performed with the default sort order
-        Cursor c = db.query(sSuggestions, createProjection(selectionArgs), suggestSelection, myArgs,
-                null, null, ORDER_BY, null);
-        return c;
+
+        final String[] args = new String[] {builder.toString(), mHistoricalIcon, "%" + query + "%"};
+
+        return db.rawQuery(QUERY, args);
     }
 
     /**
@@ -200,11 +151,11 @@
         values.put("query", query);
         values.put("date", System.currentTimeMillis());
         // Note:  This table has on-conflict-replace semantics, so insert() may actually replace()
-        db.insert(sSuggestions, null, values);
+        db.insert(SUGGESTIONS_TABLE, null, values);
     }
 
     public void clearHistory() {
         SQLiteDatabase db = mOpenHelper.getReadableDatabase();
-        db.delete(sSuggestions, null, null);
+        db.delete(SUGGESTIONS_TABLE, null, null);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/mail/providers/SuggestionsProvider.java b/src/com/android/mail/providers/SuggestionsProvider.java
index 07ffe6e..f7468df 100644
--- a/src/com/android/mail/providers/SuggestionsProvider.java
+++ b/src/com/android/mail/providers/SuggestionsProvider.java
@@ -60,13 +60,10 @@
 
     public SuggestionsProvider(Context context) {
         super(context);
-        setupSuggestions();
     }
 
     @Override
-    public Cursor query(String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        String query = selectionArgs[0];
+    public Cursor query(String query) {
         MergeCursor mergeCursor = null;
 
         synchronized (mTermsLock) {
@@ -96,7 +93,7 @@
             ArrayList<Cursor> cursors = new ArrayList<Cursor>();
             // Pass query; at this point it is either the last term OR the
             // only term.
-            cursors.add(super.query(projection, selection, new String[] { query }, sortOrder));
+            cursors.add(super.query(query));
 
             if (query.length() >= MIN_QUERY_LENGTH_FOR_CONTACTS) {
                 cursors.add(new ContactsCursor().query(query));
@@ -154,8 +151,8 @@
         final StringBuilder query = new StringBuilder();
         if (mFullQueryTerms != null) {
             synchronized (mTermsLock) {
-                for (int i = 0, size = mFullQueryTerms.size(); i < size; i++) {
-                    query.append(mFullQueryTerms.get(i)).append(QUERY_TOKEN_SEPARATOR);
+                for (String token : mFullQueryTerms) {
+                    query.append(token).append(QUERY_TOKEN_SEPARATOR);
                 }
             }
         }
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index a280c55..b618804 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -104,6 +104,19 @@
         public static final int INTERNAL_ERROR = 5;
         /** The sync wasn't completed due to an error in the mail server */
         public static final int SERVER_ERROR = 6;
+
+        public static String toString(int result) {
+            switch (result) {
+                case SUCCESS: return "success";
+                case CONNECTION_ERROR: return "connection_error";
+                case AUTH_ERROR: return "auth_error";
+                case SECURITY_ERROR: return "security_error";
+                case STORAGE_ERROR: return "storage_error";
+                case INTERNAL_ERROR: return "internal_error";
+                case SERVER_ERROR: return "server_error";
+                default: throw new IllegalArgumentException("Invalid LastSyncResult: " + result);
+            }
+        }
     }
 
     // The actual content provider should define its own authority
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index b149898..317aba2 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -47,9 +47,9 @@
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.speech.RecognizerIntent;
-import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -449,6 +449,9 @@
      *  or account */
     private static final int CHANGE_NAVIGATION_REQUEST_CODE = 3;
 
+    /** Code returned from voice search intent */
+    public static final int VOICE_SEARCH_REQUEST_CODE = 4;
+
     public static final String EXTRA_FOLDER = "extra-folder";
     public static final String EXTRA_ACCOUNT = "extra-account";
 
@@ -1129,7 +1132,7 @@
                     }
                 }
                 break;
-            case MaterialSearchViewController.VOICE_SEARCH_REQUEST_CODE:
+            case VOICE_SEARCH_REQUEST_CODE:
                 if (resultCode == Activity.RESULT_OK) {
                     final ArrayList<String> matches = data.getStringArrayListExtra(
                             RecognizerIntent.EXTRA_RESULTS);
@@ -1288,8 +1291,8 @@
         mFloatingComposeButton.setOnClickListener(this);
 
         if (isDrawerEnabled()) {
-            mDrawerToggle = new ActionBarDrawerToggle(mActivity, mDrawerContainer, false,
-                    R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close);
+            mDrawerToggle = new ActionBarDrawerToggle(mActivity, mDrawerContainer,
+                    R.string.drawer_open, R.string.drawer_close);
             mDrawerContainer.setDrawerListener(mDrawerListener);
             mDrawerContainer.setDrawerShadow(
                     mContext.getResources().getDrawable(R.drawable.drawer_shadow), Gravity.START);
@@ -2761,7 +2764,7 @@
 
         // 1. current account is already set and is in allAccounts:
         //    1a. It has changed -> load the updated account.
-        //    2b. It is unchanged -> no-op
+        //    1b. It is unchanged -> no-op
         // 2. current account is set and is not in allAccounts -> pick first (acct was deleted?)
         // 3. saved preference has an account -> pick that one
         // 4. otherwise just pick first
@@ -3606,7 +3609,6 @@
                                 mAccountObservers.notifyChanged();
                             }
                             perhapsEnterWaitMode();
-                            perhapsStartWelcomeTour();
                         } else {
                             LogUtils.e(LOG_TAG, "Got update for account: %s with current account:"
                                     + " %s", updatedAccount.uri, mAccount.uri);
@@ -3626,39 +3628,6 @@
     }
 
     /**
-     * Loads the preference that tells whether the welcome tour should be displayed,
-     * and calls the callback with this value.
-     * For this to function, the account must have been synced.
-     */
-    private void perhapsStartWelcomeTour() {
-        new AsyncTask<Void, Void, Boolean>() {
-            @Override
-            protected Boolean doInBackground(Void... params) {
-                if (mActivity.wasLatestWelcomeTourShownOnDeviceForAllAccounts()) {
-                    // No need to go through the WelcomeStateLoader machinery.
-                    return false;
-                }
-                return true;
-            }
-
-            @Override
-            protected void onPostExecute(Boolean result) {
-                if (result) {
-                    if (mAccount != null && mAccount.isAccountReady()) {
-                        LoaderManager.LoaderCallbacks<?> welcomeLoaderCallbacks =
-                                mActivity.getWelcomeCallbacks();
-                        if (welcomeLoaderCallbacks != null) {
-                            // The callback is responsible for showing the tour when appropriate.
-                            mActivity.getLoaderManager().initLoader(LOADER_WELCOME_TOUR_ACCOUNTS,
-                                    Bundle.EMPTY, welcomeLoaderCallbacks);
-                        }
-                    }
-                }
-            }
-        }.execute();
-    }
-
-    /**
      * Updates controller state based on search results and shows first conversation if required.
      */
     private void perhapsShowFirstSearchResult() {
diff --git a/src/com/android/mail/ui/AccountLoadCallbacks.java b/src/com/android/mail/ui/AccountLoadCallbacks.java
index 323cbfe..f8a3e50 100644
--- a/src/com/android/mail/ui/AccountLoadCallbacks.java
+++ b/src/com/android/mail/ui/AccountLoadCallbacks.java
@@ -38,8 +38,7 @@
     public Loader<ObjectCursor<Account>> onCreateLoader(int id, Bundle args) {
         final String[] projection = UIProvider.ACCOUNTS_PROJECTION;
         final CursorCreator<Account> factory = Account.FACTORY;
-        return new ObjectCursorLoader<Account>(
-                mContext, mAccountUri, projection, factory);
+        return new ObjectCursorLoader<Account>(mContext, mAccountUri, projection, factory);
     }
 
     @Override
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 30aa36c..b2fec88 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -371,7 +371,7 @@
     public View createConversationItemView(SwipeableConversationItemView view, Context context,
             Conversation conv) {
         if (view == null) {
-            view = new SwipeableConversationItemView(context, mAccount.getEmailAddress());
+            view = new SwipeableConversationItemView(context, mAccount);
         }
         view.bind(conv, mActivity, mBatchConversations, mFolder, getCheckboxSetting(),
                 mSwipeEnabled, mImportanceMarkersEnabled, mShowChevronsEnabled, this);
@@ -764,7 +764,7 @@
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return new SwipeableConversationItemView(context, mAccount.getEmailAddress());
+        return new SwipeableConversationItemView(context, mAccount);
     }
 
     @Override
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index a2ae0c9..bf6895c 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -65,6 +65,7 @@
 import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
+import com.android.mail.utils.ViewUtils;
 import com.google.common.collect.ImmutableList;
 
 import java.util.Collection;
@@ -160,7 +161,6 @@
     // Tracks if a onKey event was initiated from the listview (received ACTION_DOWN before
     // ACTION_UP). If not, the listview only receives ACTION_UP.
     private boolean mKeyInitiatedFromList;
-    private boolean mIsRtl;
 
     /** Duration, in milliseconds, of the CAB mode (peek icon) animation. */
     private static long sSelectionModeAnimationDuration = -1;
@@ -469,7 +469,6 @@
         mListView.setOnKeyListener(this);
         mListView.setOnItemClickListener(this);
 
-        mIsRtl = Utils.isCurrentLocaleRtl();
         // For tablets, the default left focus is the mini-drawer
         if (mTabletDevice && mNextFocusStartId == 0) {
             mNextFocusStartId = R.id.current_account_avatar;
@@ -640,7 +639,7 @@
         if (view instanceof  SwipeableListView) {
             SwipeableListView list = (SwipeableListView) view;
             // Don't need to handle ENTER because it's auto-handled as a "click".
-            if (KeyboardUtils.isKeycodeDirectionEnd(keyCode, mIsRtl)) {
+            if (KeyboardUtils.isKeycodeDirectionEnd(keyCode, ViewUtils.isViewRtl(list))) {
                 if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
                     if (mKeyInitiatedFromList) {
                         onListItemSelected(list.getSelectedView(), list.getSelectedItemPosition());
@@ -733,14 +732,6 @@
         if (mFooterView != null) {
             mFooterView.onViewModeChanged(newMode);
         }
-
-        // Set default navigation
-        if (ViewMode.isListMode(newMode)) {
-            mListView.setNextFocusRightId(R.id.conversation_list_view);
-        } else if (ViewMode.isConversationMode(newMode)) {
-            // This would only happen in two_pane
-            mListView.setNextFocusRightId(R.id.conversation_pager);
-        }
     }
 
     public boolean isAnimating() {
@@ -1135,7 +1126,8 @@
     };
 
     private void saveLastScrolledPosition() {
-        if (mListAdapter.getCursor() == null) {
+        if (mFolder == null || mFolder.conversationListUri == null ||
+                mListAdapter.getCursor() == null) {
             // If you save your scroll position in an empty list, you're gonna have a bad time
             return;
         }
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 830c734..af75205 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -29,6 +29,7 @@
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
 import android.support.v4.text.BidiFormatter;
 import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
@@ -85,6 +86,7 @@
 import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
+import com.android.mail.utils.ViewUtils;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -144,7 +146,6 @@
     private View mOriginalKeyedView;
     private int mMaxScreenHeight;
     private int mTopOfVisibleScreen;
-    private boolean mIsRtl;
 
     protected ConversationContainer mConversationContainer;
 
@@ -445,8 +446,6 @@
         mViewsCreated = true;
         mWebViewLoadedData = false;
 
-        mIsRtl = Utils.isCurrentLocaleRtl();
-
         return rootView;
     }
 
@@ -1018,9 +1017,13 @@
         mWebView.getSettings().setBlockNetworkImage(false);
 
         final Address sender = getAddress(senderRawAddress);
+        if (sender == null) {
+            // Don't need to unblock any images
+            return;
+        }
         final MessageCursor cursor = getMessageCursor();
 
-        final List<String> messageDomIds = new ArrayList<String>();
+        final List<String> messageDomIds = new ArrayList<>();
 
         int pos = -1;
         while (cursor.moveToPosition(++pos)) {
@@ -1095,7 +1098,7 @@
         return positions;
     }
 
-    protected Address getAddress(String rawFrom) {
+    protected @Nullable Address getAddress(String rawFrom) {
         return Utils.getAddress(mAddressCache, rawFrom);
     }
 
@@ -1184,9 +1187,10 @@
 
         if (mOriginalKeyedView != null) {
             final int id = mOriginalKeyedView.getId();
+            final boolean isRtl = ViewUtils.isViewRtl(mOriginalKeyedView);
             final boolean isActionUp = keyEvent.getAction() == KeyEvent.ACTION_UP;
-            final boolean isStart = KeyboardUtils.isKeycodeDirectionStart(keyCode, mIsRtl);
-            final boolean isEnd = KeyboardUtils.isKeycodeDirectionEnd(keyCode, mIsRtl);
+            final boolean isStart = KeyboardUtils.isKeycodeDirectionStart(keyCode, isRtl);
+            final boolean isEnd = KeyboardUtils.isKeycodeDirectionEnd(keyCode, isRtl);
             final boolean isUp = keyCode == KeyEvent.KEYCODE_DPAD_UP;
             final boolean isDown = keyCode == KeyEvent.KEYCODE_DPAD_DOWN;
 
@@ -1415,7 +1419,13 @@
                 while (cursor.moveToPosition(++pos)) {
                     final ConversationMessage msg = cursor.getMessage();
                     if (TextUtils.equals(domId, mTemplates.getMessageDomId(msg))) {
-                        return getAddress(msg.getFrom()).getAddress();
+                        final Address address = getAddress(msg.getFrom());
+                        if (address != null) {
+                            return address.getAddress();
+                        } else {
+                            // Fall through to return an empty string
+                            break;
+                        }
                     }
                 }
 
diff --git a/src/com/android/mail/ui/DividedImageCanvas.java b/src/com/android/mail/ui/DividedImageCanvas.java
deleted file mode 100644
index 274327e..0000000
--- a/src/com/android/mail/ui/DividedImageCanvas.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mail.ui;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-
-import com.android.mail.R;
-import com.android.mail.utils.Utils;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * DividedImageCanvas creates a canvas that can display into a minimum of 1
- * and maximum of 4 images. As images are added, they
- * are laid out according to the following algorithm:
- * 1 Image: Draw the bitmap filling the entire canvas.
- * 2 Images: Draw 2 bitmaps split vertically down the middle.
- * 3 Images: Draw 3 bitmaps: the first takes up all vertical space; the 2nd and 3rd are stacked in
- *           the second vertical position.
- * 4 Images: Divide the Canvas into 4 equal quadrants and draws 1 bitmap in each.
- */
-public class DividedImageCanvas implements ImageCanvas {
-    public static final int MAX_DIVISIONS = 4;
-
-    private final Map<String, Integer> mDivisionMap = Maps
-            .newHashMapWithExpectedSize(MAX_DIVISIONS);
-    private Bitmap mDividedBitmap;
-    private Canvas mCanvas;
-    private int mWidth;
-    private int mHeight;
-
-    private final Context mContext;
-    private final InvalidateCallback mCallback;
-    private final ArrayList<Bitmap> mDivisionImages = new ArrayList<Bitmap>(MAX_DIVISIONS);
-
-    /**
-     * Ignore any request to draw final output when not yet ready. This prevents partially drawn
-     * canvases from appearing.
-     */
-    private boolean mBitmapValid = false;
-
-    private int mGeneration;
-
-    private static final Paint sPaint = new Paint();
-    private static final Paint sClearPaint = new Paint();
-    private static final Rect sSrc = new Rect();
-    private static final Rect sDest = new Rect();
-
-    private static int sDividerLineWidth = -1;
-    private static int sDividerColor;
-
-    static {
-        sClearPaint.setXfermode(new PorterDuffXfermode(Mode.CLEAR));
-    }
-
-    public DividedImageCanvas(Context context, InvalidateCallback callback) {
-        mContext = context;
-        mCallback = callback;
-        setupDividerLines();
-    }
-
-    /**
-     * Get application context for this object.
-     */
-    public Context getContext() {
-        return mContext;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("{");
-        sb.append(super.toString());
-        sb.append(" mDivisionMap=");
-        sb.append(mDivisionMap);
-        sb.append(" mDivisionImages=");
-        sb.append(mDivisionImages);
-        sb.append(" mWidth=");
-        sb.append(mWidth);
-        sb.append(" mHeight=");
-        sb.append(mHeight);
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Set the id associated with each quadrant. The quadrants are laid out:
-     * TopLeft, TopRight, Bottom Left, Bottom Right
-     * @param keys
-     */
-    public void setDivisionIds(List<Object> keys) {
-        if (keys.size() > MAX_DIVISIONS) {
-            throw new IllegalArgumentException("too many divisionIds: " + keys);
-        }
-
-        boolean needClear = getDivisionCount() != keys.size();
-        if (!needClear) {
-            for (int i = 0; i < keys.size(); i++) {
-                String divisionId = transformKeyToDivisionId(keys.get(i));
-                // different item or different place
-                if (!mDivisionMap.containsKey(divisionId) || mDivisionMap.get(divisionId) != i) {
-                    needClear = true;
-                    break;
-                }
-            }
-        }
-
-        if (needClear) {
-            mDivisionMap.clear();
-            mDivisionImages.clear();
-            int i = 0;
-            for (Object key : keys) {
-                String divisionId = transformKeyToDivisionId(key);
-                mDivisionMap.put(divisionId, i);
-                mDivisionImages.add(null);
-                i++;
-            }
-        }
-    }
-
-    private void draw(Bitmap b, int left, int top, int right, int bottom) {
-        if (b != null) {
-            // Some times we load taller images compared to the destination rect on the canvas
-            int srcTop = 0;
-            int srcBottom = b.getHeight();
-            int destHeight = bottom - top;
-            if (b.getHeight() > bottom - top) {
-                srcTop = b.getHeight() / 2 - destHeight/2;
-                srcBottom = b.getHeight() / 2 + destHeight/2;
-            }
-
-//            todo:markwei do not scale very small bitmaps
-            // l t r b
-            sSrc.set(0, srcTop, b.getWidth(), srcBottom);
-            sDest.set(left, top, right, bottom);
-            mCanvas.drawRect(sDest, sClearPaint);
-            mCanvas.drawBitmap(b, sSrc, sDest, sPaint);
-        } else {
-            // clear
-            mCanvas.drawRect(left, top, right, bottom, sClearPaint);
-        }
-    }
-
-    /**
-     * Get the desired dimensions and scale for the bitmap to be placed in the
-     * location corresponding to id. Caller must allocate the Dimensions object.
-     * @param key
-     * @param outDim a {@link ImageCanvas.Dimensions} object to write results into
-     */
-    @Override
-    public void getDesiredDimensions(Object key, Dimensions outDim) {
-        Utils.traceBeginSection("get desired dimensions");
-        int w = 0, h = 0;
-        float scale = 0;
-        final Integer pos = mDivisionMap.get(transformKeyToDivisionId(key));
-        if (pos != null && pos >= 0) {
-            final int size = mDivisionMap.size();
-            switch (size) {
-                case 0:
-                    break;
-                case 1:
-                    w = mWidth;
-                    h = mHeight;
-                    scale = Dimensions.SCALE_ONE;
-                    break;
-                case 2:
-                    w = mWidth / 2;
-                    h = mHeight;
-                    scale = Dimensions.SCALE_HALF;
-                    break;
-                case 3:
-                    switch (pos) {
-                        case 0:
-                            w = mWidth / 2;
-                            h = mHeight;
-                            scale = Dimensions.SCALE_HALF;
-                            break;
-                        default:
-                            w = mWidth / 2;
-                            h = mHeight / 2;
-                            scale = Dimensions.SCALE_QUARTER;
-                    }
-                    break;
-                case 4:
-                    w = mWidth / 2;
-                    h = mHeight / 2;
-                    scale = Dimensions.SCALE_QUARTER;
-                    break;
-            }
-        }
-        outDim.width = w;
-        outDim.height = h;
-        outDim.scale = scale;
-        Utils.traceEndSection();
-    }
-
-    @Override
-    public void drawImage(Bitmap b, Object key) {
-        addDivisionImage(b, key);
-    }
-
-    /**
-     * Add a bitmap to this view in the quadrant matching its id.
-     * @param b Bitmap
-     * @param key Id to look for that was previously set in setDivisionIds.
-     */
-    public void addDivisionImage(Bitmap b, Object key) {
-        if (b != null) {
-            addOrClearDivisionImage(b, key);
-        }
-    }
-
-    public void clearDivisionImage(Object key) {
-        addOrClearDivisionImage(null, key);
-    }
-    private void addOrClearDivisionImage(Bitmap b, Object key) {
-        Utils.traceBeginSection("add or clear division image");
-        final Integer pos = mDivisionMap.get(transformKeyToDivisionId(key));
-        if (pos != null && pos >= 0) {
-            mDivisionImages.set(pos, b);
-            boolean complete = false;
-            final int width = mWidth;
-            final int height = mHeight;
-            // Different layouts depending on count.
-            final int size = mDivisionMap.size();
-            switch (size) {
-                case 0:
-                    // Do nothing.
-                    break;
-                case 1:
-                    // Draw the bitmap filling the entire canvas.
-                    draw(mDivisionImages.get(0), 0, 0, width, height);
-                    complete = true;
-                    break;
-                case 2:
-                    // Draw 2 bitmaps split vertically down the middle
-                    switch (pos) {
-                        case 0:
-                            draw(mDivisionImages.get(0), 0, 0, width / 2, height);
-                            break;
-                        case 1:
-                            draw(mDivisionImages.get(1), width / 2, 0, width, height);
-                            break;
-                    }
-                    complete = mDivisionImages.get(0) != null && mDivisionImages.get(1) != null
-                            || isPartialBitmapComplete();
-                    if (complete) {
-                        // Draw dividers
-                        drawVerticalDivider(width, height);
-                    }
-                    break;
-                case 3:
-                    // Draw 3 bitmaps: the first takes up all vertical
-                    // space, the 2nd and 3rd are stacked in the second vertical
-                    // position.
-                    switch (pos) {
-                        case 0:
-                            draw(mDivisionImages.get(0), 0, 0, width / 2, height);
-                            break;
-                        case 1:
-                            draw(mDivisionImages.get(1), width / 2, 0, width, height / 2);
-                            break;
-                        case 2:
-                            draw(mDivisionImages.get(2), width / 2, height / 2, width, height);
-                            break;
-                    }
-                    complete = mDivisionImages.get(0) != null && mDivisionImages.get(1) != null
-                            && mDivisionImages.get(2) != null || isPartialBitmapComplete();
-                    if (complete) {
-                        // Draw dividers
-                        drawVerticalDivider(width, height);
-                        drawHorizontalDivider(width / 2, height / 2, width, height / 2);
-                    }
-                    break;
-                default:
-                    // Draw all 4 bitmaps in a grid
-                    switch (pos) {
-                        case 0:
-                            draw(mDivisionImages.get(0), 0, 0, width / 2, height / 2);
-                            break;
-                        case 1:
-                            draw(mDivisionImages.get(1), width / 2, 0, width, height / 2);
-                            break;
-                        case 2:
-                            draw(mDivisionImages.get(2), 0, height / 2, width / 2, height);
-                            break;
-                        case 3:
-                            draw(mDivisionImages.get(3), width / 2, height / 2, width, height);
-                            break;
-                    }
-                    complete = mDivisionImages.get(0) != null && mDivisionImages.get(1) != null
-                            && mDivisionImages.get(2) != null && mDivisionImages.get(3) != null
-                            || isPartialBitmapComplete();
-                    if (complete) {
-                        // Draw dividers
-                        drawVerticalDivider(width, height);
-                        drawHorizontalDivider(0, height / 2, width, height / 2);
-                    }
-                    break;
-            }
-            // Create the new image bitmap.
-            if (complete) {
-                mBitmapValid = true;
-                mCallback.invalidate();
-            }
-        }
-        Utils.traceEndSection();
-    }
-
-    public boolean hasImageFor(Object key) {
-        final Integer pos = mDivisionMap.get(transformKeyToDivisionId(key));
-        return pos != null && mDivisionImages.get(pos) != null;
-    }
-
-    private void setupDividerLines() {
-        if (sDividerLineWidth == -1) {
-            Resources res = getContext().getResources();
-            sDividerLineWidth = res
-                    .getDimensionPixelSize(R.dimen.tile_divider_width);
-            sDividerColor = res.getColor(R.color.tile_divider_color);
-        }
-    }
-
-    private static void setupPaint() {
-        sPaint.setStrokeWidth(sDividerLineWidth);
-        sPaint.setColor(sDividerColor);
-    }
-
-    protected void drawVerticalDivider(int width, int height) {
-        int x1 = width / 2, y1 = 0, x2 = width/2, y2 = height;
-        setupPaint();
-        mCanvas.drawLine(x1, y1, x2, y2, sPaint);
-    }
-
-    protected void drawHorizontalDivider(int x1, int y1, int x2, int y2) {
-        setupPaint();
-        mCanvas.drawLine(x1, y1, x2, y2, sPaint);
-    }
-
-    protected boolean isPartialBitmapComplete() {
-        return false;
-    }
-
-    protected String transformKeyToDivisionId(Object key) {
-        return key.toString();
-    }
-
-    /**
-     * Draw the contents of the DividedImageCanvas to the supplied canvas.
-     */
-    public void draw(Canvas canvas) {
-        if (mDividedBitmap != null && mBitmapValid) {
-            canvas.drawBitmap(mDividedBitmap, 0, 0, null);
-        }
-    }
-
-    /**
-     * Draw the contents of the DividedImageCanvas to the supplied canvas.
-     */
-    public void draw(final Canvas canvas, final Matrix matrix) {
-        if (mDividedBitmap != null && mBitmapValid) {
-            canvas.drawBitmap(mDividedBitmap, matrix, null);
-        }
-    }
-
-    @Override
-    public void reset() {
-        if (mCanvas != null && mDividedBitmap != null) {
-            mBitmapValid = false;
-        }
-        mDivisionMap.clear();
-        mDivisionImages.clear();
-        mGeneration++;
-    }
-
-    @Override
-    public int getGeneration() {
-        return mGeneration;
-    }
-
-    /**
-     * Set the width and height of the canvas.
-     * @param width
-     * @param height
-     */
-    public void setDimensions(int width, int height) {
-        Utils.traceBeginSection("set dimensions");
-        if (mWidth == width && mHeight == height) {
-            Utils.traceEndSection();
-            return;
-        }
-
-        mWidth = width;
-        mHeight = height;
-
-        mDividedBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        mCanvas = new Canvas(mDividedBitmap);
-
-        for (int i = 0; i < getDivisionCount(); i++) {
-            mDivisionImages.set(i, null);
-        }
-        mBitmapValid = false;
-        Utils.traceEndSection();
-    }
-
-    /**
-     * Get the resulting canvas width.
-     */
-    public int getWidth() {
-        return mWidth;
-    }
-
-    /**
-     * Get the resulting canvas height.
-     */
-    public int getHeight() {
-        return mHeight;
-    }
-
-    /**
-     * The class that will provided the canvas to which the DividedImageCanvas
-     * should render its contents must implement this interface.
-     */
-    public interface InvalidateCallback {
-        public void invalidate();
-    }
-
-    public int getDivisionCount() {
-        return mDivisionMap.size();
-    }
-
-    /**
-     * Get the division ids currently associated with this DivisionImageCanvas.
-     */
-    public ArrayList<String> getDivisionIds() {
-        return Lists.newArrayList(mDivisionMap.keySet());
-    }
-}
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 6f80819..590e5ec 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -25,6 +25,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.widget.DrawerLayout;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -208,7 +209,7 @@
     private boolean mMiniDrawerEnabled;
     private boolean mIsMinimized;
     protected MiniDrawerView mMiniDrawerView;
-    protected MiniDrawerAccountsAdapter mMiniDrawerAccountsAdapter;
+    private MiniDrawerAccountsAdapter mMiniDrawerAccountsAdapter;
     // use the same dimen as AccountItemView to participate in recycling
     // TODO: but Material account switcher doesn't recycle...
     private int mMiniDrawerAvatarDecodeSize;
@@ -313,9 +314,9 @@
         mContactResolver = new ContactResolver(getActivity().getContentResolver(),
                 mImagesCache);
 
-        setupMiniDrawerAccountsAdapter();
-        mMiniDrawerView.setController(this);
         if (mMiniDrawerEnabled) {
+            setupMiniDrawerAccountsAdapter();
+            mMiniDrawerView.setController(this);
             // set up initial state
             setMinimized(isMinimized());
         } else {
@@ -1690,56 +1691,54 @@
             final ImageView iv = convertView != null ? (ImageView) convertView :
                     (ImageView) LayoutInflater.from(getActivity()).inflate(
                     R.layout.mini_drawer_recent_account_item, parent, false /* attachToRoot */);
-            final FolderListFragment.MiniDrawerAccountItem
-                    item = createMiniDrawerAccountItem(iv);
+            final MiniDrawerAccountItem item = new MiniDrawerAccountItem(iv);
             item.setupDrawable();
             item.setAccount(mAccounts.get(position));
             iv.setTag(item);
             return iv;
         }
+
+        private class MiniDrawerAccountItem implements View.OnClickListener {
+            private Account mAccount;
+            private AccountAvatarDrawable mDrawable;
+            public final ImageView view;
+
+            public MiniDrawerAccountItem(ImageView iv) {
+                view = iv;
+                view.setOnClickListener(this);
+            }
+
+            public void setupDrawable() {
+                mDrawable = new AccountAvatarDrawable(getResources(), getBitmapCache(),
+                        getContactResolver());
+                mDrawable.setDecodeDimensions(mMiniDrawerAvatarDecodeSize,
+                        mMiniDrawerAvatarDecodeSize);
+                view.setImageDrawable(mDrawable);
+            }
+
+            public void setAccount(Account acct) {
+                mAccount = acct;
+                mDrawable.bind(mAccount.getSenderName(), mAccount.getEmailAddress());
+                String contentDescription = mAccount.getDisplayName();
+                if (TextUtils.isEmpty(contentDescription)) {
+                    contentDescription = mAccount.getEmailAddress();
+                }
+                view.setContentDescription(contentDescription);
+            }
+
+            @Override
+            public void onClick(View v) {
+                onAccountSelected(mAccount);
+            }
+        }
     }
 
     protected void setupMiniDrawerAccountsAdapter() {
         mMiniDrawerAccountsAdapter = new MiniDrawerAccountsAdapter();
     }
 
-    MiniDrawerAccountsAdapter getMiniDrawerAccountsAdapter() {
+    protected ListAdapter getMiniDrawerAccountsAdapter() {
         return mMiniDrawerAccountsAdapter;
     }
 
-    private MiniDrawerAccountItem createMiniDrawerAccountItem(ImageView iv) {
-        return new MiniDrawerAccountItem(iv);
-    }
-
-    private class MiniDrawerAccountItem implements View.OnClickListener {
-        private Account mAccount;
-        // FIXME: this codepath doesn't use GMS Core, resulting in inconsistent avatars
-        // vs. ownerslib. switch to a generic photo getter+listener interface on FLF
-        // so these drawables are obtainable regardless of how they are loaded.
-        private AccountAvatarDrawable mDrawable;
-        public final ImageView view;
-
-        public MiniDrawerAccountItem(ImageView iv) {
-            view = iv;
-            view.setOnClickListener(this);
-        }
-
-        public void setupDrawable() {
-            mDrawable = new AccountAvatarDrawable(getResources(), getBitmapCache(),
-                    getContactResolver());
-            mDrawable.setDecodeDimensions(mMiniDrawerAvatarDecodeSize, mMiniDrawerAvatarDecodeSize);
-            view.setImageDrawable(mDrawable);
-        }
-
-        public void setAccount(Account acct) {
-            mAccount = acct;
-            mDrawable.bind(mAccount.getSenderName(), mAccount.getEmailAddress());
-        }
-
-        @Override
-        public void onClick(View v) {
-            onAccountSelected(mAccount);
-        }
-    }
-
 }
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index f213eda..8aa8fbc 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -489,30 +489,4 @@
     public SearchRecentSuggestionsProvider getSuggestionsProvider() {
         return new SuggestionsProvider(this);
     }
-
-    /**
-     * Returns the loader callback that can create a
-     * {@link AbstractActivityController#LOADER_WELCOME_TOUR_ACCOUNTS} followed by a
-     * {@link AbstractActivityController#LOADER_WELCOME_TOUR} which determines whether the welcome
-     * tour should be displayed.
-     *
-     * The base implementation returns {@code null} and subclasses should return an actual
-     * implementation if they want to be invoked at appropriate time.
-     */
-    public LoaderManager.LoaderCallbacks<?> getWelcomeCallbacks() {
-        return null;
-    }
-
-    /**
-     * Returns whether the latest version of the welcome tour was shown on this device.
-     * <p>
-     * The base implementation returns {@code true} and applications that implement a welcome tour
-     * should override this method in order to optimize
-     * {@link AbstractActivityController#perhapsStartWelcomeTour()}.
-     *
-     * @return Whether the latest version of the welcome tour was shown.
-     */
-    public boolean wasLatestWelcomeTourShownOnDeviceForAllAccounts() {
-        return true;
-    }
 }
diff --git a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
index ae89a04..88c7943 100644
--- a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
+++ b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
@@ -49,8 +49,6 @@
     private List<SuggestionItem> mSuggestions = Lists.newArrayList();
     private String mQuery;
 
-    private View mDummyHolder;
-    private ListView mListView;
     private MaterialSearchViewListAdapter mAdapter;
     private QuerySuggestionsTask mQueryTask;
 
@@ -83,14 +81,14 @@
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mListView = (ListView) findViewById(R.id.search_overlay_suggestion_list);
-        mListView.setOnItemClickListener(this);
-        mDummyHolder = findViewById(R.id.search_overlay_scrim);
-        mDummyHolder.setOnClickListener(this);
+        final ListView listView = (ListView) findViewById(R.id.search_overlay_suggestion_list);
+        listView.setOnItemClickListener(this);
+        final View dummyHolder = findViewById(R.id.search_overlay_scrim);
+        dummyHolder.setOnClickListener(this);
 
         // set up the adapter
         mAdapter = new MaterialSearchViewListAdapter(getContext(), R.layout.search_suggestion_item);
-        mListView.setAdapter(mAdapter);
+        listView.setAdapter(mAdapter);
     }
 
     @Override
@@ -125,8 +123,7 @@
             Cursor c = null;
             final List<SuggestionItem> result = Lists.newArrayList();
             try {
-                c = mSuggestionsProvider.query(null, "query LIKE ?",
-                        new String[] { query }, null);
+                c = mSuggestionsProvider.query(query);
 
                 if (c != null && c.moveToFirst()) {
                     final int textIndex = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_QUERY);
diff --git a/src/com/android/mail/ui/MaterialSearchViewController.java b/src/com/android/mail/ui/MaterialSearchViewController.java
index 4e5b5a4..5014e19 100644
--- a/src/com/android/mail/ui/MaterialSearchViewController.java
+++ b/src/com/android/mail/ui/MaterialSearchViewController.java
@@ -47,9 +47,6 @@
     // we have to show the search actionbar on top while the user is not interacting with it.
     public static final int SEARCH_VIEW_STATE_ONLY_ACTIONBAR = 2;
 
-    /** Code returned from voice search intent */
-    public static final int VOICE_SEARCH_REQUEST_CODE = 4;
-
     private static final String EXTRA_VIEW_STATE = "extraSearchViewControllerViewState";
 
     private final MailActivity mActivity;
@@ -185,7 +182,8 @@
 
         // Some devices do not support the voice-to-speech functionality.
         try {
-            mActivity.startActivityForResult(intent, VOICE_SEARCH_REQUEST_CODE);
+            mActivity.startActivityForResult(intent,
+                    AbstractActivityController.VOICE_SEARCH_REQUEST_CODE);
         } catch (ActivityNotFoundException e) {
             final String toast =
                     mActivity.getResources().getString(R.string.voice_search_not_supported);
diff --git a/src/com/android/mail/ui/MiniDrawerView.java b/src/com/android/mail/ui/MiniDrawerView.java
index 656fc27..7aaac12 100644
--- a/src/com/android/mail/ui/MiniDrawerView.java
+++ b/src/com/android/mail/ui/MiniDrawerView.java
@@ -133,6 +133,7 @@
                     final ImageView iv = (ImageView) mInflater.inflate(
                             R.layout.mini_drawer_folder_item, this, false /* attachToRoot */);
                     iv.setTag(new FolderItem(f, iv));
+                    iv.setContentDescription(f.name);
                     addView(iv, 1 + numInboxes);
                     numInboxes++;
                 }
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 7bde44a..999270e 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -131,7 +131,7 @@
         fragmentTransaction.commitAllowingStateLoss();
         // Set default navigation here once the ConversationListFragment is created.
         conversationListFragment.setNextFocusStartId(
-                getClfNextFocusLeftId(getFolderListFragment().isMinimized()));
+                getClfNextFocusStartId(getFolderListFragment().isMinimized()));
     }
 
     @Override
@@ -269,7 +269,7 @@
 
         final ConversationListFragment clf = getConversationListFragment();
         if (clf != null) {
-            clf.setNextFocusStartId(getClfNextFocusLeftId(flf.isMinimized()));
+            clf.setNextFocusStartId(getClfNextFocusStartId(flf.isMinimized()));
 
             final SwipeableListView list = clf.getListView();
             if (list != null) {
@@ -313,7 +313,7 @@
         }
     }
 
-    private @IdRes int getClfNextFocusLeftId(boolean drawerMinimized) {
+    private @IdRes int getClfNextFocusStartId(boolean drawerMinimized) {
         return (drawerMinimized) ? R.id.current_account_avatar : android.R.id.list;
     }
 
diff --git a/src/com/android/mail/ui/settings/MailPreferenceActivity.java b/src/com/android/mail/ui/settings/MailPreferenceActivity.java
index 4af3300..57bb755 100644
--- a/src/com/android/mail/ui/settings/MailPreferenceActivity.java
+++ b/src/com/android/mail/ui/settings/MailPreferenceActivity.java
@@ -17,6 +17,7 @@
 
 package com.android.mail.ui.settings;
 
+import android.app.ActionBar;
 import android.app.Fragment;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.CursorLoader;
@@ -50,6 +51,13 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        final ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            // Hide the app icon.
+            actionBar.setIcon(android.R.color.transparent);
+            actionBar.setDisplayUseLogoEnabled(false);
+        }
+
         getLoaderManager().initLoader(ACCOUNT_LOADER_ID, null, new AccountLoaderCallbacks());
     }
 
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 0b19005..3c61f78 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -50,7 +50,7 @@
 import com.android.mail.browse.ConversationItemView;
 import com.android.mail.browse.MessageCursor;
 import com.android.mail.browse.SendersView;
-import com.android.mail.photo.ContactPhotoFetcher;
+import com.android.mail.photo.ContactFetcher;
 import com.android.mail.photomanager.LetterTileProvider;
 import com.android.mail.preferences.AccountPreferences;
 import com.android.mail.preferences.FolderPreferences;
@@ -340,10 +340,10 @@
      * This happens when locale changes.
      **/
     public static void cancelAndResendNotificationsOnLocaleChange(
-            Context context, final ContactPhotoFetcher photoFetcher) {
+            Context context, final ContactFetcher contactFetcher) {
         LogUtils.d(LOG_TAG, "cancelAndResendNotificationsOnLocaleChange");
         sBidiFormatter = BidiFormatter.getInstance();
-        resendNotifications(context, true, null, null, photoFetcher);
+        resendNotifications(context, true, null, null, contactFetcher);
     }
 
     /**
@@ -363,7 +363,7 @@
      */
     public static void resendNotifications(Context context, final boolean cancelExisting,
             final Uri accountUri, final FolderUri folderUri,
-            final ContactPhotoFetcher photoFetcher) {
+            final ContactFetcher contactFetcher) {
         LogUtils.d(LOG_TAG, "resendNotifications ");
 
         if (cancelExisting) {
@@ -396,7 +396,7 @@
                     NotificationActionUtils.sUndoNotifications.get(notificationId);
             if (undoableAction == null) {
                 validateNotifications(context, folder, notification.account, true,
-                        false, notification, photoFetcher);
+                        false, notification, contactFetcher);
             } else {
                 // Create an undo notification
                 NotificationActionUtils.createUndoNotification(context, undoableAction);
@@ -490,7 +490,7 @@
      */
     public static void setNewEmailIndicator(Context context, final int unreadCount,
             final int unseenCount, final Account account, final Folder folder,
-            final boolean getAttention, final ContactPhotoFetcher photoFetcher) {
+            final boolean getAttention, final ContactFetcher contactFetcher) {
         LogUtils.d(LOG_TAG, "setNewEmailIndicator unreadCount = %d, unseenCount = %d, account = %s,"
                 + " folder = %s, getAttention = %b", unreadCount, unseenCount,
                 account.getEmailAddress(), folder.folderUri, getAttention);
@@ -533,7 +533,7 @@
 
         if (NotificationActionUtils.sUndoNotifications.get(notificationId) == null) {
             validateNotifications(context, folder, account, getAttention, ignoreUnobtrusiveSetting,
-                    key, photoFetcher);
+                    key, contactFetcher);
         }
     }
 
@@ -542,7 +542,7 @@
      */
     private static void validateNotifications(Context context, final Folder folder,
             final Account account, boolean getAttention, boolean ignoreUnobtrusiveSetting,
-            NotificationKey key, final ContactPhotoFetcher photoFetcher) {
+            NotificationKey key, final ContactFetcher contactFetcher) {
 
         NotificationManagerCompat nm = NotificationManagerCompat.from(context);
 
@@ -717,7 +717,7 @@
                     configureLatestEventInfoFromConversation(context, account, folderPreferences,
                             notification, wearableExtender, msgNotifications, notificationId,
                             cursor, clickIntent, notificationIntent, unreadCount, unseenCount,
-                            folder, when, photoFetcher);
+                            folder, when, contactFetcher);
                     eventInfoConfigured = true;
                 }
             }
@@ -961,13 +961,13 @@
 
     private static void configureLatestEventInfoFromConversation(final Context context,
             final Account account, final FolderPreferences folderPreferences,
-            final NotificationCompat.Builder notification,
+            final NotificationCompat.Builder notificationBuilder,
             final NotificationCompat.WearableExtender wearableExtender,
             final Map<Integer, NotificationBuilders> msgNotifications,
             final int summaryNotificationId, final Cursor conversationCursor,
             final PendingIntent clickIntent, final Intent notificationIntent,
             final int unreadCount, final int unseenCount,
-            final Folder folder, final long when, final ContactPhotoFetcher photoFetcher) {
+            final Folder folder, final long when, final ContactFetcher contactFetcher) {
         final Resources res = context.getResources();
         final String notificationAccountDisplayName = account.getDisplayName();
         final String notificationAccountEmail = account.getEmailAddress();
@@ -992,7 +992,7 @@
             notificationTicker = newMessagesString;
 
             // The title of the notification is the new messages string
-            notification.setContentTitle(newMessagesString);
+            notificationBuilder.setContentTitle(newMessagesString);
 
             // TODO(skennedy) Can we remove this check?
             if (com.android.mail.utils.Utils.isRunningJellybeanOrLater()) {
@@ -1001,15 +1001,17 @@
                         R.integer.max_num_notification_digest_items);
 
                 // The body of the notification is the account name, or the label name.
-                notification.setSubText(
+                notificationBuilder.setSubText(
                         isInbox ? notificationAccountDisplayName : notificationLabelName);
 
                 final NotificationCompat.InboxStyle digest =
-                        new NotificationCompat.InboxStyle(notification);
+                        new NotificationCompat.InboxStyle(notificationBuilder);
 
                 // Group by account and folder
                 final String notificationGroupKey = createGroupKey(account, folder);
-                notification.setGroup(notificationGroupKey).setGroupSummary(true);
+                // Track all senders to later tag them along with the digest notification
+                final HashSet<String> sendersList = new HashSet<String>();
+                notificationBuilder.setGroup(notificationGroupKey).setGroupSummary(true);
 
                 ConfigResult firstResult = null;
                 int numDigestItems = 0;
@@ -1039,13 +1041,14 @@
                                     fromAddress = "";
                                 }
                                 from = getDisplayableSender(fromAddress);
+                                sendersList.add(getSenderAddress(fromAddress));
                             }
                             while (messageCursor.moveToPosition(messageCursor.getPosition() - 1)) {
                                 final Message message = messageCursor.getMessage();
                                 if (!message.read &&
                                         !fromAddress.contentEquals(message.getFrom())) {
                                     multipleUnreadThread = true;
-                                    break;
+                                    sendersList.add(getSenderAddress(message.getFrom()));
                                 }
                             }
                             final SpannableStringBuilder sendersBuilder;
@@ -1107,7 +1110,7 @@
                                     conversationCursor, notificationIntent, folder, when, res,
                                     notificationAccountDisplayName, notificationAccountEmail,
                                     isInbox, notificationLabelName, conversationNotificationId,
-                                    photoFetcher);
+                                    contactFetcher);
                             msgNotifications.put(conversationNotificationId,
                                     NotificationBuilders.of(conversationNotif,
                                             conversationWearExtender));
@@ -1126,6 +1129,10 @@
                     }
                 } while (numDigestItems <= maxNumDigestItems && conversationCursor.moveToNext());
 
+                // Tag main digest notification with the senders
+                tagNotificationsWithPeople(context, notificationBuilder, sendersList,
+                        account.getAccountManagerAccount().name, contactFetcher);
+
                 if (firstResult != null && firstResult.contactIconInfo != null) {
                     wearableExtender.setBackground(firstResult.contactIconInfo.wearableBg);
                 } else {
@@ -1134,7 +1141,7 @@
                 }
             } else {
                 // The body of the notification is the account name, or the label name.
-                notification.setContentText(
+                notificationBuilder.setContentText(
                         isInbox ? notificationAccountDisplayName : notificationLabelName);
             }
         } else {
@@ -1145,10 +1152,10 @@
             seekToLatestUnreadConversation(conversationCursor);
 
             final ConfigResult result = configureNotifForOneConversation(context, account,
-                    folderPreferences, notification, wearableExtender, conversationCursor,
+                    folderPreferences, notificationBuilder, wearableExtender, conversationCursor,
                     notificationIntent, folder, when, res, notificationAccountDisplayName,
                     notificationAccountEmail, isInbox, notificationLabelName,
-                    summaryNotificationId, photoFetcher);
+                    summaryNotificationId, contactFetcher);
             notificationTicker = result.notificationTicker;
 
             if (result.contactIconInfo != null) {
@@ -1167,15 +1174,15 @@
 
         if (notificationTicker != null) {
             // If we didn't generate a notification ticker, it will default to account name
-            notification.setTicker(notificationTicker);
+            notificationBuilder.setTicker(notificationTicker);
         }
 
         // Set the number in the notification
         if (unreadCount > 1) {
-            notification.setNumber(unreadCount);
+            notificationBuilder.setNumber(unreadCount);
         }
 
-        notification.setContentIntent(clickIntent);
+        notificationBuilder.setContentIntent(clickIntent);
     }
 
     /**
@@ -1184,17 +1191,19 @@
      */
     private static ConfigResult configureNotifForOneConversation(Context context,
             Account account, FolderPreferences folderPreferences,
-            NotificationCompat.Builder notification,
+            NotificationCompat.Builder notificationBuilder,
             NotificationCompat.WearableExtender wearExtender, Cursor conversationCursor,
             Intent notificationIntent, Folder folder, long when, Resources res,
             String notificationAccountDisplayName, String notificationAccountEmail,
             boolean isInbox, String notificationLabelName, int notificationId,
-            final ContactPhotoFetcher photoFetcher) {
+            final ContactFetcher contactFetcher) {
 
         final ConfigResult result = new ConfigResult();
 
         final Conversation conversation = new Conversation(conversationCursor);
 
+        // Set of all unique senders for unseen messages
+        final HashSet<String> sendersList = new HashSet<String>();
         Cursor cursor = null;
         MessageCursor messageCursor = null;
         boolean multipleUnseenThread = false;
@@ -1220,8 +1229,9 @@
                 from = getDisplayableSender(fromAddress);
                 result.contactIconInfo = getContactIcon(
                         context, account.getAccountManagerAccount().name, from,
-                        getSenderAddress(fromAddress), folder, photoFetcher);
-                notification.setLargeIcon(result.contactIconInfo.icon);
+                        getSenderAddress(fromAddress), folder, contactFetcher);
+                sendersList.add(getSenderAddress(fromAddress));
+                notificationBuilder.setLargeIcon(result.contactIconInfo.icon);
             }
 
             // Assume that the last message in this conversation is unread
@@ -1231,6 +1241,7 @@
                 final boolean unseen = !message.seen;
                 if (unseen) {
                     firstUnseenMessagePos = messageCursor.getPosition();
+                    sendersList.add(getSenderAddress(message.getFrom()));
                     if (!multipleUnseenThread
                             && !fromAddress.contentEquals(message.getFrom())) {
                         multipleUnseenThread = true;
@@ -1252,28 +1263,28 @@
                             context, conversationCursor, sendersLength,
                             notificationAccountEmail);
 
-                    notification.setContentTitle(sendersBuilder);
+                    notificationBuilder.setContentTitle(sendersBuilder);
                     // For a single new conversation, the ticker is based on the sender's name.
                     result.notificationTicker = sendersBuilder.toString();
                 } else {
                     from = getWrappedFromString(from);
                     // The title of a single message the sender.
-                    notification.setContentTitle(from);
+                    notificationBuilder.setContentTitle(from);
                     // For a single new conversation, the ticker is based on the sender's name.
                     result.notificationTicker = from;
                 }
 
                 // The notification content will be the subject of the conversation.
-                notification.setContentText(getSingleMessageLittleText(context, subject));
+                notificationBuilder.setContentText(getSingleMessageLittleText(context, subject));
 
                 // The notification subtext will be the subject of the conversation for inbox
                 // notifications, or will based on the the label name for user label
                 // notifications.
-                notification.setSubText(isInbox ?
+                notificationBuilder.setSubText(isInbox ?
                         notificationAccountDisplayName : notificationLabelName);
 
                 final NotificationCompat.BigTextStyle bigText =
-                        new NotificationCompat.BigTextStyle(notification);
+                        new NotificationCompat.BigTextStyle(notificationBuilder);
 
                 // Seek the message cursor to the first unread message
                 final Message message;
@@ -1290,7 +1301,7 @@
                             folderPreferences.getNotificationActions(account);
 
                     NotificationActionUtils.addNotificationActions(context, notificationIntent,
-                            notification, wearExtender, account, conversation, message,
+                            notificationBuilder, wearExtender, account, conversation, message,
                             folder, notificationId, when, notificationActions);
                 }
             } else {
@@ -1298,18 +1309,21 @@
 
                 // The title of a single conversation notification is built from both the sender
                 // and subject of the new message.
-                notification.setContentTitle(
+                notificationBuilder.setContentTitle(
                         getSingleMessageNotificationTitle(context, from, subject));
 
                 // The notification content will be the subject of the conversation for inbox
                 // notifications, or will based on the the label name for user label
                 // notifications.
-                notification.setContentText(
+                notificationBuilder.setContentText(
                         isInbox ? notificationAccountDisplayName : notificationLabelName);
 
                 // For a single new conversation, the ticker is based on the sender's name.
                 result.notificationTicker = from;
             }
+
+            tagNotificationsWithPeople(context, notificationBuilder, sendersList,
+                    account.getAccountManagerAccount().name, contactFetcher);
         } finally {
             if (messageCursor != null) {
                 messageCursor.close();
@@ -1321,6 +1335,88 @@
         return result;
     }
 
+    /**
+     * Iterates through all senders, retrieves contact lookup Uris for each sender, and tags the
+     * given notification with these Uris
+     * @param context
+     * @param notificationBuilder
+     * @param sendersList List of unique senders to be tagged with the conversation
+     * @param accountName
+     * @param contactFetcher Implementation of ContactLookupUriFetcher (null by default)
+     */
+    private static void tagNotificationsWithPeople(Context context,
+            NotificationCompat.Builder notificationBuilder, HashSet<String> sendersList,
+            String accountName, ContactFetcher contactFetcher) {
+        // If there is a ContactLookupUriFetcher, go through all unique senders
+        // in the combined notification and add each one as a person.
+        if (contactFetcher != null) {
+            for (final String sender : sendersList) {
+                final Uri contactLookupUri =
+                        contactFetcher.getContactLookupUri(context,
+                                accountName, sender);
+
+                if (contactLookupUri != null) {
+                    notificationBuilder.addPerson(contactLookupUri.toString());
+                }
+            }
+
+        // If implementation for the fetcher is not provided, rely on the ContentResolver
+        // to query for contacts and tag the notification
+        } else {
+            findAndTagContacts(context, sendersList, notificationBuilder);
+        }
+    }
+
+    /**
+     * Queries for contact id and lookup key to tag the notification with Person objects
+     * based on the addresses given.
+     * @param context
+     * @param addresses set of addresses to tag the single notification with
+     * @param notificationBuilder
+     */
+    private static void findAndTagContacts(Context context,
+            HashSet<String> addresses, NotificationCompat.Builder notificationBuilder) {
+        final ArrayList<String> whereArgs = new ArrayList<String>(addresses);
+        final StringBuilder whereBuilder = new StringBuilder();
+        final String[] questionMarks = new String[addresses.size()];
+
+        Arrays.fill(questionMarks, "?");
+        whereBuilder.append(Email.DATA1 + " IN (").
+                append(TextUtils.join(",", questionMarks)).
+                append(")");
+
+        final ContentResolver resolver = context.getContentResolver();
+        final Cursor c = resolver.query(Email.CONTENT_URI,
+                new String[] {Email.CONTACT_ID, ContactsContract.Contacts.LOOKUP_KEY},
+                whereBuilder.toString(),
+                whereArgs.toArray(new String[0]), null);
+
+        if (c == null) {
+            // No query results - no contacts to tag
+            return;
+        }
+
+        final int contactIdCol = c.getColumnIndex(Email.CONTACT_ID);
+        final int lookupKeyCol = c.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
+
+        try {
+            while (c.moveToNext()) {
+                c.getString(lookupKeyCol);
+
+                // Get lookup uri based on id and lookup key
+                final Uri contactLookupUri = ContactsContract.Contacts.getLookupUri(
+                        c.getLong(contactIdCol), c.getString(lookupKeyCol));
+
+                // Add Person if uri is found
+                if (contactLookupUri != null) {
+                    notificationBuilder.addPerson(contactLookupUri.toString());
+                }
+            }
+        } finally {
+            c.close();
+        }
+    }
+
     private static String getWrappedFromString(String from) {
         if (from == null) {
             LogUtils.e(LOG_TAG, "null from string in getWrappedFromString");
@@ -1653,7 +1749,7 @@
 
     private static ContactIconInfo getContactIcon(final Context context, String accountName,
             final String displayName, final String senderAddress, final Folder folder,
-            final ContactPhotoFetcher photoFetcher) {
+            final ContactFetcher contactFetcher) {
         if (Looper.myLooper() == Looper.getMainLooper()) {
             throw new IllegalStateException(
                     "getContactIcon should not be called on the main thread.");
@@ -1674,8 +1770,8 @@
             final int idealWearableBgHeight =
                     res.getDimensionPixelSize(R.dimen.wearable_background_height);
 
-            if (photoFetcher != null) {
-                contactIconInfo = photoFetcher.getContactPhoto(context, accountName,
+            if (contactFetcher != null) {
+                contactIconInfo = contactFetcher.getContactPhoto(context, accountName,
                         senderAddress, idealIconWidth, idealIconHeight, idealWearableBgWidth,
                         idealWearableBgHeight);
             } else {
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index af95b9e..b3bdd7e 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -35,6 +35,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
+import android.support.annotation.Nullable;
 import android.support.v4.text.TextUtilsCompat;
 import android.support.v4.view.ViewCompat;
 import android.text.SpannableString;
@@ -1048,7 +1049,7 @@
         return -1;
     }
 
-    public static Address getAddress(Map<String, Address> cache, String emailStr) {
+    public static @Nullable Address getAddress(Map<String, Address> cache, String emailStr) {
         Address addr;
         synchronized (cache) {
             addr = cache.get(emailStr);
@@ -1117,9 +1118,4 @@
         final NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
         return (networkInfo != null) && networkInfo.isConnected();
     }
-
-    public static boolean isCurrentLocaleRtl() {
-        return TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) ==
-                ViewCompat.LAYOUT_DIRECTION_RTL;
-    }
 }
diff --git a/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java b/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
index bd96de0..dc293e1 100644
--- a/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
+++ b/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
@@ -125,8 +125,8 @@
     /*
      * Add size, color and style to a given text
      */
-    private static CharSequence addStyle(CharSequence text, int size, int color) {
-        SpannableStringBuilder builder = new SpannableStringBuilder(text);
+    private static SpannableStringBuilder addStyle(CharSequence text, int size, int color) {
+        final SpannableStringBuilder builder = new SpannableStringBuilder(text);
         builder.setSpan(
                 new AbsoluteSizeSpan(size), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         if (color != 0) {
@@ -152,7 +152,11 @@
 
         // Add style to date
         final int dateColor = isUnread ? DATE_TEXT_COLOR_UNREAD : DATE_TEXT_COLOR_READ;
-        final CharSequence styledDate = addStyle(date, dateFontSize, dateColor);
+        final SpannableStringBuilder dateBuilder = addStyle(date, dateFontSize, dateColor);
+        if (isUnread) {
+            dateBuilder.setSpan(new StyleSpan(Typeface.BOLD), 0, date.length(),
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
 
         subject = Conversation.getSubjectForDisplay(context, null /* badgeText */, subject);
         final SpannableStringBuilder subjectBuilder = new SpannableStringBuilder(subject);
@@ -180,7 +184,7 @@
         final RemoteViews remoteViews = new RemoteViews(
                 context.getPackageName(), R.layout.widget_conversation_list_item);
         remoteViews.setTextViewText(R.id.widget_senders, senders);
-        remoteViews.setTextViewText(R.id.widget_date, styledDate);
+        remoteViews.setTextViewText(R.id.widget_date, dateBuilder);
         remoteViews.setTextViewText(R.id.widget_subject, styledSubject);
         remoteViews.setTextViewText(R.id.widget_snippet, styledSnippet);
         if (paperclipBitmap != null) {
diff --git a/tests/src/com/android/mail/browse/SendersFormattingTests.java b/tests/src/com/android/mail/browse/SendersFormattingTests.java
index ecec4df..c55e03b 100644
--- a/tests/src/com/android/mail/browse/SendersFormattingTests.java
+++ b/tests/src/com/android/mail/browse/SendersFormattingTests.java
@@ -112,4 +112,98 @@
         assertEquals(before.firstUnreadSnippet, after.firstUnreadSnippet);
         assertEquals(before.lastSnippet, after.lastSnippet);
     }
+
+    public void testSenderAvatarIsSenderOfFirstUnreadMessage() {
+        final ConversationInfo conv = createConversationInfo();
+        conv.addParticipant(new ParticipantInfo("a", "a@a.com", 0, true));
+        conv.addParticipant(new ParticipantInfo("b", "b@b.com", 0, false));
+        conv.addParticipant(new ParticipantInfo("c", "c@c.com", 0, false));
+
+        final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+        final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+        final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+                new ConversationItemViewModel.SenderAvatarModel();
+
+        SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+                senderAvatarModel, null, false, false);
+
+        assertEquals("b@b.com", senderAvatarModel.getEmailAddress());
+        assertEquals("b", senderAvatarModel.getName());
+    }
+
+    public void testSenderAvatarIsLastSenderIfAllMessagesAreRead() {
+        final ConversationInfo conv = createConversationInfo();
+        conv.addParticipant(new ParticipantInfo("a", "a@a.com", 0, true));
+        conv.addParticipant(new ParticipantInfo("b", "b@b.com", 0, true));
+        conv.addParticipant(new ParticipantInfo("c", "c@c.com", 0, true));
+
+        final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+        final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+        final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+                new ConversationItemViewModel.SenderAvatarModel();
+
+        SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+                senderAvatarModel, null, false, false);
+
+        assertEquals("c@c.com", senderAvatarModel.getEmailAddress());
+        assertEquals("c", senderAvatarModel.getName());
+    }
+
+    public void testSenderAvatarIsLastSenderThatIsNotTheCurrentAccountIfAllMessagesAreRead() {
+        final ConversationInfo conv = createConversationInfo();
+        conv.addParticipant(new ParticipantInfo("a", "a@a.com", 0, true));
+        conv.addParticipant(new ParticipantInfo("b", "b@b.com", 0, true));
+        // empty name indicates it is the current account
+        conv.addParticipant(new ParticipantInfo("", "c@c.com", 0, true));
+
+        final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+        final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+        final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+                new ConversationItemViewModel.SenderAvatarModel();
+
+        SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+                senderAvatarModel, null, false, false);
+
+        assertEquals("b@b.com", senderAvatarModel.getEmailAddress());
+        assertEquals("b", senderAvatarModel.getName());
+    }
+
+    public void testSenderAvatarIsCurrentAccountIfAllSendersAreCurrentAccount() {
+        final ConversationInfo conv = createConversationInfo();
+        // empty name indicates it is the current account
+        conv.addParticipant(new ParticipantInfo("", "a@a.com", 0, true));
+
+        final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+        final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+        final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+                new ConversationItemViewModel.SenderAvatarModel();
+
+        SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+                senderAvatarModel, null, false, false);
+
+        assertEquals("a@a.com", senderAvatarModel.getEmailAddress());
+        assertEquals("", senderAvatarModel.getName());
+    }
+
+    /**
+     * Two senders in a thread should be kept distinct if they have unique email addresses, even if
+     * they happen to share the same name.
+     */
+    public void testSenderNamesWhenNamesMatchButEmailAddressesDiffer() {
+        final ConversationInfo conv = createConversationInfo();
+        conv.addParticipant(new ParticipantInfo("Andrew", "aholmes@awesome.com", 0, true));
+        conv.addParticipant(new ParticipantInfo("Andrew", "ajohnson@wicked.com", 0, true));
+
+        final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+        final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+        final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+                new ConversationItemViewModel.SenderAvatarModel();
+
+        SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+                senderAvatarModel, null, false, false);
+
+        assertEquals(2, displayableSenderNames.size());
+        assertEquals("Andrew", displayableSenderNames.get(0));
+        assertEquals("Andrew", displayableSenderNames.get(1));
+    }
 }
\ No newline at end of file