Import translations. DO NOT MERGE

Change-Id: I1d16e7b51d5150088a4ed3d10f523aa4068f08e8
Auto-generated-cl: translation import

49 files changed, 347 insertions, 193 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 37213d0fe..7a0f711f2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"gesprek ongelees"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Konsep"</item>
     <item quantity="other" msgid="6961049507579977505">"Konsepte"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Vou ontvanger se details in"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Wys kontakinligting vir <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Wys kontakinligting"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> ouer boodskappe"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Van:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Antwoord aan:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Aan:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Vouer-ikoon"</string>
     <string name="add_account" msgid="2162808366829269770">"Voeg rekening by"</string>
     <string name="attached_message" msgid="4267189489654642035">"Heg boodskap aan"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Vandag <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Gister <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index dc0384619..587aa00da 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"ያልተነበበ ውይይት"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"ረቂቅ"</item>
     <item quantity="other" msgid="6961049507579977505">"ረቂቆች"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"የተቀባይ ዝርዝሮች ሰብስብ"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"የ<xliff:g id="NAME">%1$s</xliff:g> የእውቂያ መረጃ አሳይ"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"የዕውቂያ መረጃ አሳይ"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"ቀን፦"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> የቆዩ መልዕክቶች"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"ከ፦"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"መልስ ለ፦"</string>
     <string name="to_heading" msgid="3219994961726691756">"ለ፦"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"የአቃፊ አዶ"</string>
     <string name="add_account" msgid="2162808366829269770">"መለያ ያክሉ"</string>
     <string name="attached_message" msgid="4267189489654642035">"የተያያዘ መልዕክት"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>፣ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"ዛሬ፣ <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"ትላንት፣ <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d630d9bfc..677c3e221 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"لم تتم قراءة المحادثة"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"مسودة"</item>
     <item quantity="other" msgid="6961049507579977505">"مسودات"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"تصغير تفاصيل المستلم"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"عرض معلومات جهة الاتصال لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"عرض معلومات جهة الاتصال"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"التاريخ:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"الرسائل القديمة: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"من:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"جهة الرد:"</string>
     <string name="to_heading" msgid="3219994961726691756">"إلى:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"رمز المجلد"</string>
     <string name="add_account" msgid="2162808366829269770">"إضافة حساب"</string>
     <string name="attached_message" msgid="4267189489654642035">"الرسالة المرفقة"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>، <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"اليوم، <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"أمس، <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f6a468227..1f8d2fed1 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -255,8 +255,7 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Згарнуць дадзеныя пра атрымальніка"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Паказаць кантактную інфармацыю карыстальнiка <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Паказаць кантактную інфармацыю"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Дата:"</string>
+    <!-- no translation found for show_messages_read:other (7439716291751085801) -->
     <string name="from_heading" msgid="8950294114718418954">"Ад:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Адказаць:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Каму:"</string>
@@ -429,4 +428,10 @@
     <!-- no translation found for add_account (2162808366829269770) -->
     <skip />
     <string name="attached_message" msgid="4267189489654642035">"Прымацаванае паведамленне"</string>
