commit e8b77589e54ec73a8464e40111c3b7a503251cf0
author Mark Wei <markwei@google.com> Fri Sep 13 14:57:18 2013 -0700
committer Mark Wei <markwei@google.com> Fri Sep 13 14:57:18 2013 -0700
tree 350742de19c41f8380f35283ef6299cf06134e19
parent 5e43c93578fba021060f1974a5e594a23e3c90a7
parent 440f4ba393696ebd3b5ee777d43dc6df1e6c0c42

resolved conflicts for merge of 440f4ba3 to jb-ub-mail-ur11

Conflicts:
	src/com/android/mail/browse/ConversationItemView.java
	src/com/android/mail/preferences/MailPrefs.java

Change-Id: I34c01c69b54ca46cfe026b6e2927330a82091fba

res/values-af/strings.xml

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 24ba7a0..93a016e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"In gespreklys"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Stuurderprent"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Wys langs naam in gespreklys"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Aangehegselvoorskoue"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Wys aanhegselvoorskoue vir onlangse boodskappe in gespreklys"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Trek af om te verfris"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kyk tans vir pos"</string>
     <string name="empty_trash" msgid="652435297593538512">"Maak asblik leeg"</string>

res/values-am/strings.xml

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7d4f539..6007f4d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"በውይይት ዝርዝር ውስጥ"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"የላኪ ምስል"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"በውይይት ዝርዝር ውስጥ ከስም ጎን አሳይ"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"የአባሪ ቅድመ እይታዎች"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"ለቅርብ ጊዜ መልእክቶች በውይይት ዝርዝር ውስጥ የአባሪ ቅድመ እይታዎችን አሳይ"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"ለማደስ ወደ ታች ያንሸራትቱ"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"መልዕክት በማየት ላይ"</string>
     <string name="empty_trash" msgid="652435297593538512">"መጣያውን አጽዳ"</string>

res/values-ar/strings.xml

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f66cca4..8c65482 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"في قائمة المحادثات"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"صورة المرسل"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"عرض بجوار الاسم في قائمة الدردشات"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"معاينة المرفقات"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"عرض معاينة المرفقات في الرسائل الأخيرة بقائمة الدردشات"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"التمرير لأسفل للتحديث"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"التحقق من وجود بريد"</string>
     <string name="empty_trash" msgid="652435297593538512">"إفراغ المهملات"</string>

res/values-bg/strings.xml

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a3b0573..1063e00 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"В списък с кореспонденции"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Изображение на подателя"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Показване до името в списъка с кореспонденции"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Визуализации на прикачените файлове"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Показване на визуализации на прикачените файлове за скорошните съобщения в списъка с кореспонденции"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Прекарайте пръст надолу, за да опресните"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
     <string name="empty_trash" msgid="652435297593538512">"Изчистване на кошчето"</string>

res/values-ca/strings.xml

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e97b820..4b005f8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"A la llista de converses"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imatge del remitent"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostra al costat del nom a la llista de converses"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Visualitzacions prèvies de fitxer adjunt"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Mostra les visualitzacions prèvies de fitxer adjunt dels missatges recents a la llista de converses"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fes lliscar el dit cap avall per actualitzar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"S\'està comprovant si hi ha correu."</string>
     <string name="empty_trash" msgid="652435297593538512">"Buida la paperera"</string>

res/values-cs/strings.xml

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 442f74e..29f182a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"V seznamu konverzací"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Obrázek odesílatele"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Zobrazit vedle jména v seznamu konverzací"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Náhledy příloh"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Zobrazit náhledy příloh posledních zpráv v seznamu konverzací"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Seznam aktualizujete posunutím dolů."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vysypat koš"</string>

res/values-da/strings.xml

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e2d5191..b9f6c4c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"På samtaleliste"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Afsenderbillede"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Vis ved siden af navnet i samtalelisten"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Eksempelvisning af vedhæftede filer"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Vis eksempler på vedhæftede filer for de seneste meddelelser på samtalelisten"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Stryg ned for at opdatere"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tjekker for e-mails"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurv"</string>

res/values-de/strings.xml

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f7465fa..5c713d5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"In einer Unterhaltungsliste"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Bild des Absenders"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Neben Namen in der Konversationsliste anzeigen"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Anhangsvorschauen"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Anhangsvorschauen für neue Nachrichten in der Konversationsliste anzeigen"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Zum Aktualisieren nach unten wischen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Nachrichten werden abgerufen..."</string>
     <string name="empty_trash" msgid="652435297593538512">"Papierkorb leeren"</string>

