Merge "Draw scrollbars above conversation view content." into jb-ub-mail
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8a9fea8..e2d4d19 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle vouers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Onlangse vouers"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c12ed8d..78d930e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"ሁሉም አቃፊዎች"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"የቅርብ ጊዜ አቃፊዎች"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index dda1219..a16341e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"جميع المجلدات"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"المجلدات الحديثة"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2d2ed88..84b4f46 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Усе папкi"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Апошнія папкi"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index badb256..faf7123 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Всички папки"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Скорошни папки"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a96190a..393a0ab 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Totes les carpetes"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetes recents"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Detalls del missatge"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c0ce96f..5f9d676 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Všechny složky"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Poslední složky"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5c05085..0882ef6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle mapper"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Seneste mapper"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Beskeddetaljer"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 244d2b8..995cba7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle Ordner"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Letzte Ordner"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ea51afd..00c41b6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Όλοι οι φάκελοι"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Πρόσφατοι φάκελοι"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Λεπτομέρειες μηνύματος"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1f60e55..7e8b18b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"All folders"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recent folders"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Message details"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5d4c0f6..e1593f7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas las carpetas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetas recientes"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f688aed..5e4fb7c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas las carpetas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetas recientes"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Detalles del mensaje"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2f1c9a4..d7fafa7 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Kõik kaustad"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Hiljutised kaustad"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7d6858e..a552080 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"همه پوشه‌ها"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"پوشه‌های اخیر"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f34ac30..d0cbfec 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Kaikki kansiot"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Viimeaikaiset kansiot"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 427a203..9cb4896 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Tous les dossiers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dossiers récents"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a2e8e54..c82c9c9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"सभी फ़ोल्डर"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"हाल ही के फ़ोल्‍डर"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index deb27b3..e5cd0b5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Sve mape"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedavne mape"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index aa14962..bc01f77 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Összes mappa"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Legutóbbi mappák"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2587b86..29c8fcf 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Semua folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 53e8924..be9a4a9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Tutte le cartelle"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Cartelle recenti"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Dettagli messaggio"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a5cc55e..c381535 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"כל התיקיות"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"תיקיות אחרונות"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"פרטי הודעה"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c4edc42..75bd4dc 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">"(<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"すべてのフォルダ"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"最近開いたフォルダ"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f298157..e7f0506 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"모든 폴더"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"최근 폴더"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 33da114..7db58a0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Visi aplankai"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nauji aplankai"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ab24fc9..b6c0709 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Visas mapes"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Jaunākās mapes"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8505c52..5f124ef 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Semua folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index af2ec9a..f7bc5e2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle mapper"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nylige mapper"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 077bb2a..7e79fce 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle mappen"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recente mappen"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Berichtdetails"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 49d82cf..bf8380b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -369,4 +369,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Wszystkie foldery"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Ostatnie foldery"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9c09fac..ddceefc 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas as pastas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Pastas recentes"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Detalhes da mensagem"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 485d004..6d43d2f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas as pastas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Pastas recentes"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 742ad6e..dc587ab 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -541,4 +541,6 @@
     <skip />
     <!-- no translation found for recent_folders_heading (8613621794529777406) -->
     <skip />
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1def41d..cd9e8cf 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Toate dosarele"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dosare recente"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 870a056..5c3f48d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Все папки"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Последние папки"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ed25232..b15fc25 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Všetky priečinky"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedávne priečinky"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 88fcf33..e326197 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Vse mape"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedavne mape"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fb4c13f..7b7682e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Сви директоријуми"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Недавни директоријуми"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6cac605..9f81167 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Alla mappar"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Senaste mapparna"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1fcf87a..3235608 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Folda zote"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folda za hivi karibuni"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Maelezo ya ujumbe"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d7d3924..d258672 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"โฟลเดอร์ทั้งหมด"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"โฟลเดอร์ล่าสุด"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4d61664..b2d04be 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Lahat ng folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Mga kamakailang folder"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d0e336e..011f074 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Tüm klasörler"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Son klasörler"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4705fa1..ed83d33 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Усі папки"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Останні папки"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Деталі повідомлення"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 59a2ac4..5f9cb6f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Tất cả thư mục"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Thư mục gần đây"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 008ec5e..41ddd9b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"所有文件夹"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"近期文件夹"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b746009..15d531d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -371,4 +371,6 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"所有資料夾"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"最近使用的資料夾"</string>
+    <!-- no translation found for message_details_title (2183394728494962332) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6d7a4b9..a19aeee 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -371,4 +371,5 @@
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Wonke amafolda"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Amafolda akamuva"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Imininingwane yomlayezo"</string>
 </resources>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 7006bcf..e6ca45d 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -50,14 +50,12 @@
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.util.SparseArray;
-import android.view.Gravity;
 import android.view.DragEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.animation.DecelerateInterpolator;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.mail.R;
@@ -172,6 +170,7 @@
     private ControllableActivity mActivity;
     private CharacterStyle mActivatedTextSpan;
     private int mBackgroundOverride = -1;
+    private static TextView sSendersTextView;
     private static int sScrollSlop;
     private static int sSendersTextViewTopPadding;
     private static int sSendersTextViewHeight;
@@ -605,19 +604,18 @@
         } else {
             mHeader.styledSendersString.removeSpan(mActivatedTextSpan);
         }
-        mHeader.sendersTextView = getSendersTextView();
     }
 
     private TextView getSendersTextView() {
-        TextView sendersTextView = new TextView(mContext);
-        sendersTextView.setMaxLines(1);
-        sendersTextView.setEllipsize(TextUtils.TruncateAt.END);
-        sendersTextView.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT));
-        int length = (int) sPaint.measureText(mHeader.styledSendersString.toString());
-        sendersTextView.setText(mHeader.styledSendersString, TextView.BufferType.SPANNABLE);
-        sendersTextView.setWidth(length);
-        return sendersTextView;
+        if (sSendersTextView == null) {
+            TextView sendersTextView = new TextView(mContext);
+            sendersTextView.setMaxLines(1);
+            sendersTextView.setEllipsize(TextUtils.TruncateAt.END);
+            sendersTextView.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT));
+            sSendersTextView = sendersTextView;
+        }
+        return sSendersTextView;
     }
 
     private CharacterStyle getActivatedTextSpan() {
@@ -1015,6 +1013,11 @@
         } else {
             canvas.translate(mCoordinates.sendersX,
                     mCoordinates.sendersY + sSendersTextViewTopPadding);
+            mHeader.sendersTextView = getSendersTextView();
+            int length = (int) sPaint.measureText(mHeader.styledSendersString.toString());
+            mHeader.sendersTextView.setText(mHeader.styledSendersString,
+                    TextView.BufferType.SPANNABLE);
+            mHeader.sendersTextView.setWidth(length);
             mHeader.sendersTextView.layout(0, 0, mSendersWidth, sSendersTextViewHeight);
             mHeader.sendersTextView.draw(canvas);
         }