+    <!-- no translation found for date_message_received (6302308934790266050) -->
+    <skip />
+    <!-- no translation found for date_message_received_today (7923108495669251362) -->
+    <skip />
+    <!-- no translation found for date_message_received_yesterday (2240669381396206434) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 84e8f543e..4e2c8a2c3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"кореспонденцията не е прочетена"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+ <xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Чернова"</item>
     <item quantity="other" msgid="6961049507579977505">"Чернови"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Свиване на подробностите за получателя"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показване на информацията за връзка със: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Показване на информацията за връзка"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Дата:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> по-стари съобщения"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"От:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Отг. до:"</string>
     <string name="to_heading" msgid="3219994961726691756">"До:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Икона на папката"</string>
     <string name="add_account" msgid="2162808366829269770">"Добавяне на профил"</string>
     <string name="attached_message" msgid="4267189489654642035">"Прикачено съобщение"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Днес, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Вчера, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dfd88d684..30706941d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversa per llegir"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Esborrany"</item>
     <item quantity="other" msgid="6961049507579977505">"Esborranys"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Redueix les dades del destinatari"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostra la informació de contacte de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Mostra la informació de contacte"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Data:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> missatges anteriors"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"De:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Respon a:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Per a:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Icona de la carpeta"</string>
     <string name="add_account" msgid="2162808366829269770">"Afegeix un compte"</string>
     <string name="attached_message" msgid="4267189489654642035">"Missatge adjunt"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Avui a les <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ahir a les <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 07a02d9b1..1d9d27359 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"Konverzace nebyla přečtena."</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Koncept"</item>
     <item quantity="other" msgid="6961049507579977505">"Koncepty"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sbalit podrobnosti o příjemci"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Zobrazit kontaktní údaje uživatele <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Zobrazit kontaktní údaje"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Starší zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Odesílatel:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Odpovědět:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Komu:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikona složky"</string>
     <string name="add_account" msgid="2162808366829269770">"Přidat účet"</string>
     <string name="attached_message" msgid="4267189489654642035">"Přiložená zpráva"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Dnes v <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Včera v <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index da5cac095..9ab794901 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"samtalen er ulæst"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Kladde"</item>
     <item quantity="other" msgid="6961049507579977505">"Kladder"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Skjul modtageroplysninger"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Vis kontaktoplysninger for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Vis kontaktoplysninger"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Dato:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> ældre beskeder"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Fra:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Svar til:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Til:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Mappeikon"</string>
     <string name="add_account" msgid="2162808366829269770">"Tilføj konto"</string>
     <string name="attached_message" msgid="4267189489654642035">"Vedhæftet meddelelse"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"I dag kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7548d3df9..a5f2f4b92 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"Konversation ungelesen"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+ <xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Entwurf"</item>
     <item quantity="other" msgid="6961049507579977505">"Entwürfe"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Empfängerdetails minimieren"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Kontaktinformationen für <xliff:g id="NAME">%1$s</xliff:g> anzeigen"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Kontaktinformationen anzeigen"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> ältere Nachrichten"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Von:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Antwort:"</string>
     <string name="to_heading" msgid="3219994961726691756">"An:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ordnersymbol"</string>
     <string name="add_account" msgid="2162808366829269770">"Konto hinzufügen"</string>
     <string name="attached_message" msgid="4267189489654642035">"Angehängte Nachricht"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> um <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Heute um <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Gestern um <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 923fd782d..54bba3330 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"μη αναγνωσμένη συνομιλία"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Πρόχειρο"</item>
     <item quantity="other" msgid="6961049507579977505">"Πρόχειρα"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Σύμπτυξη στοιχείων παραλήπτη"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Εμφάνιση στοιχείων επικοινωνίας για τον χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Εμφάνιση στοιχείων επικοινωνίας"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Ημ/νία:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> παλαιότερα μηνύματα"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Από:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Απάντ. σε:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Προς:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Εικονίδιο φακέλου"</string>
     <string name="add_account" msgid="2162808366829269770">"Προσθήκη λογαριασμού"</string>
     <string name="attached_message" msgid="4267189489654642035">"Συνημμένο μήνυμα"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Σήμερα, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Χθες, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 31cac608d..e9a39bf87 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversation unread"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Draft"</item>
     <item quantity="other" msgid="6961049507579977505">"Drafts"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Collapse recipient details"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Show contact information for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Show contact information"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Date:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"From:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Reply to:"</string>
     <string name="to_heading" msgid="3219994961726691756">"To:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Folder icon"</string>
     <string name="add_account" msgid="2162808366829269770">"Add account"</string>
     <string name="attached_message" msgid="4267189489654642035">"Attached message"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Today, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Yesterday, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7804b7daa..99e51ae6d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversación no leída"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Borrador"</item>
     <item quantity="other" msgid="6961049507579977505">"Borradores"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Contraer detalles del destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar la información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Mostrar la información de contacto"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Fecha:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes antiguos"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"De:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Responder a:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Para:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ícono de carpeta"</string>
     <string name="add_account" msgid="2162808366829269770">"Agregar cuenta"</string>
     <string name="attached_message" msgid="4267189489654642035">"Mensaje adjunto"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hoy, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ayer, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 46b0af58c..f6b400f78 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversación no leída"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Borrador"</item>
     <item quantity="other" msgid="6961049507579977505">"Borradores"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Contraer información del destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Mostrar información de contacto"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Fecha:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes antiguos"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"De:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Responder a:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Para:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Icono de carpeta"</string>
     <string name="add_account" msgid="2162808366829269770">"Añadir cuenta"</string>
     <string name="attached_message" msgid="4267189489654642035">"Mensaje adjunto"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hoy a las <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ayer a las <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 63be8f042..5b708fbee 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"lugemata vestlus"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>  –  <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Mustand"</item>
     <item quantity="other" msgid="6961049507579977505">"Mustandid"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ahenda saaja üksikasjad"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Kuva saatja <xliff:g id="NAME">%1$s</xliff:g> kontaktandmed"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Kuva kontaktandmed"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Kuupäev:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> vanemat sõnumit"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Saatja:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Vasta:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Saaja:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Kausta ikoon"</string>
     <string name="add_account" msgid="2162808366829269770">"Lisa konto"</string>
     <string name="attached_message" msgid="4267189489654642035">"Lisatud sõnum"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Täna kell <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Eile kell <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8b5c7dc5b..4d6879e2a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"مکالمه خوانده نشده است"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"پیش‌نویس‌"</item>
     <item quantity="other" msgid="6961049507579977505">"پیش‌نویس‌ها"</item>