res/values-el/strings.xml

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6725c09..81c7f3d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Στη λίστα συνομιλιών"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Εικόνα αποστολέα"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Εμφάνιση δίπλα στο όνομα στη λίστα συνομιλιών"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Προεπισκοπήσεις συνημμένων αρχείων"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Εμφάνιση προεπισκοπήσεων συνημμένων αρχείων για τα πρόσφατα μηνύματα της λίστας συνομιλιών"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Σύρετε προς τα κάτω για ανανέωση"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Γίνεται έλεγχος για αλληλογραφία"</string>
     <string name="empty_trash" msgid="652435297593538512">"Άδειασμα κάδου απορριμάτων"</string>

res/values-en-rGB/strings.xml

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2cd44be..267a666 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversation list"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Sender image"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Show beside name in conversation list"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Attachment Previews"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Show attachment previews for recent messages in conversation list"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swipe down to refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Checking for mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Empty Trash"</string>

res/values-es-rUS/strings.xml

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5e21d9a..e0ed492 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"En lista de conversaciones"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagen del remitente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar al lado del nombre en la lista de conversaciones"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Vistas previas de archivos adjuntos"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Permite mostrar vistas previas de archivos adjuntos de mensajes recientes en la lista de conversaciones."</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Desliza el dedo hacia abajo para actualizar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico…"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vaciar papelera"</string>

res/values-es/strings.xml

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4805675..0a35eb2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"En la lista de conversaciones"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagen del remitente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar junto al nombre en la lista de conversaciones"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Vistas previas de archivos adjuntos"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Mostrar vistas previas de adjuntos de mensajes recientes en la lista de conversaciones"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar hacia abajo para actualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Buscando correo electrónico..."</string>
     <string name="empty_trash" msgid="652435297593538512">"Vaciar papelera"</string>

res/values-et-rEE/strings.xml

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ca1d57d..864c1b0 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Meilivestluste loendis"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Saatja pilt"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Kuvatakse vestluste loendis nime kõrval"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Manuste eelvaated"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Kuva vestluse loendis hiljutiste sõnumite manuste eelvaateid"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Värskendamiseks pühkige alla"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-posti kontrollimine"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tühjenda prügikast"</string>

res/values-fa/strings.xml

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 03a68ae..74ee2ff 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"تصویر فرستنده"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"نمایش در کنار نام در فهرست مکالمه"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"پیش‌نمایش پیوست‌ها"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"نشان دادن پیش‌نمایش پیوست‌ها برای پیام‌های جدید در فهرست مکالمه"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
     <string name="empty_trash" msgid="652435297593538512">"خالی کردن پوشه حذف‌ شده‌ها"</string>

res/values-fi/strings.xml

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 175a8c9..a2b5e10 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Keskusteluluettelossa"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Lähettäjän kuva"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Näytä nimen vieressä keskusteluluettelossa"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Liitetiedostojen esikatselu"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Näytä uusien viestien liitetiedostojen esikatselu keskusteluluettelossa"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Päivitä liu\'uttamalla alas"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tarkistetaan sähköposteja"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tyhjennä roskakori"</string>

res/values-fr/strings.xml

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3441b43..43b3154 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dans la liste des conversations"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Image de l\'expéditeur"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Afficher à côté du nom dans la liste des conversations"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Aperçus des pièces jointes"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Afficher les aperçus des pièces jointes des messages récents de la liste de conversations"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vider la corbeille"</string>

res/values-hi/strings.xml

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 40a965e..ffb8de2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"बातचीत की सूची में"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"प्रेषक का चित्र"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"बातचीत सूची में नाम के पास दिखाएं"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"अनुलग्नक पूर्वावलोकन"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"वार्तालाप सूची में हाल ही के संदेशों के लिए अनुलग्नक पूर्वावलोकन दिखाएं"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"रीफ्रेश करने के लिए नीचे स्वाइप करें"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"मेल के लिए जांच की जा रही है"</string>
     <string name="empty_trash" msgid="652435297593538512">"मिटाया हुआ रिक्त करें"</string>

res/values-hr/strings.xml

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c9baba5..d4cae5d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na popisu razgovora"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Slika pošiljatelja"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Prikaži pored imena na popisu razgovora"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Pregledi privitaka"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Prikaži preglede privitaka za nedavne poruke na popisu razgovora"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
     <string name="empty_trash" msgid="652435297593538512">"Pražnjenje otpada"</string>