@@ -253,8 +252,7 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"کوچک کردن جزئیات گیرنده"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"نمایش اطلاعات تماس برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"نمایش اطلاعات مخاطب"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"تاریخ:"</string>
+    <!-- no translation found for show_messages_read:other (7439716291751085801) -->
     <string name="from_heading" msgid="8950294114718418954">"از:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"پاسخ به:"</string>
     <string name="to_heading" msgid="3219994961726691756">"گیرنده:"</string>
@@ -425,4 +423,10 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"نماد پوشه"</string>
     <string name="add_account" msgid="2162808366829269770">"افزودن حساب"</string>
     <string name="attached_message" msgid="4267189489654642035">"پیام پیوست شده"</string>
+    <!-- no translation found for date_message_received (6302308934790266050) -->
+    <skip />
+    <!-- no translation found for date_message_received_today (7923108495669251362) -->
+    <skip />
+    <!-- no translation found for date_message_received_yesterday (2240669381396206434) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5213d17c5..e52d0635e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"keskustelua ei ole luettu"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Luonnos"</item>
     <item quantity="other" msgid="6961049507579977505">"Luonnokset"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Tiivistä vastaanottajan tiedot"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Näytä henkilön <xliff:g id="NAME">%1$s</xliff:g> yhteystiedot"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Näytä yhteystiedot"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Pvm.:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> vanhempaa viestiä"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Lähettäjä:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Vastausos.:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Vast.ott:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Kansiokuvake"</string>
     <string name="add_account" msgid="2162808366829269770">"Lisää tili"</string>
     <string name="attached_message" msgid="4267189489654642035">"Liitetty viesti"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Tänään klo <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Eilen klo <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 893926d04..c768becf2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversation non lue"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Brouillon"</item>
     <item quantity="other" msgid="6961049507579977505">"Brouillons"</item>
@@ -253,8 +252,7 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Réduire les coordonnées du destinataire"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Afficher les coordonnées de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Afficher les coordonnées de l\'expéditeur"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Date :"</string>
+    <!-- no translation found for show_messages_read:other (7439716291751085801) -->
     <string name="from_heading" msgid="8950294114718418954">"De :"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Adresse de réponse :"</string>
     <string name="to_heading" msgid="3219994961726691756">"À :"</string>
@@ -425,4 +423,10 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Icône Dossier"</string>
     <string name="add_account" msgid="2162808366829269770">"Ajouter un compte"</string>
     <string name="attached_message" msgid="4267189489654642035">"Message joint"</string>
+    <!-- no translation found for date_message_received (6302308934790266050) -->
+    <skip />
+    <!-- no translation found for date_message_received_today (7923108495669251362) -->
+    <skip />
+    <!-- no translation found for date_message_received_yesterday (2240669381396206434) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 32564c29d..932ab6e64 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"वार्तालाप नहीं पढ़ा गया"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"ड्रॉफ़्ट"</item>
     <item quantity="other" msgid="6961049507579977505">"ड्राफ़्ट"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"प्राप्तकर्ता जानकारी संक्षिप्त करें"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> की संपर्क जानकारी दिखाएं"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"संपर्क जानकारी दिखाएं"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"दिनांक:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> पुराने संदेश"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"प्रेषक:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"उत्तर पता:"</string>
     <string name="to_heading" msgid="3219994961726691756">"प्रति:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"फ़ोल्डर आइकन"</string>
     <string name="add_account" msgid="2162808366829269770">"खाता जोड़ें"</string>
     <string name="attached_message" msgid="4267189489654642035">"अनुलग्न किया गया संदेश"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"आज, <xliff:g id="TIME">%1$s</xliff:g> बजे"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"कल, <xliff:g id="TIME">%1$s</xliff:g> बजे"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1e8e118d9..a05d8beec 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"razgovor nije pročitan"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Skica"</item>
     <item quantity="other" msgid="6961049507579977505">"Skice"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sažmi podatke o primatelju"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Prikaži podatke o kontaktu za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Prikaži podatke o kontaktu"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Broj starijih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Šalje:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Prima:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Primatelj:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikona mape"</string>
     <string name="add_account" msgid="2162808366829269770">"Dodaj račun"</string>
     <string name="attached_message" msgid="4267189489654642035">"Poruka u privitku"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Danas u <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Jučer u <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 04c4b5973..d98a1b13d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"a beszélgetés nincs elolvasva"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> -- <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Piszkozat"</item>
     <item quantity="other" msgid="6961049507579977505">"Piszkozatok"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Címzett adatainak elrejtése"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> elérhetőségi adatainak megjelenítése"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Névjegyinformációk megjelenítése"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Dátum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> régebbi üzenet"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Feladó:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Válaszcím:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Címzett:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Mappa ikon"</string>
     <string name="add_account" msgid="2162808366829269770">"Fiók hozzáadása"</string>
     <string name="attached_message" msgid="4267189489654642035">"Csatolt üzenetek"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Ma, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Tegnap, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0fb132cbd..05cd74a2b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"percakapan belum dibaca"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Draf"</item>
     <item quantity="other" msgid="6961049507579977505">"Draf"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ciutkan detail penerima"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Tampilkan informasi kontak untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Tampilkan informasi kontak"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Tanggal:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> pesan lebih lama"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Dari:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Balas-ke:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kepada:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikon folder"</string>
     <string name="add_account" msgid="2162808366829269770">"Tambahkan akun"</string>
     <string name="attached_message" msgid="4267189489654642035">"Pesan terlampir"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hari ini, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Kemarin, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 926a759e5..591a89624 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversazione da leggere"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Bozza"</item>
     <item quantity="other" msgid="6961049507579977505">"Bozze"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Comprimi i dettagli destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostra informazioni di contatto di <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Mostra informazioni di contatto"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Data:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> messaggi meno recenti"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Da:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Rispondi a:"</string>
     <string name="to_heading" msgid="3219994961726691756">"A:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Icona cartella"</string>
     <string name="add_account" msgid="2162808366829269770">"Aggiungi account"</string>
     <string name="attached_message" msgid="4267189489654642035">"Messaggio allegato"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Oggi alle <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ieri alle <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9df0fe119..c961d57a7 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"השיחה לא נקראה"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"‎+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"טיוטה"</item>
     <item quantity="other" msgid="6961049507579977505">"טיוטות"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"כווץ את פרטי הנמען"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"הצג פרטי איש קשר של <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"הצג פרטי איש קשר"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"תאריך:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות ישנות יותר"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"מ:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"השב ל:"</string>
     <string name="to_heading" msgid="3219994961726691756">"אל:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"סמל תיקיה"</string>
     <string name="add_account" msgid="2162808366829269770">"הוסף חשבון"</string>
     <string name="attached_message" msgid="4267189489654642035">"הודעה מצורפת"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>‏, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"היום ב-<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"אתמול ב-<xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b11c6fd53..5a8071dbe 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"未読のスレッド"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"下書き"</item>
     <item quantity="other" msgid="6961049507579977505">"下書き"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"受信者の詳細を隠す"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g>の連絡先情報を表示"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"連絡先情報を表示"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"日付:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"これ以前のメッセージ<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"From:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"返信先:"</string>
     <string name="to_heading" msgid="3219994961726691756">"To:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"フォルダアイコン"</string>
     <string name="add_account" msgid="2162808366829269770">"アカウントを追加"</string>
     <string name="attached_message" msgid="4267189489654642035">"添付のメッセージ"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>、<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"今日、<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"昨日、<xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e95fc1162..327e5fa34 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"대화 읽지 않음"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"임시보관"</item>
     <item quantity="other" msgid="6961049507579977505">"임시보관함"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"수신자 세부정보 접기"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g>님에 대한 연락처 정보 표시"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"연락처 정보 표시"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"날짜:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"이전 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"보낸사람:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"답장:"</string>
     <string name="to_heading" msgid="3219994961726691756">"받는사람:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"폴더 아이콘"</string>
     <string name="add_account" msgid="2162808366829269770">"계정 추가"</string>
     <string name="attached_message" msgid="4267189489654642035">"첨부된 메시지"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"오늘 <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"어제 <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0db9ad026..a289143f1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"pokalbis neskaitytas"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Juodraštis"</item>
     <item quantity="other" msgid="6961049507579977505">"Juodrašč."</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sutraukti išsamią gavėjo informaciją"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Rodyti <xliff:g id="NAME">%1$s</xliff:g> kontaktinę informaciją"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Rodyti kontaktinę informaciją"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Data:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Senesnių pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Nuo:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Atsakyti:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kam:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Aplanko piktograma"</string>
     <string name="add_account" msgid="2162808366829269770">"Pridėti paskyrą"</string>
     <string name="attached_message" msgid="4267189489654642035">"Pridėtas pranešimas"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Šiandien <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Vakar <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d55fdf1b9..87580a56a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"saruna nav izlasīta"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Melnraksts"</item>
     <item quantity="other" msgid="6961049507579977505">"Melnraksti"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sakļaut informāciju par adresātu"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Rādīt sūtītāja <xliff:g id="NAME">%1$s</xliff:g> kontaktinformāciju"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Rādīt kontaktinformāciju"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datums:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> vecāki ziņojumi"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"No:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Atbildēt:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kam:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Mapes ikona"</string>
     <string name="add_account" msgid="2162808366829269770">"Pievienot kontu"</string>
     <string name="attached_message" msgid="4267189489654642035">"Pievienots ziņojums"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, plkst. <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Šodien plkst. <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Vakar plkst. <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c1957a6c7..45181ba36 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"perbualan belum dibaca"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Draf"</item>
     <item quantity="other" msgid="6961049507579977505">"Draf"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Runtuhkan butiran penerima"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Papar maklumat kenalan untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Tunjukkan maklumat kenalan"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Tarikh:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> mesej lebih lama"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Daripada:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Balas-kpd:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kepada:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikon folder"</string>
     <string name="add_account" msgid="2162808366829269770">"Tambah akaun"</string>
     <string name="attached_message" msgid="4267189489654642035">"Mesej lampiran"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hari ini, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Semalam, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3a1ba72c3..3de811bd8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"samtalen er ulest"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Utkast"</item>
     <item quantity="other" msgid="6961049507579977505">"Utkast"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Skjul detaljer om mottaker"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Vis kontaktinformasjon for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Vis kontaktinformasjon"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Dato:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> eldre e-poster"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Fra:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Svar til:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Til:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Mappeikon"</string>
     <string name="add_account" msgid="2162808366829269770">"Legg til konto"</string>
     <string name="attached_message" msgid="4267189489654642035">"Vedlagt e-post"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"I dag kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 47f91d238..f98f9e451 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversatie ongelezen"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Concept"</item>
     <item quantity="other" msgid="6961049507579977505">"Concepten"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ontvangersdetails samenvouwen"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Contactgegevens weergeven voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Contactgegevens weergeven"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> oudere berichten"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Van:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Antwoord:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Aan:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Mappictogram"</string>
     <string name="add_account" msgid="2162808366829269770">"Account toevoegen"</string>
     <string name="attached_message" msgid="4267189489654642035">"Bijgevoegd bericht"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Vandaag, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Gisteren, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 76ac98768..623fe1c5c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -162,8 +162,7 @@
     <string name="unread_string" msgid="588180203444398297">"wątek nie został przeczytany"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Wersja robocza"</item>
     <item quantity="other" msgid="6961049507579977505">"Wersje robocze"</item>