res/values-hu/strings.xml

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index af9bcae..fc9311f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Beszélgetéslistában"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Küldő képe"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Megjelenítés a név mellett a beszélgetések listájában"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Mellékletek előnézete"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Friss üzenetekben lévő mellékletek előnézetének megjelenítése a beszélgetések listájában"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Frissítéshez húzza le"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-mail ellenőrzése"</string>
     <string name="empty_trash" msgid="652435297593538512">"Kuka ürítése"</string>

res/values-in/strings.xml

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f643128..fec2e87 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam daftar percakapan"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Gambar pengirim"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Tampilkan di samping nama dalam daftar percakapan"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Pratinjau Lampiran"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Menampilkan pratinjau lampiran untuk pesan terbaru dalam daftar percakapan"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Gesek ke bawah untuk menyegarkan"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Memeriksa email"</string>
     <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>

res/values-it/strings.xml

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7c790d2..4ebf3ac 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"In elenco di conversazioni"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Immagine mittente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostra accanto al nome nell\'elenco di conversazioni"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Anteprime allegati"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Mostra anteprime di allegati per messaggi recenti nell\'elenco di conversazioni"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fai scorrere verso il basso per aggiornare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controllo della posta"</string>
     <string name="empty_trash" msgid="652435297593538512">"Svuota cestino"</string>

res/values-iw/strings.xml

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fc66e9a..a0ebf61 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"ברשימת השיחות"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"תמונת השולח"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"הצג לצד השם ברשימת השיחות"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"תצוגה מקדימה של קבצים מצורפים"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"הצג ברשימת השיחות תצוגה מקדימה של קבצים מצורפים עבור הודעות מהתקופה האחרונה"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"החלק מטה לביצוע רענון"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"בודק אם יש דואר"</string>
     <string name="empty_trash" msgid="652435297593538512">"רוקן את האשפה"</string>

res/values-ja/strings.xml

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 23088d0..2e8609f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"スレッドリスト内"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"送信者の画像"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"スレッドリストの名前の横に表示します"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"添付ファイルをプレビュー表示する"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"スレッドリストにある最近のメールについて、添付ファイルをプレビュー表示します"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下にスワイプして更新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"メールを確認しています"</string>
     <string name="empty_trash" msgid="652435297593538512">"ゴミ箱を空にする"</string>

res/values-ko/strings.xml

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fd246e1..bd4358d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"대화 목록"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"발신자 이미지"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"대화 목록에서 이름 옆에 표시"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"첨부파일 미리보기"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"대화 목록에서 최근 메시지의 첨부파일 미리보기 표시"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"아래로 스와이프하여 새로고침"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"메일 확인 중"</string>
     <string name="empty_trash" msgid="652435297593538512">"휴지통 비우기"</string>

res/values-lt/strings.xml

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a00a614..7c66d1b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Pokalbių sąraše"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Siuntėjo vaizdas"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Rodyti šalia vardo pokalbių sąraše"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Priedų peržiūros"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Rodykite naujausių pokalbių sąrašo pranešimų priedų peržiūras"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Perbraukite žemyn, kad atnaujintumėte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ieškoma laiškų"</string>
     <string name="empty_trash" msgid="652435297593538512">"Išvalyti šiukšliadėžę"</string>

res/values-lv/strings.xml

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5cd94dc..34c1711 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sarunu sarakstā"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Sūtītāja attēls"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Rādīt blakus vārdam sarunu sarakstā"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Pielikumu priekšskatījumi"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Rādīt pielikumu priekšskatījumus pēdējiem ziņojumiem sarunu sarakstā"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Lai atsvaidzinātu, velciet uz leju."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Notiek e-pasta pārbaude"</string>
     <string name="empty_trash" msgid="652435297593538512">"Iztukšot atkritni"</string>

res/values-ms-rMY/strings.xml

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 87a79ee..14ccb39 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imej penghantar"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Tunjukkan di sebelah nama dalam senarai perbualan"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Pratonton Lampiran"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Tunjukkan pratonton lampiran untuk mesej terbaharu dalam senarai perbualan"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
     <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>

res/values-nb/strings.xml

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1bfd140..6826ab7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"I samtalelister"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Avsenderbilder"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Vis ved siden av navnet i samtalelisten"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Forhåndsvisning av vedlegg"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Vis forhåndsvisning av vedlegg for nylige e-poster i samtalelisten"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Sveip ned for å laste inn på nytt"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ser etter e-post"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurven"</string>