@@ -251,8 +250,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Zwiń szczegóły odbiorcy"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Pokaż informacje kontaktowe: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Pokaż informacje kontaktowe"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Data:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Starsze wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Od:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Odp. do:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Do:"</string>
@@ -423,4 +423,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikona folderu"</string>
     <string name="add_account" msgid="2162808366829269770">"Dodaj konto"</string>
     <string name="attached_message" msgid="4267189489654642035">"Dołączona wiadomość"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Dzisiaj, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Wczoraj, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d0d933fb9..2e0bf9c45 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversa não lida"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Rascunho"</item>
     <item quantity="other" msgid="6961049507579977505">"Rascunhos"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Fechar detalhes do destinatário"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar informações de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Mostrar informações de contacto"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Data:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"De:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Responder a:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Para:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ícone de pasta"</string>
     <string name="add_account" msgid="2162808366829269770">"Adicionar conta"</string>
     <string name="attached_message" msgid="4267189489654642035">"Mensagem anexada"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hoje às <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ontem às <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7779c94df..59be5f51b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversa não lida"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Rascunho"</item>
     <item quantity="other" msgid="6961049507579977505">"Rascunhos"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Recolher detalhes do destinatário"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar informações de contato de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Mostrar informações de contato"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Data:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"De:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Res. para:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Para:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ícone de pasta"</string>
     <string name="add_account" msgid="2162808366829269770">"Adicionar conta"</string>
     <string name="attached_message" msgid="4267189489654642035">"Mensagem anexa"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hoje, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ontem, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 26b84e2d8..3860cc171 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -381,9 +381,7 @@
     <skip />
     <!-- no translation found for contact_info_string_default (596531738469809159) -->
     <skip />
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <!-- no translation found for date_heading (2414358582984879303) -->
-    <skip />
+    <!-- no translation found for show_messages_read:other (7439716291751085801) -->
     <!-- no translation found for from_heading (8950294114718418954) -->
     <skip />
     <!-- no translation found for replyto_heading (2081358811894701297) -->