res/values-nl/strings.xml

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 84f5961..cadac7b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversatielijst"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Afbeelding van afzender"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Weergeven naast naam in gesprekslijst"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Bijlagevoorbeelden"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Bijlagevoorbeelden voor recente berichten weergeven in de gesprekslijst"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Veeg omlaag om te vernieuwen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controleren op e-mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Prullenbak leegmaken"</string>

res/values-pl/strings.xml

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 94e3b51..6aba526 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na liście wątków"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Zdjęcie nadawcy"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Pokaż obok imienia i nazwiska na liście wątków"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Podgląd załączników"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Pokazuj podgląd załączników w ostatnich wiadomościach na liście wątku"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Przesuń w dół, by odświeżyć"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Sprawdzam pocztę"</string>
     <string name="empty_trash" msgid="652435297593538512">"Opróżnij kosz"</string>

res/values-pt-rPT/strings.xml

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0cbe00e..e3ebd77 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagem do remetente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar junto ao nome na lista de conversas"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Pré-visualizações de anexos"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Mostrar pré-visualizações de anexos para mensagens recentes na lista de conversas"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize rapidamente para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"A verificar a existência de correio"</string>
     <string name="empty_trash" msgid="652435297593538512">"Esvaziar Lixo"</string>

res/values-pt/strings.xml

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0873bc6..e0851c0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagem do remetente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar caixa de seleção ao lado do nome na lista de conversas"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Visualizações de anexos"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Mostrar visualizações de anexos para mensagens recentes na lista de conversas"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Verificando e-mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Esvaziar lixeira"</string>

res/values-ro/strings.xml

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8bd9bdf..b7548c1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"În lista de conversații"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imaginea expeditorului"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Afișați lângă nume în lista de conversații"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Previzualizările atașamentelor"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Afișați previzualizările atașamentelor pentru mesajele recente din lista de conversații"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Glisați în jos pentru actualizare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Se verifică e-mailurile"</string>
     <string name="empty_trash" msgid="652435297593538512">"Goliți coșul de gunoi"</string>

res/values-ru/strings.xml

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2d37a2c..7a681fe 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"В списке цепочек"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Фотографии отправителей"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Показывать рядом с именами в списке цепочек"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Просмотр изображений"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Показывать уменьшенные изображения прикрепленных файлов из последних сообщений"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Пролистните вниз, чтобы обновить"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверка почты…"</string>
     <string name="empty_trash" msgid="652435297593538512">"Очистить корзину"</string>

res/values-sk/strings.xml

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3095494..ac2b5e3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"V zozname konverzácií"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Obrázok odosielateľa"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Zobraziť vedľa mena v zozname konverzácií"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Ukážky príloh"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Zobraziť ukážky príloh nedávno prijatých správ v zozname konverzácií"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Potiahnutím nadol obnovte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vyprázdniť kôš"</string>

res/values-sl/strings.xml

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5abbf92..62a50a2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na seznamu pogovorov"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Slika pošiljatelja"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Prikaz zraven imena na seznamu pogovorov"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Predogledi prilog"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Prikaz predogledov prilog za nedavna sporočila na seznamu pogovorov"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Za osvežitev povlecite navzdol"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Preverjanje pošte"</string>
     <string name="empty_trash" msgid="652435297593538512">"Izprazni smetnjak"</string>

res/values-sr/strings.xml

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f2ca23d..700394f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"На листи преписки"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Слика пошиљаоца"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Приказивање поред имена на листи преписки"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Прегледи прилога"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Приказивање прегледа прилога за недавне поруке на листи преписки"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Листајте надоле да бисте освежили"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверавање поште"</string>
     <string name="empty_trash" msgid="652435297593538512">"Пражњење директоријума за отпад"</string>

res/values-sv/strings.xml

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d625d3a..0829915 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"I konversationslista"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Bild på avsändare"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Visa bredvid namnet i konversationslistan"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Förhandsgranskning av bilagor"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Visa förhandsgranskning av bilagor i nya meddelanden i en konversationslista"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Dra nedåt om du vill uppdatera"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Söker efter e-post"</string>
     <string name="empty_trash" msgid="652435297593538512">"Töm papperskorgen"</string>