@@ -656,4 +654,10 @@
     <skip />
     <!-- no translation found for attached_message (4267189489654642035) -->
     <skip />
+    <!-- no translation found for date_message_received (6302308934790266050) -->
+    <skip />
+    <!-- no translation found for date_message_received_today (7923108495669251362) -->
+    <skip />
+    <!-- no translation found for date_message_received_yesterday (2240669381396206434) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e86c9b64a..b887e38c6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"conversație necitită"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Mesaj nefinalizat"</item>
     <item quantity="other" msgid="6961049507579977505">"Mesaje nefinalizate"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Restrângeţi detaliile destinatarului"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Afişaţi informaţiile de contact pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Afişaţi informaţiile de contact"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Dată:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje mai vechi"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"De la:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Răsp. la:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Către:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Pictogramă dosar"</string>
     <string name="add_account" msgid="2162808366829269770">"Adăugați un cont"</string>
     <string name="attached_message" msgid="4267189489654642035">"Mesaj atașat"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Astăzi, la <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ieri, la <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8c2c5045a..81de6b785 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"не прочитано"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Черновик"</item>
     <item quantity="other" msgid="6961049507579977505">"Черновики"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скрыть сведения о получателе"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показать контактные данные пользователя <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Показать контактные данные"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Дата:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Старых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"От:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Ответить:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Кому:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Значок папки"</string>
     <string name="add_account" msgid="2162808366829269770">"Добавить аккаунт"</string>
     <string name="attached_message" msgid="4267189489654642035">"Прикрепленные сообщения"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Сегодня, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Вчера, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 36b6b51ab..fb0cfc1d9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"konverzácia nebola prečítaná"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Koncept"</item>
     <item quantity="other" msgid="6961049507579977505">"Koncepty"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Zbaliť podrobnosti o príjemcovi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Zobraziť informácie kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Zobraziť kontaktné informácie"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Dátum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Počet starších správ: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Od:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Odpovedať:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Komu:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikona priečinka"</string>
     <string name="add_account" msgid="2162808366829269770">"Pridať účet"</string>
     <string name="attached_message" msgid="4267189489654642035">"Priložená správa"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Dnes o <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Včera o <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 939f13ca5..1eecf6ee6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"pogovor ni bil prebran"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Osnutek"</item>
     <item quantity="other" msgid="6961049507579977505">"Osnutki"</item>
@@ -253,8 +252,7 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Strni podrobnosti prejemnika"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Prikaz podatkov za stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Prikaži podatke za stik"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+    <!-- no translation found for show_messages_read:other (7439716291751085801) -->
     <string name="from_heading" msgid="8950294114718418954">"Od:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Odgovori:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Za:"</string>
@@ -425,4 +423,10 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikona mape"</string>
     <string name="add_account" msgid="2162808366829269770">"Dodaj račun"</string>
     <string name="attached_message" msgid="4267189489654642035">"Pripeto sporočilo"</string>
+    <!-- no translation found for date_message_received (6302308934790266050) -->
+    <skip />
+    <!-- no translation found for date_message_received_today (7923108495669251362) -->
+    <skip />
+    <!-- no translation found for date_message_received_yesterday (2240669381396206434) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0d6482b97..d3ae5c917 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"преписка није прочитана"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Недовршена порука"</item>
     <item quantity="other" msgid="6961049507579977505">"Недовршене поруке"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скупи детаље о примаоцу"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Прикажи контакт информације корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Прикажи контакт информације"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Датум:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Старијих порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Од:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Одговор на:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Коме:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Икона директоријума"</string>
     <string name="add_account" msgid="2162808366829269770">"Додај налог"</string>
     <string name="attached_message" msgid="4267189489654642035">"Приложена порука"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Данас, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Јуче, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 685a5fc52..50340b2ba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"konversationen är oläst"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Utkast"</item>
     <item quantity="other" msgid="6961049507579977505">"Utkast"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Komprimera mottagardetaljer"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Visa kontaktuppgifter för <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Visa kontaktuppgifter"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Datum:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> äldre meddelanden"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Från:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Svara till:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Till:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Mappikon"</string>
     <string name="add_account" msgid="2162808366829269770">"Lägg till konto"</string>
     <string name="attached_message" msgid="4267189489654642035">"Bifogat meddelande"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Idag kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 43b7b9528..7e00cbe8f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"mazungumzo hayajasomwa"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Rasimu"</item>
     <item quantity="other" msgid="6961049507579977505">"Rasimu"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Kunja maelezo ya wapokeaji"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Onyesha maelezo ya mawasiliano ya <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Onyesha maelezo ya mawasiliano"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Tarehe:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa zamani"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Kutoka:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Jibu-kwa:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kwa:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Ikoni ya folda"</string>
     <string name="add_account" msgid="2162808366829269770">"Ongeza akaunti"</string>
     <string name="attached_message" msgid="4267189489654642035">"Ujumbe ulioambatishwa"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Leo, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Jana, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index cf6625085..8866da3b0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"ยังไม่ได้อ่านการสนทนา"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"ร่างจดหมาย"</item>
     <item quantity="other" msgid="6961049507579977505">"ร่างจดหมาย"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"ยุบรายละเอียดผู้รับ"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"แสดงข้อมูลติดต่อของ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"แสดงข้อมูลติดต่อ"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"วันที่:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความเก่า"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"จาก:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"ตอบกลับ:"</string>
     <string name="to_heading" msgid="3219994961726691756">"ถึง:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"ไอคอนโฟลเดอร์"</string>
     <string name="add_account" msgid="2162808366829269770">"เพิ่มบัญชี"</string>
     <string name="attached_message" msgid="4267189489654642035">"ข้อความที่แนบมา"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> เวลา <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"วันนี้เวลา <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"เมื่อวานนี้เวลา <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e4e11cec4..346a0cecc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"hindi pa nababasang pag-uusap"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Draft"</item>
     <item quantity="other" msgid="6961049507579977505">"Mga Draft"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Tiklupin ang mga detalye ng recipient"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Ipakita ang impormasyon ng contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Ipakita ang impormasyon ng contact"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Petsa:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> (na) mas lumang mensahe"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Mula kay:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Tugon kay:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Para kay:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Icon ng folder"</string>
     <string name="add_account" msgid="2162808366829269770">"Magdagdag ng account"</string>
     <string name="attached_message" msgid="4267189489654642035">"Naka-attach na mensahe"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Ngayon, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Kahapon, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1aa6be824..ef3945349 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"ileti dizisi okunmadı"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Taslak"</item>
     <item quantity="other" msgid="6961049507579977505">"Taslaklar"</item>
@@ -253,8 +252,7 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Alıcı ayrıntılarını daralt"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> iletişim bilgilerini göster"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"İletişim bilgilerini göster"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Tarih:"</string>
+    <!-- no translation found for show_messages_read:other (7439716291751085801) -->
     <string name="from_heading" msgid="8950294114718418954">"Gönderen:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Yanıt Adresi:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Alıcı:"</string>
@@ -425,4 +423,10 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Klasör simgesi"</string>
     <string name="add_account" msgid="2162808366829269770">"Hesap ekle"</string>
     <string name="attached_message" msgid="4267189489654642035">"Ekli ileti"</string>