res/values-sw/strings.xml

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a5f3e0b..a759a13 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Picha ya mtumaji"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Onyesha kando ya jina katika orodha ya mazungumzo"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Onyesho la Kuchungulia Kiambatisho"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Onyesha onyesho la kuchungulia kiambatisho kwa ujumbe wa karibuni katika orodha ya mazungumzo"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Telezesha chini ili uonyeshe upya"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
     <string name="empty_trash" msgid="652435297593538512">"Safisha Tupio"</string>

res/values-th/strings.xml

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9c680e5..0e6cbed 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"ในรายการการสนทนา"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"ภาพของผู้ส่ง"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"แสดงข้างชื่อในรายการสนทนา"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"ตัวอย่างไฟล์แนบ"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"แสดงตัวอย่างไฟล์แนบสำหรับข้อความล่าสุดในรายการการสนทนา"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"กวาดลงเพื่อรีเฟรช"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"กำลังตรวจดูจดหมาย"</string>
     <string name="empty_trash" msgid="652435297593538512">"ลบทุกอย่างในถังขยะ"</string>

res/values-tl/strings.xml

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f04b075..5bb53b1 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sa listahan ng pag-uusap"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Larawan ng nagpadala"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Ipakita sa tabi ng pangalan sa listahan ng pag-uusap"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Mga Preview ng Attachment"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Ipakita ang mga preview ng attachment para sa mga kamakailang mensahe sa listahan ng pag-uusap"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Mag-swipe pababa upang mag-refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tumitingin ng mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Alisan ng Laman ang Basurahan"</string>

res/values-tr/strings.xml

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b9cc853..69d3dc8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"İleti dizisi listesinde"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Gönderen resmi"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"İleti dizisi listesinde adın yanında göster"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Ek Önizlemeleri"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"İleti dizisindeki son iletiler için ek önizlemelerini göster"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Yenilemek için aşağı hızlıca kaydırın"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Posta kontrol ediliyor"</string>
     <string name="empty_trash" msgid="652435297593538512">"Çöp Kutusunu Boşalt"</string>

res/values-uk/strings.xml

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 64717a6..e93da1b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"У списку бесід"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Зображення відправника"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Показувати біля імені в списку бесід"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Попередні перегляди вкладених файлів"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Показувати в списку бесід попередні перегляди вкладених файлів з останніх повідомлень"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Проведіть пальцем униз, щоб оновити"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Перевірка пошти"</string>
     <string name="empty_trash" msgid="652435297593538512">"Очистити кошик"</string>

res/values-vi/strings.xml

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d45a22e..186c5fb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Ảnh người gửi"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Hiển thị bên cạnh tên trong danh sách cuộc hội thoại"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Xem trước tệp đính kèm"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Hiển thị chế độ xem trước tệp đính kèm cho các thư gần đây trong danh sách hội thoại"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
     <string name="empty_trash" msgid="652435297593538512">"Xóa sạch thùng rác"</string>

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a7a2dbb..1ba67af 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"发件人头像"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"在会话列表中的名称旁显示"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"附件预览"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"在会话列表中显示近期邮件的附件预览"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
     <string name="empty_trash" msgid="652435297593538512">"清空已删除邮件"</string>

res/values-zh-rTW/strings.xml

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9699371..60a9e65 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"在會話群組清單中"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"寄件者圖片"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"在會話群組清單中的名稱旁邊顯示"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"附件預覽"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"在會話群組清單中顯示近期郵件的附件預覽畫面"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑動即可重新整理"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
     <string name="empty_trash" msgid="652435297593538512">"清空垃圾筒"</string>

res/values-zu/strings.xml

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3140e1a..fb4aff4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -140,7 +140,6 @@
     <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>
-    <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>
@@ -363,8 +362,6 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Ohlwini lengxoxo"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Isithombe somthumeli"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Bonisa eduze kwegama kuhlu lwengxoxo"</string>
-    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Ukubuka kuqala kokunamathiselwe ku-imeyili"</string>
-    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Bonisa ukubuka kuqala kokunamathiselwe ku-imeyili kwemilayezo yakamuva kuhlu lwengxoxo"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swayiphela phansi ukuze uqale kabusha"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ihlolela imeyili"</string>
     <string name="empty_trash" msgid="652435297593538512">"Sula konke kudoti"</string>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5453934..0d9add9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -302,8 +302,6 @@
     <!-- Displayed in Conversation Header View and Widget in the form of "subject - snippet"
          [CHAR LIMIT=5] -->
     <string name="subject_and_snippet"><xliff:g>%s</xliff:g> \u2014 <xliff:g>%s</xliff:g></string>