+    <!-- no translation found for date_message_received (6302308934790266050) -->
+    <skip />
+    <!-- no translation found for date_message_received_today (7923108495669251362) -->
+    <skip />
+    <!-- no translation found for date_message_received_yesterday (2240669381396206434) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a0f849e48..961533f74 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"бесіду не прочитано"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Чернетка"</item>
     <item quantity="other" msgid="6961049507579977505">"Чернетки"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Згорнути дані отримувача"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показати контактну інформацію відправника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Показати контактну інформацію"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Дата:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"Попередні повідомлення: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Від:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Відпов.:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Кому:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Значок папки"</string>
     <string name="add_account" msgid="2162808366829269770">"Додати обліковий запис"</string>
     <string name="attached_message" msgid="4267189489654642035">"Вкладене повідомлення"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Сьогодні, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Учора, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e61862d82..2737c7e9a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"cuộc trò chuyện chưa đọc"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Bản nháp"</item>
     <item quantity="other" msgid="6961049507579977505">"Bản nháp"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Thu gọn chi tiết người nhận"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Hiển thị thông tin liên hệ cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Hiển thị thông tin liên hệ"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Ngày:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> thư cũ hơn"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Từ:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Trả lời"</string>
     <string name="to_heading" msgid="3219994961726691756">"Đến:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Biểu tượng thư mục"</string>
     <string name="add_account" msgid="2162808366829269770">"Thêm tài khoản"</string>
     <string name="attached_message" msgid="4267189489654642035">"Tin nhắn đính kèm"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hôm nay, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Hôm qua, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7d75de4b8..31b33ff2f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"未读会话"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"草稿"</item>
     <item quantity="other" msgid="6961049507579977505">"草稿"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"折叠收件人详细信息"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"显示<xliff:g id="NAME">%1$s</xliff:g>的联系人信息"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"显示联系人信息"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"日期："</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g>封较旧的邮件"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"发件人："</string>
     <string name="replyto_heading" msgid="2081358811894701297">"回复："</string>
     <string name="to_heading" msgid="3219994961726691756">"收件人："</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"文件夹图标"</string>
     <string name="add_account" msgid="2162808366829269770">"添加帐户"</string>
     <string name="attached_message" msgid="4267189489654642035">"附加的邮件"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>，<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"今天<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"昨天<xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dc569fe46..6527846a3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"未閱讀的會話群組"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"還有 <xliff:g id="ID_1">%d</xliff:g> 個附件"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"草稿"</item>
     <item quantity="other" msgid="6961049507579977505">"草稿"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"收合收件者詳細資料"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"顯示 <xliff:g id="NAME">%1$s</xliff:g> 的聯絡人資訊"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"顯示聯絡人資訊"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"日期："</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"寄件者："</string>
     <string name="replyto_heading" msgid="2081358811894701297">"回覆："</string>
     <string name="to_heading" msgid="3219994961726691756">"收件者："</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"資料夾圖示"</string>
     <string name="add_account" msgid="2162808366829269770">"新增帳戶"</string>
     <string name="attached_message" msgid="4267189489654642035">"附加的郵件"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"今天<xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"昨天<xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b97b9c5b1..59b069311 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -164,8 +164,7 @@
     <string name="unread_string" msgid="588180203444398297">"inkulumo engafundiwe"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
-    <!-- no translation found for ap_overflow_format (2285438422049030145) -->
-    <skip />
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
   <plurals name="draft">
     <item quantity="one" msgid="333591132893648383">"Okusalungiswa"</item>
     <item quantity="other" msgid="6961049507579977505">"Okusalungiswa"</item>
@@ -253,8 +252,9 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Goqa imininingwane yomtholi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Khombisa imininingwane yokuxhumana ka-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Bonisa ulwazi loxhumana naye"</string>
-    <!-- no translation found for show_messages_read:other (7344988174650303930) -->
-    <string name="date_heading" msgid="2414358582984879303">"Usuku:"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g>imilayezo emidala"</item>
+  </plurals>
     <string name="from_heading" msgid="8950294114718418954">"Kusuka:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Phendula-ku:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kuya ku:"</string>
@@ -425,4 +425,7 @@
     <string name="folder_icon_desc" msgid="1500547397347480618">"Isithonjana sefolda"</string>
     <string name="add_account" msgid="2162808366829269770">"Engeza i-akhawunti"</string>
     <string name="attached_message" msgid="4267189489654642035">"Umlayezo oshumekiwe"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Namuhla, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Izolo, <xliff:g id="TIME">%1$s</xliff:g>"</string>
 </resources>