-    <!-- Displayed in attachment previews in conversation list [CHAR LIMIT=2] -->
-    <string name="ap_overflow_format">+<xliff:g>%d</xliff:g></string>
     <!-- Displayed in browse list item when the list item is a draft message instead of showing the subject [CHAR LIMIT=100] -->
     <plurals name="draft">
         <!-- Title of the screen when there is exactly one draft -->
@@ -823,11 +821,6 @@
     <!-- Preference description for whether to display sender image option [CHAR LIMIT=200] -->
     <string name="preference_sender_image_description">Show beside name in conversation list</string>
 
-    <!-- Preference name for whether to display attachment previews in conversation list [CHAR LIMIT=100] -->
-    <string name="preference_attachment_previews_title">Attachment Previews</string>
-    <!-- Preference description for whether to display attachment previews [CHAR LIMIT=200] -->
-    <string name="preference_attachment_previews_description">Show attachment previews for recent messages in conversation list</string>
-
     <!-- In conversation list, when user initiates a downward swipe,
         this text is displayed in the action bar as a hint that they can trigger a
         sync/refresh by continuing the downward swipe. [CHAR LIMIT=60] -->

src/com/android/mail/browse/ConversationItemView.java

diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 06613e3..5dd2267 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -136,7 +136,6 @@
 
     private static String sSendersSplitToken;
     private static String sElidedPaddingToken;
-    private static String sOverflowCountFormat;
 
     // Static colors.
     private static int sSendersTextColorRead;
@@ -432,7 +431,6 @@
             // Initialize static color.
             sSendersSplitToken = res.getString(R.string.senders_split_token);
             sElidedPaddingToken = res.getString(R.string.elided_padding_token);
-            sOverflowCountFormat = res.getString(string.ap_overflow_format);
             sScrollSlop = res.getInteger(R.integer.swipeScrollSlop);
             sFoldersLeftPadding = res.getDimensionPixelOffset(R.dimen.folders_left_padding);
             sOverflowCountMax = res.getInteger(integer.ap_overflow_max_count);
@@ -627,10 +625,7 @@
         Utils.traceEndSection();
 
         Utils.traceBeginSection("overflow");
-        final int overflowCount = Math.min(getOverflowCount(), sOverflowCountMax);
-        mHeader.overflowText = (overflowCount > 0) ?
-                String.format(sOverflowCountFormat, overflowCount) : null;
-        mAttachmentsView.setOverflowText(mHeader.overflowText);
+        mAttachmentsView.setOverflowText(null);
         Utils.traceEndSection();
 
         Utils.traceBeginSection("content description");

src/com/android/mail/preferences/MailPrefs.java

diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index 3791055..1b6000b 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java
@@ -86,9 +86,6 @@
 
         public static final String SHOW_SENDER_IMAGES = "conversation-list-sender-image";
 
-        public static final String SHOW_ATTACHMENT_PREVIEWS
-                = "conversation-list-attachment-previews";
-
         public static final String
                 LONG_PRESS_TO_SELECT_TIP_SHOWN = "long-press-to-select-tip-shown";
 
@@ -107,7 +104,6 @@
                 .add(DISPLAY_IMAGES)
                 .add(DISPLAY_IMAGES_PATTERNS)
                 .add(SHOW_SENDER_IMAGES)
-                .add(SHOW_ATTACHMENT_PREVIEWS)
                 .add(LONG_PRESS_TO_SELECT_TIP_SHOWN)
                 .build();
     }
@@ -406,19 +402,6 @@
         return sharedPreferences.getBoolean(PreferenceKeys.SHOW_SENDER_IMAGES, true);
     }
 
-    public void setShowAttachmentPreviews(final boolean enable) {
-        getEditor().putBoolean(PreferenceKeys.SHOW_ATTACHMENT_PREVIEWS, enable).apply();
-        notifyBackupPreferenceChanged();
-    }
-
-    public boolean getShowAttachmentPreviews() {
-        if (Utils.isLowRamDevice(getContext())) {
-            return false;
-        }
-        final SharedPreferences sharedPreferences = getSharedPreferences();
-        return sharedPreferences.getBoolean(PreferenceKeys.SHOW_ATTACHMENT_PREVIEWS, true);
-    }
-
     public void setParallaxSpeedAlternative(final boolean alternative) {
         getEditor().putBoolean(PreferenceKeys.EXPERIMENT_AP_PARALLAX_SPEED_ALTERNATIVE, alternative)
                 .apply();