diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 0548c8bcb3..ab8da2abde 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -358,7 +358,6 @@
     <string name="title_advanced_threading_unread">Danışıqda oxunmamış mesaj sayını göstər</string>
     <string name="title_advanced_indentation">Danışıqlarda alınan/göndərilən mesajların sol/sağ boşluğu</string>
     <string name="title_advanced_highlight_unread">Oxunmamış mesajları vurğula</string>
-    <string name="title_advanced_highlight_subject">Mövzunu vurğula</string>
     <string name="title_advanced_color_stripe">Rəng zolağını göstər</string>
     <string name="title_advanced_avatars">Əlaqə fotolarını göstər</string>
     <string name="title_advanced_gravatars">\"Gravatar\"ları göstər</string>
@@ -377,10 +376,10 @@
     <string name="title_advanced_distinguish_contacts">Göndərən yerli \"alıcı\" əlaqəsi kimi bilinirsə göndərənin altından xətt çək</string>
     <string name="title_advanced_show_recipients">Mesaj başlığında alıcıları göstər</string>
     <string name="title_advanced_font_size_sender">Göndərən mətn ölçüsü</string>
-    <string name="title_advanced_font_size_subject">Mövzu mətn ölçüsü</string>
     <string name="title_advanced_subject_top">Göndərənin üstündə mövzunu göstər</string>
     <string name="title_advanced_subject_italic">Mövzunu \"italic\" göstər</string>
-    <string name="title_advanced_subject_elipsed">Ehtiyac olanda, mövzunu qısalt</string>
+    <string name="title_advanced_highlight_subject">Mövzunu vurğula</string>
+    <string name="title_advanced_font_size_subject">Mövzu mətn ölçüsü</string>
     <string name="title_advanced_highlight_color">Rəngi vurğula</string>
     <string name="title_advanced_keywords">Mesaj başlığında açar sözləri göstər</string>
     <string name="title_advanced_labels">Mesaj başlığında Gmail etiketlərini göstər</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 30d4c030ca..b3306e4821 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -252,7 +252,6 @@
     <string name="title_advanced_threading_unread">Показване на броя на непрочетените съобщения в разговорите</string>
     <string name="title_advanced_indentation">Ляв/десен отстъп на получени/изпратени съобщения в разговори</string>
     <string name="title_advanced_highlight_unread">Маркирай непрочетените съобщения</string>
-    <string name="title_advanced_highlight_subject">Маркирана тема</string>
     <string name="title_advanced_color_stripe">Показване на цветна ивица</string>
     <string name="title_advanced_avatars">Покажи снимка на контакт</string>
     <string name="title_advanced_gravatars">Покажи Gravatars</string>
@@ -268,7 +267,7 @@
     <string name="title_advanced_show_recipients">Показване на получателите в заглавката на съобщението</string>
     <string name="title_advanced_subject_top">Покажи темата над подателя</string>
     <string name="title_advanced_subject_italic">Покажи темата наклонена</string>
-    <string name="title_advanced_subject_elipsed">При нужда, съкрати темата</string>
+    <string name="title_advanced_highlight_subject">Маркирана тема</string>
     <string name="title_advanced_keywords">Показване на ключови думи в заглавката на съобщението</string>
     <string name="title_advanced_labels">Показване на етикетите на Gmail в заглавката на съобщението</string>
     <string name="title_advanced_flags">Показване на звездите</string>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 9907b936a8..56cc0f9b1d 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -311,12 +311,12 @@
     <string name="title_advanced_tabular_background">Koristi boju kartice kao pozadinsku boju kada se koristi tabelarni stil</string>
     <string name="title_advanced_cards_shadow">Koristi sjenku za nepročitane poruke u kartičnom stilu</string>
     <string name="title_advanced_date_header">Grupiši po datumu</string>
+    <string name="title_advanced_date_fixed">Prikaži na vrhu fiksno zaglavlje s datumom</string>
     <string name="title_advanced_date_bold">Prikaži datum podebljan</string>
     <string name="title_advanced_threading">Nizanje konverzacija</string>
     <string name="title_advanced_threading_unread">Prikaži broj nepročitanih poruka u konverzacijama</string>
     <string name="title_advanced_indentation">Lijevo/desno poravnanje primljenih/poslanih poruka u konverzacijama</string>
     <string name="title_advanced_highlight_unread">Markiraj nepročitane poruke</string>
-    <string name="title_advanced_highlight_subject">Markiraj predmet</string>
     <string name="title_advanced_color_stripe">Prikaži obojene pruge</string>
     <string name="title_advanced_avatars">Prikaži fotografije kontakata</string>
     <string name="title_advanced_gravatars">Prikaži gravatare</string>
@@ -335,10 +335,10 @@
     <string name="title_advanced_distinguish_contacts">Podvuci pošiljaoca kada je on/a poznat/a kao lokalni \'za\' kontakt</string>
     <string name="title_advanced_show_recipients">Prikaži primaoce u zaglavlju poruke</string>
     <string name="title_advanced_font_size_sender">Veličina teksta pošiljaoca</string>
-    <string name="title_advanced_font_size_subject">Veličina teksta predmeta</string>
     <string name="title_advanced_subject_top">Prikaži predmet iznad pošiljaoca</string>
     <string name="title_advanced_subject_italic">Prikaži predmet kosim slovima (kurzivom)</string>
-    <string name="title_advanced_subject_elipsed">Kada je potrebno, skrati naziv predmeta</string>
+    <string name="title_advanced_highlight_subject">Markiraj predmet</string>
+    <string name="title_advanced_font_size_subject">Veličina teksta predmeta</string>
     <string name="title_advanced_highlight_color">Boja za markiranje</string>
     <string name="title_advanced_keywords">Prikaži ključne riječi u zaglavlju poruke</string>
     <string name="title_advanced_labels">Prikaži Gmail oznake u zaglavlju poruke</string>
@@ -558,7 +558,14 @@
     <string name="title_advanced_badge_hint">Dostupno samo na podržanim launcher-ima</string>
     <string name="title_advanced_notify_action_hint">Najviše će biti prikazane tri radnje</string>
     <string name="title_advanced_notify_remove_hint">Obavještenja o novim porukama će se uvijek skloniti kada se prevuku preko ekrana ili označavanjem poruka kao \'pročitane\'</string>
+    <string name="title_advanced_notify_manage_hint">Dodirnite naziv kanala za postavljanje svojstava kanala</string>
+    <string name="title_advanced_notify_manage_default_hint">Za postavljanje zadanog zvuka, itd.</string>
+    <string name="title_advanced_notify_manage_service_hint">Za isključivanje obavještenja o \'nadzoru\'</string>
     <string name="title_advanced_notify_separate_hint">Kako da podesim obavještenja za račune, foldere i pošiljaoce?</string>
+    <string name="title_advanced_notify_preview_all_hint">Za nosive uređaje koji prikazuju cijeli tekst (do 5000 znakova)</string>
+    <string name="title_advanced_notify_preview_only_hint">Ovo odgađa prikaz obavještenja sve dok se poruka ne preuzme</string>
+    <string name="title_advanced_wearable_hint">Obavještenja se šalju samo na nosive uređaje nakon preuzimanja poruke</string>
+    <string name="title_advanced_messaging_hint">Ovo je neophodno za podršku Android auta</string>
     <string name="title_advanced_move_hint">Ciljni folder može se podesiti u postavkama računa</string>
     <string name="title_advanced_notify_no_grouping">Ova verzija Androida ne podržava grupisanje obavještenja</string>
     <string name="title_advanced_notify_no_channels">Ova verzija Androida ne podržava kanale obavještenja</string>
@@ -622,6 +629,17 @@
     <string name="title_ehlo">Prilagođena HELO/EHLO identifikacija</string>
     <string name="title_primary">Primarni</string>
     <string name="title_self_identity">Ukloni e-mail adresu tokom odgovora</string>
+    <string name="title_leave_on_server">Zadrži poruke na serveru</string>
+    <string name="title_leave_deleted">Zadrži izbrisane poruke na serveru</string>
+    <string name="title_leave_on_device">Zadrži poruke na uređaju</string>
+    <string name="title_max_messages">Maksimalan broj poruka za preuzimanje (prazno za sve)</string>
+    <string name="title_keep_poll_interval">Interval odaziva (minute)</string>
+    <string name="title_keep_alive_interval">Interval provjere konekcije (minute)</string>
+    <string name="title_server_time">Koristi vrijeme prijema (serversko)</string>
+    <string name="title_received_header">Koristi zaglavlje za \'primljeno\'</string>
+    <string name="title_date_header">Koristi zaglavlje za \'datum\' (vrijeme slanja)</string>
+    <string name="title_date_remark">Promjene će biti primijenjene samo na nove poruke</string>
+    <string name="title_related_identity">Dodaj povezani identitet (SMTP server)</string>
     <string name="title_check">Provjeri</string>
     <string name="title_trust">Odobri certifikat servera pomoću otiska prsta %1$s</string>
     <string name="title_no_name">Nedostaje ime</string>
@@ -636,7 +654,9 @@
     <string name="title_no_inbox">Inbox nije pronađen</string>
     <string name="title_no_drafts">Nema foldera za nacrte</string>
     <string name="title_no_junk_folder">Nema izabranog spam foldera za ovaj račun</string>
+    <string name="title_default_composable">Zadana e-mail adresa je određena na osnovu primarnog identiteta primarnog računa</string>
     <string name="title_no_composable">Slanje e-pošte zahtijeva da se postavi identitet, te izabere folder za nacrte u postavkama računa</string>
+    <string name="title_no_standard">Ovaj provajder koristi vlastiti e-mail protokol i stoga nije moguće koristiti e-mail klijente trećih strana</string>
     <string name="title_no_idle">Ovaj provajder (poslužitelj) ne podržava trenutna obavještenja. To će odložiti prijem novih poruka i povećati potrošnju baterije.</string>
     <string name="title_reply_domain">Razlikuju se domena pošiljaoca (%1$s) i odgovora (%2$s)</string>
     <string name="title_drafts_required">Folder \'nacrti\' je neophodan za slanje e-pošte</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 3b82e772d0..7904900d11 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -258,7 +258,6 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_advanced_threading_unread">Mostra el nombre de missatges sense llegir a les converses</string>
     <string name="title_advanced_indentation">Sagnat dret/esquerra als missatges enviats/rebuts en les converses</string>
     <string name="title_advanced_highlight_unread">Ressalteu els missatges sense llegir</string>
-    <string name="title_advanced_highlight_subject">Destacar el Tema</string>
     <string name="title_advanced_color_stripe">Mostra la franja de color</string>
     <string name="title_advanced_avatars">Mostra les fotos dels contactes</string>
     <string name="title_advanced_gravatars">Mostra Gravatars</string>
@@ -273,10 +272,10 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_advanced_distinguish_contacts">Subratlla l’emissor quan el remitent es coneix com a contacte “a” local</string>
     <string name="title_advanced_show_recipients">Mostra els destinataris a l’encapçalament del missatge</string>
     <string name="title_advanced_font_size_sender">Mida del text del remitent</string>
-    <string name="title_advanced_font_size_subject">Mida del text del assumpte</string>
     <string name="title_advanced_subject_top">Mostra l\'assumpte a sobre del remitent</string>
     <string name="title_advanced_subject_italic">Mostra els assumptes en cursiva</string>
-    <string name="title_advanced_subject_elipsed">Si cal, escurça l\'assumpte</string>
+    <string name="title_advanced_highlight_subject">Destacar el Tema</string>
+    <string name="title_advanced_font_size_subject">Mida del text del assumpte</string>
     <string name="title_advanced_keywords">Mostra les paraules clau a l’encapçalament de missatges</string>
     <string name="title_advanced_labels">Mostra les etiquetes de Gmail a l\'encapçalament del missatge</string>
     <string name="title_advanced_flags">Mostra estels</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 8f81ab6de3..33944475bc 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -370,7 +370,6 @@
     <string name="title_advanced_threading_unread">Zobrazit počet nepřečtených zpráv v konverzacích</string>
     <string name="title_advanced_indentation">Levé/pravé odsazení přijatých/odeslaných zpráv v konverzacích</string>
     <string name="title_advanced_highlight_unread">Zvýraznit nepřečtené zprávy</string>
-    <string name="title_advanced_highlight_subject">Zvýraznit předmět</string>
     <string name="title_advanced_color_stripe">Zobrazit barevný pruh</string>
     <string name="title_advanced_avatars">Zobrazit fotografie kontaktů</string>
     <string name="title_advanced_gravatars">Zobrazit Gravatary</string>
@@ -389,10 +388,10 @@
     <string name="title_advanced_distinguish_contacts">Podtrhnout odesílatele, je-li známý jako lokální „komu“ kontakt</string>
     <string name="title_advanced_show_recipients">Zobrazit příjemce v hlavičce zprávy</string>
     <string name="title_advanced_font_size_sender">Velikost textu odesílatele</string>
-    <string name="title_advanced_font_size_subject">Velikost textu předmětu</string>
     <string name="title_advanced_subject_top">Zobrazit předmět nad odesílatelem</string>
     <string name="title_advanced_subject_italic">Zobrazit předmět kurzívou</string>
-    <string name="title_advanced_subject_elipsed">Zestručnit předmět v případě potřeby</string>
+    <string name="title_advanced_highlight_subject">Zvýraznit předmět</string>
+    <string name="title_advanced_font_size_subject">Velikost textu předmětu</string>
     <string name="title_advanced_highlight_color">Barva zvýraznění</string>
     <string name="title_advanced_keywords">Zobrazit klíčová slova v hlavičce zprávy</string>
     <string name="title_advanced_labels">Zobrazit Gmail štítky v hlavičce zprávy</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 6769f15fff..6f94764e55 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -354,7 +354,6 @@
     <string name="title_advanced_threading_unread">Vis antal ulæste beskeder i samtaler</string>
     <string name="title_advanced_indentation">Venstre-/-højreindryk modtagne/sendte beskeder i samtaler</string>
     <string name="title_advanced_highlight_unread">Fremhæv ulæste beskeder</string>
-    <string name="title_advanced_highlight_subject">Fremhæv emne</string>
     <string name="title_advanced_color_stripe">Vis farvestripe</string>
     <string name="title_advanced_avatars">Vis kontaktfotos</string>
     <string name="title_advanced_gravatars">Vis Gravatarer</string>
@@ -373,10 +372,10 @@
     <string name="title_advanced_distinguish_contacts">Understreg afsender, når denne er kendt som lokal \'Til\'-kontakt</string>
     <string name="title_advanced_show_recipients">Vis modtagere i beskedhoved</string>
     <string name="title_advanced_font_size_sender">Tekststørrelse, Afsender</string>
-    <string name="title_advanced_font_size_subject">Tekststørrelse, Emne</string>
     <string name="title_advanced_subject_top">Vis emne over afsender</string>
     <string name="title_advanced_subject_italic">Vis emnet med kursiv</string>
-    <string name="title_advanced_subject_elipsed">Når nødvendigt, afkort emnet</string>
+    <string name="title_advanced_highlight_subject">Fremhæv emne</string>
+    <string name="title_advanced_font_size_subject">Tekststørrelse, Emne</string>
     <string name="title_advanced_highlight_color">Fremhævelsesfarve</string>
     <string name="title_advanced_keywords">Vis nøgleord i beskedhovedet</string>
     <string name="title_advanced_labels">Vis Gmail-etiketter i beskedhoved</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index f9f5826475..2abd121f2e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -354,12 +354,12 @@
     <string name="title_advanced_tabular_background">Kartenfarbe als Hintergrundfarbe verwenden, wenn Tabellenstil genutzt wird</string>
     <string name="title_advanced_cards_shadow">Schatten für ungelesene Nachrichten verwenden, wenn Kartenstil verwendet wird</string>
     <string name="title_advanced_date_header">Nach Datum gruppieren</string>
+    <string name="title_advanced_date_fixed">Feste Datumskopfzeile oben anzeigen</string>
     <string name="title_advanced_date_bold">Datum fett anzeigen</string>
     <string name="title_advanced_threading">Themenbaum</string>
     <string name="title_advanced_threading_unread">Anzahl ungelesener Nachrichten in Unterhaltungen anzeigen</string>
     <string name="title_advanced_indentation">Empfangene/gesendete Nachrichten im Themenbaum links/rechts einrücken</string>
     <string name="title_advanced_highlight_unread">Ungelesene Nachrichten hervorheben</string>
-    <string name="title_advanced_highlight_subject">Betreff hervorheben</string>
     <string name="title_advanced_color_stripe">Farbstreifen anzeigen</string>
     <string name="title_advanced_avatars">Kontaktfotos anzeigen</string>
     <string name="title_advanced_gravatars">Gravatare anzeigen</string>
@@ -378,10 +378,10 @@
     <string name="title_advanced_distinguish_contacts">Den Sender unterstrichen darstellen, wenn er ein bekannter lokaler An-Kontakt ist</string>
     <string name="title_advanced_show_recipients">Empfänger im Nachrichtenkopf anzeigen</string>
     <string name="title_advanced_font_size_sender">Schriftgröße für den Absender</string>
-    <string name="title_advanced_font_size_subject">Schriftgröße für den Betreff</string>
     <string name="title_advanced_subject_top">Betreff oberhalb des Absenders anzeigen</string>
     <string name="title_advanced_subject_italic">Betreff kursiv anzeigen</string>
-    <string name="title_advanced_subject_elipsed">Wenn nötig, den Betreff kürzen</string>
+    <string name="title_advanced_highlight_subject">Betreff hervorheben</string>
+    <string name="title_advanced_font_size_subject">Schriftgröße für den Betreff</string>
     <string name="title_advanced_highlight_color">Hervorhebungsfarbe</string>
     <string name="title_advanced_keywords">Schlüsselwörter im Nachrichtenkopf anzeigen</string>
     <string name="title_advanced_labels">Gmail-Labels im Nachrichtenkopf anzeigen</string>
@@ -1189,6 +1189,7 @@
     <string name="title_previous">Vorherige</string>
     <string name="title_next">Nächste</string>
     <string name="title_edit_signature">Signatur bearbeiten</string>
+    <string name="title_edit_signature_remark">Obwohl Android nicht den gesamten HTML-Code anzeigen kann, wird er unverändert gesendet</string>
     <string name="title_edit_signature_text">Signaturtext</string>
     <string name="title_edit_signature_image">Bild einfügen</string>
     <string name="title_answer_caption">Vorlage bearbeiten</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 9d0edd76c3..f5be528897 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -358,7 +358,6 @@
     <string name="title_advanced_threading_unread">Προβολή αριθμού μη αναγνωσμένων μηνυμάτων στις συζητήσεις</string>
     <string name="title_advanced_indentation">Αριστερή/δεξιά εσοχή ειλημμένων/απεσταλμένων μηνυμάτων στις συζητήσεις</string>
     <string name="title_advanced_highlight_unread">Να επισημαίνονται τα μη αναγνωσμένα μηνύματα</string>
-    <string name="title_advanced_highlight_subject">Να επισημαίνεται το θέμα</string>
     <string name="title_advanced_color_stripe">Προβολή χρωματιστής λωρίδας</string>
     <string name="title_advanced_avatars">Προβολή φωτογραφιών επαφών</string>
     <string name="title_advanced_gravatars">Προβολή Gravatar</string>
@@ -377,10 +376,10 @@
     <string name="title_advanced_distinguish_contacts">Να υπογραμμίζεται ο αποστολέας όταν ο αποστολέας είναι γνωστός ως τοπική επαφή</string>
     <string name="title_advanced_show_recipients">Να προβάλλονται οι παραλήπτες στην κεφαλίδα του μηνύματος</string>
     <string name="title_advanced_font_size_sender">Μέγεθος γραμματοσειράς για το πεδίο \"Αποστολέας\"</string>
-    <string name="title_advanced_font_size_subject">Μέγεθος γραμματοσειράς για το πεδίο \"Θέμα\"</string>
     <string name="title_advanced_subject_top">Να προβάλλεται το θέμα πάνω από τον αποστολέα</string>
     <string name="title_advanced_subject_italic">Να προβάλλεται το θέμα σε πλάγια γραφή</string>
-    <string name="title_advanced_subject_elipsed">Να συντομεύεται το θέμα, εφόσον χρειάζεται</string>
+    <string name="title_advanced_highlight_subject">Να επισημαίνεται το θέμα</string>
+    <string name="title_advanced_font_size_subject">Μέγεθος γραμματοσειράς για το πεδίο \"Θέμα\"</string>
     <string name="title_advanced_highlight_color">Χρώμα επισήμανσης</string>
     <string name="title_advanced_keywords">Να προβάλλονται οι λέξεις-κλειδιά στην κεφαλίδα του μηνύματος</string>
     <string name="title_advanced_labels">Να προβάλλονται οι ετικέτες Gmail στην κεφαλίδα του μηνύματος</string>
@@ -1186,6 +1185,7 @@
     <string name="title_previous">Προηγούμενο</string>
     <string name="title_next">Επόμενο</string>
     <string name="title_edit_signature">Επεξεργασία υπογραφής</string>
+    <string name="title_edit_signature_remark">Παρόλο που το Android δεν μπορεί να προβάλει όλον τον κώδικα HTML, θα αποσταλεί έτσι όπως είναι</string>
     <string name="title_edit_signature_text">Κείμενο υπογραφής</string>
     <string name="title_edit_signature_image">Εισαγωγή εικόνας</string>
     <string name="title_answer_caption">Επεξεργασία προτύπου</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b79aa3a0a3..4d0517f942 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -358,7 +358,6 @@
     <string name="title_advanced_threading_unread">Mostrar número de mensajes no leídos en conversaciones</string>
     <string name="title_advanced_indentation">Sangría izquierda/derecha para mensajes recibidos/enviados en conversaciones</string>
     <string name="title_advanced_highlight_unread">Resaltar mensajes no leídos</string>
-    <string name="title_advanced_highlight_subject">Resaltar asunto</string>
     <string name="title_advanced_color_stripe">Mostrar raya de color</string>
     <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
     <string name="title_advanced_gravatars">Mostrar Gravatares</string>
@@ -377,10 +376,13 @@
     <string name="title_advanced_distinguish_contacts">Subrayar el remitente cuando el remitente es conocido como contacto \'a:\' local</string>
     <string name="title_advanced_show_recipients">Mostrar destinatarios en el encabezado del mensaje</string>
     <string name="title_advanced_font_size_sender">Tamaño de fuente de remitente</string>
-    <string name="title_advanced_font_size_subject">Tamaño de fuente del asunto</string>
+    <string name="title_advanced_sender_ellipsize">Si es necesario, acortar el remitente</string>
     <string name="title_advanced_subject_top">Mostrar asunto arriba del remitente</string>
     <string name="title_advanced_subject_italic">Mostrar asunto en cursiva</string>
-    <string name="title_advanced_subject_elipsed">Acortar el asunto cuando sea necesario</string>
+    <string name="title_advanced_highlight_subject">Resaltar asunto</string>
+    <string name="title_advanced_font_size_subject">Tamaño de fuente del asunto</string>
+    <string name="title_advanced_subject_ellipsize">Si es necesario, acortar el asunto</string>
+    <string name="title_advanced_compact_mode_remark">Sólo modo compacto</string>
     <string name="title_advanced_highlight_color">Color de resaltado</string>
     <string name="title_advanced_keywords">Mostrar palabras clave en encabezado del mensaje</string>
     <string name="title_advanced_labels">Mostrar etiquetas de Gmail en encabezado de mensaje</string>
@@ -1188,6 +1190,7 @@
     <string name="title_previous">Anterior</string>
     <string name="title_next">Siguiente</string>
     <string name="title_edit_signature">Editar firma</string>
+    <string name="title_edit_signature_remark">Aunque Android no puede mostrar todo el HTML, se enviará como es</string>
     <string name="title_edit_signature_text">Texto de la firma</string>
     <string name="title_edit_signature_image">Insertar imagen</string>
     <string name="title_answer_caption">Editar plantilla</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 75258f3529..5ef5f037e1 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -235,7 +235,6 @@
     <string name="title_advanced_threading_unread">Erakutsi irakurri gabeko mezu kopurua elkarrizketetan</string>
     <string name="title_advanced_indentation">Ezker/eskuin marjina elkarrizketetan jaso/bidalitako mezuetan</string>
     <string name="title_advanced_highlight_unread">Nabarmendu irakurri gabeko mezuak</string>
-    <string name="title_advanced_highlight_subject">Nabarmendu gaia</string>
     <string name="title_advanced_color_stripe">Erakutsi kolorezko marra</string>
     <string name="title_advanced_avatars">Erakutsi kontaktuen argazkiak</string>
     <string name="title_advanced_gravatars">Erakutsi gravatarrak</string>
@@ -248,7 +247,7 @@
     <string name="title_advanced_show_recipients">Erakutsi hartzaileak mezuaren goiburuan</string>
     <string name="title_advanced_subject_top">Erakutsi mintzagaia igorlearen gainean</string>
     <string name="title_advanced_subject_italic">Erakutsi mintzagaia letra etzanean</string>
-    <string name="title_advanced_subject_elipsed">Behar denean laburtu mintzagaia</string>
+    <string name="title_advanced_highlight_subject">Nabarmendu gaia</string>
     <string name="title_advanced_keywords">Erakutsi gako-hitzak mezuaren goiburuan</string>
     <string name="title_advanced_flags">Erakutsi izarrak</string>
     <string name="title_advanced_flags_background">Koloredun izarren ordez, koloredun atzealdea erakutsi</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 38f8916270..a951421dd4 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -231,7 +231,6 @@
     <string name="title_advanced_threading">دسته بندی مکالمه</string>
     <string name="title_advanced_threading_unread">شمار پیام‌های خوانده نشده را در گفتگوها نمایش بده</string>
     <string name="title_advanced_highlight_unread">برجسته‌سازی پیام‌های خوانده نشده</string>
-    <string name="title_advanced_highlight_subject">برجسته‌سازی موضوع</string>
     <string name="title_advanced_color_stripe">نمایش نوار رنگ</string>
     <string name="title_advanced_avatars">نمایش تصویر مخاطبین</string>
     <string name="title_advanced_gravatars">نمایش Gravatar ها</string>
@@ -243,10 +242,10 @@
     <string name="title_advanced_replace_name">نام مخاطب را بر نام فرستنده ترجیح بده</string>
     <string name="title_advanced_show_recipients">گیرندگان را در سرتیتر نمایش بده</string>
     <string name="title_advanced_font_size_sender">اندازه متن فرستنده</string>
-    <string name="title_advanced_font_size_subject">اندازه متن موضوع</string>
     <string name="title_advanced_subject_top">نمایش موضوع در بالای فرستنده</string>
     <string name="title_advanced_subject_italic">نمایش موضوع به‌صورت italic</string>
-    <string name="title_advanced_subject_elipsed">هنگامی که نیاز باشد، موضوع را کوچک‌تر کن</string>
+    <string name="title_advanced_highlight_subject">برجسته‌سازی موضوع</string>
+    <string name="title_advanced_font_size_subject">اندازه متن موضوع</string>
     <string name="title_advanced_keywords">کلیدواژه‌ها را در سرتیتر پیام نمایش بده</string>
     <string name="title_advanced_flags">نمایش ستاره‌ها</string>
     <string name="title_advanced_flags_background">به‌جای ستاره‌های رنگی، پس‌زمینه رنگی را نمایش بده</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 52abba9190..ed5263904c 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -353,7 +353,6 @@
     <string name="title_advanced_threading_unread">Näytä lukemattomien viestien lukumäärä keskusteluissa</string>
     <string name="title_advanced_indentation">Tasaa vastaanotetut/lähetetyt viestit keskusteluissa vasemmalle/oikealle</string>
     <string name="title_advanced_highlight_unread">Korosta lukemattomat viestit</string>
-    <string name="title_advanced_highlight_subject">Korosta aihe</string>
     <string name="title_advanced_color_stripe">Näytä väriliuska</string>
     <string name="title_advanced_avatars">Näytä yhteystietojen kuvat</string>
     <string name="title_advanced_gravatars">Näytä Gravatarit</string>
@@ -372,10 +371,10 @@
     <string name="title_advanced_distinguish_contacts">Alleviivaa lähettäjä, kun tämä on paikallisesti tunnettu vastaanottaja</string>
     <string name="title_advanced_show_recipients">Näytä vastaanottajat viestin tunnistetiedoissa</string>
     <string name="title_advanced_font_size_sender">Lähettäjä-tekstin koko</string>
-    <string name="title_advanced_font_size_subject">Aihe-tekstin koko</string>
     <string name="title_advanced_subject_top">Näytä aihe lähettäjän yläpuolella</string>
     <string name="title_advanced_subject_italic">Näytä aihe kursiivilla</string>
-    <string name="title_advanced_subject_elipsed">Lyhennä tarvittaessa viestin aihetta</string>
+    <string name="title_advanced_highlight_subject">Korosta aihe</string>
+    <string name="title_advanced_font_size_subject">Aihe-tekstin koko</string>
     <string name="title_advanced_highlight_color">Korostusväri</string>
     <string name="title_advanced_keywords">Näytä avainsanat viestin tunnistetiedoissa</string>
     <string name="title_advanced_labels">Näytä Gmail-tunnisteet viestin tunnistetiedoissa</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 18011fa923..2cdaa3f1ca 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -358,7 +358,6 @@
     <string name="title_advanced_threading_unread">Afficher le nombre de messages non lus dans les conversations</string>
     <string name="title_advanced_indentation">Retrait gauche/droite des messages reçus/envoyés dans les conversations</string>
     <string name="title_advanced_highlight_unread">Afficher les messages non lus en surbrillance</string>
-    <string name="title_advanced_highlight_subject">Afficher l’objet en surbrillance</string>
     <string name="title_advanced_color_stripe">Afficher la bande de couleur</string>
     <string name="title_advanced_avatars">Afficher la photo des contacts</string>
     <string name="title_advanced_gravatars">Afficher les Gravatars</string>
@@ -377,10 +376,13 @@
     <string name="title_advanced_distinguish_contacts">Souligner l’expéditeur quand il est connu comme contact local</string>
     <string name="title_advanced_show_recipients">Afficher les destinataires dans l’en-tête du message</string>
     <string name="title_advanced_font_size_sender">Taille de police du champ « Expéditeur »</string>
-    <string name="title_advanced_font_size_subject">Taille de police du champ « Objet »</string>
+    <string name="title_advanced_sender_ellipsize">Raccourcir l\'expéditeur si nécessaire</string>
     <string name="title_advanced_subject_top">Afficher l’objet au dessus de l’expéditeur</string>
     <string name="title_advanced_subject_italic">Afficher l’objet en italique</string>
-    <string name="title_advanced_subject_elipsed">Raccourcir l’objet si nécessaire</string>
+    <string name="title_advanced_highlight_subject">Afficher l’objet en surbrillance</string>
+    <string name="title_advanced_font_size_subject">Taille de police du champ « Objet »</string>
+    <string name="title_advanced_subject_ellipsize">Raccourcir l\'objet si nécessaire</string>
+    <string name="title_advanced_compact_mode_remark">Mode compact uniquement</string>
     <string name="title_advanced_highlight_color">Couleur de surbrillance</string>
     <string name="title_advanced_keywords">Afficher les mots-clés dans l’en-tête du message</string>
     <string name="title_advanced_labels">Afficher les libellés Gmail dans l\'en-tête du message</string>
@@ -1188,6 +1190,7 @@
     <string name="title_previous">Précédent</string>
     <string name="title_next">Suivant</string>
     <string name="title_edit_signature">Modifier la signature</string>
+    <string name="title_edit_signature_remark">Bien qu\'Android ne puisse pas afficher tout le code HTML, il sera envoyé tel quel</string>
     <string name="title_edit_signature_text">Texte de la signature</string>
     <string name="title_edit_signature_image">Insérer une image</string>
     <string name="title_answer_caption">Modifier le modèle</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index c9d300d9a8..0d0d175ce4 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -358,7 +358,6 @@
     <string name="title_advanced_threading_unread">Afficher le nombre de messages non lus dans les conversations</string>
     <string name="title_advanced_indentation">Mettre en retrait vers la gauche/droite les messages reçus/envoyés dans les conversations</string>
     <string name="title_advanced_highlight_unread">Afficher les messages non lus en surbrillance</string>
-    <string name="title_advanced_highlight_subject">Afficher l’objet en surbrillance</string>
     <string name="title_advanced_color_stripe">Afficher la bande de couleur</string>
     <string name="title_advanced_avatars">Afficher la photo des contacts</string>
     <string name="title_advanced_gravatars">Afficher les Gravatars</string>
@@ -377,10 +376,13 @@
     <string name="title_advanced_distinguish_contacts">Souligner l\'expéditeur lorsqu\'il est connu comme contact local</string>
     <string name="title_advanced_show_recipients">Afficher les destinataires dans l\'en-tête du message</string>
     <string name="title_advanced_font_size_sender">Taille de police du champ « Expéditeur »</string>
-    <string name="title_advanced_font_size_subject">Taille de police du champ « Objet »</string>
+    <string name="title_advanced_sender_ellipsize">Raccourcir l\'expéditeur si nécessaire</string>
     <string name="title_advanced_subject_top">Afficher l’objet au-dessus de l’expéditeur</string>
     <string name="title_advanced_subject_italic">Afficher l’objet en italique</string>
-    <string name="title_advanced_subject_elipsed">Raccourcir l\'objet si nécessaire</string>
+    <string name="title_advanced_highlight_subject">Afficher l’objet en surbrillance</string>
+    <string name="title_advanced_font_size_subject">Taille de police du champ « Objet »</string>
+    <string name="title_advanced_subject_ellipsize">Raccourcir l\'objet si nécessaire</string>
+    <string name="title_advanced_compact_mode_remark">Mode compact uniquement</string>
     <string name="title_advanced_highlight_color">Couleur de surbrillance</string>
     <string name="title_advanced_keywords">Afficher les mots-clés dans l\'en-tête du message</string>
     <string name="title_advanced_labels">Afficher les libellés Gmail dans l\'en-tête du message</string>
@@ -1188,6 +1190,7 @@
     <string name="title_previous">Précédent</string>
     <string name="title_next">Suivant</string>
     <string name="title_edit_signature">Modifier la signature</string>
+    <string name="title_edit_signature_remark">Bien qu\'Android ne puisse pas afficher tout le code HTML, il sera envoyé tel quel</string>
     <string name="title_edit_signature_text">Texte de la signature</string>
     <string name="title_edit_signature_image">Insérer une image</string>
     <string name="title_answer_caption">Modifier le modèle</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 225c5a6a4b..3b453b15ec 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -310,7 +310,6 @@
     <string name="title_advanced_threading_unread">Toan net-lêzen berjochten yn petearen</string>
     <string name="title_advanced_indentation">Yndruk links / rjochts ûntfangen / ferstjoerde berjochten yn petearen</string>
     <string name="title_advanced_highlight_unread">Unlês berjochten markearje</string>
-    <string name="title_advanced_highlight_subject">Underwerp markearje</string>
     <string name="title_advanced_color_stripe">Sjoch lit streep</string>
     <string name="title_advanced_avatars">Sjoch kontaktfoto\'s</string>
     <string name="title_advanced_gravatars">Sjoch gravatars</string>
@@ -327,10 +326,10 @@
     <string name="title_advanced_distinguish_contacts">Understreke de stjoerder as de stjoerder bekend is as lokaal \'nei\' kontakt</string>
     <string name="title_advanced_show_recipients">Untfangers sjen litte yn berjochtkop</string>
     <string name="title_advanced_font_size_sender">Tekstgrutte stjoerder</string>
-    <string name="title_advanced_font_size_subject">Tekstgrutte ûnderwerp</string>
     <string name="title_advanced_subject_top">Underwerp boppe stjoerder sjen litte</string>
     <string name="title_advanced_subject_italic">Underwerp kursyf sjen litte</string>
-    <string name="title_advanced_subject_elipsed">As it nedich is, koarter it ûnderwerp yn</string>
+    <string name="title_advanced_highlight_subject">Underwerp markearje</string>
+    <string name="title_advanced_font_size_subject">Tekstgrutte ûnderwerp</string>
     <string name="title_advanced_highlight_color">Kleur markearje</string>
     <string name="title_advanced_keywords">Toan kaaiwurden yn berjochtkop</string>
     <string name="title_advanced_labels">Toan Gmail labels yn berjochtkop</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index a791616553..1fd8170867 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -327,7 +327,6 @@
     <string name="title_advanced_threading_unread">Mostrar o número de mensaxes sen ler nas conversas</string>
     <string name="title_advanced_indentation">Sangrar á esquerda/dereita as mensaxes enviadas/recibidas nas conversas</string>
     <string name="title_advanced_highlight_unread">Resaltar as mensaxes non lidas</string>
-    <string name="title_advanced_highlight_subject">Resaltar o asunto</string>
     <string name="title_advanced_color_stripe">Mostrar a banda de cor</string>
     <string name="title_advanced_avatars">Mostrar as fotos dos contactos</string>
     <string name="title_advanced_gravatars">Mostrar Gravatars</string>
@@ -346,10 +345,10 @@
     <string name="title_advanced_distinguish_contacts">Suliñar o remitente cando este é recoñecido como un destinatario local</string>
     <string name="title_advanced_show_recipients">Mostrar os destinatarios nas cabeceiras das mensaxes</string>
     <string name="title_advanced_font_size_sender">Tamaño do texto do remitente</string>
-    <string name="title_advanced_font_size_subject">Tamaño do texto do asunto</string>
     <string name="title_advanced_subject_top">Mostrar o asunto sobre o remitente</string>
     <string name="title_advanced_subject_italic">Mostrar o asunto en cursiva</string>
-    <string name="title_advanced_subject_elipsed">Abreviar o asunto se é preciso</string>
+    <string name="title_advanced_highlight_subject">Resaltar o asunto</string>
+    <string name="title_advanced_font_size_subject">Tamaño do texto do asunto</string>
     <string name="title_advanced_highlight_color">Cor de realce</string>
     <string name="title_advanced_keywords">Mostrar as palabras chave nas cabeceiras das mensaxes</string>
     <string name="title_advanced_labels">Mostrar as etiquetas de Gmail nas cabeceiras das mensaxes</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 242c99b1aa..9fe5b7920c 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -251,7 +251,6 @@
     <string name="title_advanced_distinguish_contacts">Podvucite pošiljatelja kada je pošiljalac poznat kao lokalni \"za\" kontakt</string>
     <string name="title_advanced_subject_top">Pokaži predmet iznad pošiljatelja</string>
     <string name="title_advanced_subject_italic">Prikaži predmet kurzivno</string>
-    <string name="title_advanced_subject_elipsed">Ako potrebno skratiti naslov</string>
     <string name="title_advanced_keywords">Prikaži ključne riječi u zaglavlju poruke</string>
     <string name="title_advanced_flags">Prikaži zvijezde</string>
     <string name="title_advanced_flags_background">Pokaži obojenu pozadinu umjesto obojenih zvijezda</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index e3a0906ace..1481d51a35 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -300,7 +300,6 @@
     <string name="title_advanced_threading_unread">Olvasatlan üzenetek számának mutatása beszélgetésekben</string>
     <string name="title_advanced_indentation">Beérkezett/elküldött üzenetek balra/jobbra tördelése a beszélgetésekben</string>
     <string name="title_advanced_highlight_unread">Olvasatlan üzenetek kiemelése</string>
-    <string name="title_advanced_highlight_subject">Tárgy kiemelése</string>
     <string name="title_advanced_color_stripe">Színszalag megjelenítése</string>
     <string name="title_advanced_avatars">Névjegyzék fényképeinek megjelenítése</string>
     <string name="title_advanced_gravatars">Gravatar képek megjelenítése</string>
@@ -317,10 +316,10 @@
     <string name="title_advanced_distinguish_contacts">Húzza alá a küldőt, ha az egy ismert, korábban megcímzett helyi névjegy</string>
     <string name="title_advanced_show_recipients">Címzettek mutatása az üzenet fejlécében</string>
     <string name="title_advanced_font_size_sender">Feladó nevének betűmérete</string>
-    <string name="title_advanced_font_size_subject">Tárgy betűmérete</string>
     <string name="title_advanced_subject_top">Tárgy megjelenítése a küldő fölött</string>
     <string name="title_advanced_subject_italic">Tárgy megjelnítése dőlt betűvel</string>
-    <string name="title_advanced_subject_elipsed">Tárgy rövidítése szükség esetén</string>
+    <string name="title_advanced_highlight_subject">Tárgy kiemelése</string>
+    <string name="title_advanced_font_size_subject">Tárgy betűmérete</string>
     <string name="title_advanced_highlight_color">Kiemelő szín</string>
     <string name="title_advanced_keywords">Kulcsszavak megjelenítése az üzenetek fejlécében</string>
     <string name="title_advanced_labels">Gmail címkék mutatása az üzenet fejlécében</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index efef23341b..58683b692c 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -295,7 +295,6 @@
     <string name="title_advanced_threading_unread">Tampilkan jumlah pesan yang belum dibaca dalam obrolan</string>
     <string name="title_advanced_indentation">Indentasi kiri/kanan menerima/mengirim pesan dalam sebuah obrolan</string>
     <string name="title_advanced_highlight_unread">Sorot pesan yang belum dibaca</string>
-    <string name="title_advanced_highlight_subject">Sorot subjek</string>
     <string name="title_advanced_color_stripe">Tampilkan garis warna</string>
     <string name="title_advanced_avatars">Tampilkan kontak foto</string>
     <string name="title_advanced_gravatars">Tampilkan Gravatar</string>
@@ -312,10 +311,10 @@
     <string name="title_advanced_distinguish_contacts">Garis bawahi pengirim ketika pengirim dikenal sebagai kontak lokal</string>
     <string name="title_advanced_show_recipients">Tampilkan penerima di header pesan</string>
     <string name="title_advanced_font_size_sender">Ukuran teks pengirim</string>
-    <string name="title_advanced_font_size_subject">Ukuran teks subjek</string>
     <string name="title_advanced_subject_top">Tampilkan subjek di atas pengirim</string>
     <string name="title_advanced_subject_italic">Tampilkan subjek dengan huruf miring</string>
-    <string name="title_advanced_subject_elipsed">Ketika dibutuhkan, mempersingkat subjek</string>
+    <string name="title_advanced_highlight_subject">Sorot subjek</string>
+    <string name="title_advanced_font_size_subject">Ukuran teks subjek</string>
     <string name="title_advanced_highlight_color">Sorot warna</string>
     <string name="title_advanced_keywords">Tampilkan kata kunci di header pesan</string>
     <string name="title_advanced_labels">Tampilkan label Gmail di header pesan</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 6d09b1d4eb..9bcf07e3be 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -357,7 +357,6 @@
     <string name="title_advanced_threading_unread">Mostra il numero di messaggi non letti nelle conversazioni</string>
     <string name="title_advanced_indentation">Messaggi ricevuti/inviati con rientro a sinistra/destra nelle conversazioni</string>
     <string name="title_advanced_highlight_unread">Evidenzia i messaggi non letti</string>
-    <string name="title_advanced_highlight_subject">Evidenzia oggetto</string>
     <string name="title_advanced_color_stripe">Mostra striscia di colore</string>
     <string name="title_advanced_avatars">Mostra le foto di contatto</string>
     <string name="title_advanced_gravatars">Mostra Gravatar</string>
@@ -376,10 +375,10 @@
     <string name="title_advanced_distinguish_contacts">Sottolinea il mittente quando è noto come il contatto locale \'a\'</string>
     <string name="title_advanced_show_recipients">Mostra i destinatari nell\'intestazione del messaggio</string>
     <string name="title_advanced_font_size_sender">Dimensione testo del mittente</string>
-    <string name="title_advanced_font_size_subject">Dimensione testo dell\'oggetto</string>
     <string name="title_advanced_subject_top">Mostra oggetto sul mittente</string>
     <string name="title_advanced_subject_italic">Mostra oggetto in corsivo</string>
-    <string name="title_advanced_subject_elipsed">Quando necessario, abbrevia l\'oggetto</string>
+    <string name="title_advanced_highlight_subject">Evidenzia oggetto</string>
+    <string name="title_advanced_font_size_subject">Dimensione testo dell\'oggetto</string>
     <string name="title_advanced_highlight_color">Colore d\'evidenziazione</string>
     <string name="title_advanced_keywords">Mostra parole chiave nell\'intestazione del messaggio</string>
     <string name="title_advanced_labels">Mostra le etichette Gmail nell\'intestazione del messaggio</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 19219f2dba..cc3fd7a846 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -346,7 +346,6 @@
     <string name="title_advanced_threading_unread">会話の中の未読メッセージの数を表示する</string>
     <string name="title_advanced_indentation">会話の受信/送信メッセージの左/右インデント</string>
     <string name="title_advanced_highlight_unread">未読メッセージを強調表示</string>
-    <string name="title_advanced_highlight_subject">件名を強調する</string>
     <string name="title_advanced_color_stripe">カラーストライプを表示</string>
     <string name="title_advanced_avatars">連絡先の写真を表示</string>
     <string name="title_advanced_gravatars">Gravatar(アバター)を表示</string>
@@ -365,10 +364,10 @@
     <string name="title_advanced_distinguish_contacts">送信者がローカル(宛先)連絡先として知られている場合、送信者に下線を引く</string>
     <string name="title_advanced_show_recipients">メッセージヘッダーにキーワードを表示</string>
     <string name="title_advanced_font_size_sender">送信者のテキストサイズ</string>
-    <string name="title_advanced_font_size_subject">件名のテキストサイズ</string>
     <string name="title_advanced_subject_top">送信者の上に件名を表示</string>
     <string name="title_advanced_subject_italic">件名を斜体で表示</string>
-    <string name="title_advanced_subject_elipsed">必要に応じて件名を短くする</string>
+    <string name="title_advanced_highlight_subject">件名を強調する</string>
+    <string name="title_advanced_font_size_subject">件名のテキストサイズ</string>
     <string name="title_advanced_highlight_color">ハイライトカラー</string>
     <string name="title_advanced_keywords">メッセージヘッダーにキーワードを表示</string>
     <string name="title_advanced_labels">Gmailラベルをメッセージヘッダーに表示</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 22c052bb59..5e8fe93c37 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -359,7 +359,6 @@ Voeg gedeelde bestanden toe aan een nieuw concept</string>
     <string name="title_advanced_threading_unread">Toon aantal ongelezen berichten in gesprekken</string>
     <string name="title_advanced_indentation">Links/rechts inspringen van ontvangen/verzonden berichten in gesprekken</string>
     <string name="title_advanced_highlight_unread">Ongelezen berichten markeren</string>
-    <string name="title_advanced_highlight_subject">Onderwerp markeren</string>
     <string name="title_advanced_color_stripe">Toon kleurenstreep</string>
     <string name="title_advanced_avatars">Toon foto\'s contacten</string>
     <string name="title_advanced_gravatars">Gravatars weergeven</string>
@@ -378,10 +377,13 @@ Voeg gedeelde bestanden toe aan een nieuw concept</string>
     <string name="title_advanced_distinguish_contacts">Onderstreep de afzender wanneer de afzender bekend staat als lokaal \'aan\'-contact</string>
     <string name="title_advanced_show_recipients">Geadresseerden in berichtkop tonen</string>
     <string name="title_advanced_font_size_sender">Tekengrootte afzender</string>
-    <string name="title_advanced_font_size_subject">Tekengrootte onderwerp</string>
+    <string name="title_advanced_sender_ellipsize">Indien nodig, verkort de afzender</string>
     <string name="title_advanced_subject_top">Toon onderwerp boven afzender</string>
     <string name="title_advanced_subject_italic">Toon onderwerp cursief</string>
-    <string name="title_advanced_subject_elipsed">Wanneer nodig, verkort het onderwerp</string>
+    <string name="title_advanced_highlight_subject">Onderwerp markeren</string>
+    <string name="title_advanced_font_size_subject">Tekengrootte onderwerp</string>
+    <string name="title_advanced_subject_ellipsize">Indien nodig, verkort het onderwerp</string>
+    <string name="title_advanced_compact_mode_remark">Alleen compacte modus</string>
     <string name="title_advanced_highlight_color">Markeerkleur</string>
     <string name="title_advanced_keywords">Toon sleutelwoorden in de berichtkop</string>
     <string name="title_advanced_labels">Toon Gmail labels in de berichtkop</string>
@@ -1187,6 +1189,7 @@ Tik op de knop \'opnieuw zoeken\' om ook op de server te zoeken.</string>
     <string name="title_previous">Vorige</string>
     <string name="title_next">Volgende</string>
     <string name="title_edit_signature">Handtekening bewerken</string>
+    <string name="title_edit_signature_remark">Hoewel Android niet alle HTML kan weergeven, zal het worden verzonden zoals het is</string>
     <string name="title_edit_signature_text">Tekst handtekening</string>
     <string name="title_edit_signature_image">Afbeelding invoegen</string>
     <string name="title_answer_caption">Bewerk sjabloon</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 7827c2fee6..e9ee55edd2 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -264,7 +264,6 @@
     <string name="title_advanced_threading_unread">Vis antall uleste meldinger i samtaler</string>
     <string name="title_advanced_indentation">Venstre/høyre innrykk mottatt/sendt meldinger i samtaler</string>
     <string name="title_advanced_highlight_unread">Merk uleste meldinger</string>
-    <string name="title_advanced_highlight_subject">Uthev emne</string>
     <string name="title_advanced_color_stripe">Vis fargestripe</string>
     <string name="title_advanced_avatars">Vis kontakt bilde</string>
     <string name="title_advanced_gravatars">Vis Gravatars</string>
@@ -277,10 +276,10 @@
     <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
     <string name="title_advanced_show_recipients">Vis mottakere i meldingshode</string>
     <string name="title_advanced_font_size_sender">Skriftstørrelse for avsender</string>
-    <string name="title_advanced_font_size_subject">Skriftstørrelse på emne</string>
     <string name="title_advanced_subject_top">Vis emne over avsender</string>
     <string name="title_advanced_subject_italic">Vis emnet i kursivt</string>
-    <string name="title_advanced_subject_elipsed">Forkorte emnet ved behov</string>
+    <string name="title_advanced_highlight_subject">Uthev emne</string>
+    <string name="title_advanced_font_size_subject">Skriftstørrelse på emne</string>
     <string name="title_advanced_highlight_color">Uthev farge</string>
     <string name="title_advanced_keywords">Vis nøkkelord i meldingshode</string>
     <string name="title_advanced_labels">Vis Gmail-etiketter i meldingshodet</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 258f6bc0e0..472e2e7b2f 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -264,7 +264,6 @@
     <string name="title_advanced_threading_unread">Vis antall uleste meldinger i samtaler</string>
     <string name="title_advanced_indentation">Venstre/høyre innrykk mottatt/sendt meldinger i samtaler</string>
     <string name="title_advanced_highlight_unread">Merk uleste meldinger</string>
-    <string name="title_advanced_highlight_subject">Uthev emne</string>
     <string name="title_advanced_color_stripe">Vis fargestripe</string>
     <string name="title_advanced_avatars">Vis kontakt bilde</string>
     <string name="title_advanced_gravatars">Vis Gravatars</string>
@@ -277,10 +276,10 @@
     <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
     <string name="title_advanced_show_recipients">Vis mottakere i meldingshode</string>
     <string name="title_advanced_font_size_sender">Skriftstørrelse for avsender</string>
-    <string name="title_advanced_font_size_subject">Skriftstørrelse på emne</string>
     <string name="title_advanced_subject_top">Vis emne over avsender</string>
     <string name="title_advanced_subject_italic">Vis emnet i kursivt</string>
-    <string name="title_advanced_subject_elipsed">Forkorte emnet ved behov</string>
+    <string name="title_advanced_highlight_subject">Uthev emne</string>
+    <string name="title_advanced_font_size_subject">Skriftstørrelse på emne</string>
     <string name="title_advanced_highlight_color">Uthev farge</string>
     <string name="title_advanced_keywords">Vis nøkkelord i meldingshode</string>
     <string name="title_advanced_labels">Vis Gmail-etiketter i meldingshodet</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 97118512b2..cd4fc50e1a 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -371,12 +371,12 @@
     <string name="title_advanced_tabular_background">Użyj koloru karty jako koloru tła podczas korzystania ze stylu tabelarycznego</string>
     <string name="title_advanced_cards_shadow">Użyj cienia do nieprzeczytanych wiadomości, jeśli używasz stylu karty</string>
     <string name="title_advanced_date_header">Grupuj według daty</string>
+    <string name="title_advanced_date_fixed">Pokaż stały nagłówek daty na górze</string>
     <string name="title_advanced_date_bold">Pokaż datę pogrubioną</string>
     <string name="title_advanced_threading">Konwersacje w wątkach</string>
     <string name="title_advanced_threading_unread">Pokaż liczbę nieprzeczytanych wiadomości w wątkach</string>
     <string name="title_advanced_indentation">Otrzymane/wysłane wiadomości z lewej/prawej strony wątków</string>
     <string name="title_advanced_highlight_unread">Podświetl nieprzeczytane wiadomości</string>
-    <string name="title_advanced_highlight_subject">Podświetl temat</string>
     <string name="title_advanced_color_stripe">Pokaż kolorowy pasek</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_gravatars">Pokaż Gravatary</string>
@@ -395,10 +395,13 @@
     <string name="title_advanced_distinguish_contacts">Podkreśl nadawcę, gdy znany jest jako lokalny kontakt „do”</string>
     <string name="title_advanced_show_recipients">Pokaż odbiorców w nagłówku wiadomości</string>
     <string name="title_advanced_font_size_sender">Rozmiar tekstu nadawcy</string>
-    <string name="title_advanced_font_size_subject">Rozmiar tekstu tematu</string>
+    <string name="title_advanced_sender_ellipsize">W razie potrzeby skróć nadawcę</string>
     <string name="title_advanced_subject_top">Pokaż temat nad nadawcą</string>
     <string name="title_advanced_subject_italic">Temat wyświetlaj kursywą</string>
-    <string name="title_advanced_subject_elipsed">W razie potrzeby skróć temat</string>
+    <string name="title_advanced_highlight_subject">Podświetl temat</string>
+    <string name="title_advanced_font_size_subject">Rozmiar tekstu tematu</string>
+    <string name="title_advanced_subject_ellipsize">W razie potrzeby skróć temat</string>
+    <string name="title_advanced_compact_mode_remark">Tylko tryb kompaktowy</string>
     <string name="title_advanced_highlight_color">Kolor podświetlenia</string>
     <string name="title_advanced_keywords">Pokaż słowa kluczowe w nagłówku wiadomości</string>
     <string name="title_advanced_labels">Pokaż etykiety Gmail w nagłówku wiadomości</string>
@@ -1206,6 +1209,7 @@
     <string name="title_previous">Poprzedni</string>
     <string name="title_next">Następny</string>
     <string name="title_edit_signature">Edytuj podpis</string>
+    <string name="title_edit_signature_remark">Chociaż Android nie może wyświetlić całego kodu HTML, zostanie on wysłany tak, jak jest</string>
     <string name="title_edit_signature_text">Tekst podpisu</string>
     <string name="title_edit_signature_image">Wstaw obraz</string>
     <string name="title_answer_caption">Edytuj szablon</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fa5a0d91dc..60d3440528 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -352,7 +352,6 @@
     <string name="title_advanced_threading_unread">Mostrar número de mensagens não lidas nas conversas</string>
     <string name="title_advanced_indentation">Indentatação esquerda/direita para mensagens recebido/enviado em conversas</string>
     <string name="title_advanced_highlight_unread">Destacar mensagens não lidas</string>
-    <string name="title_advanced_highlight_subject">Destacar assunto</string>
     <string name="title_advanced_color_stripe">Mostrar faixa de cores</string>
     <string name="title_advanced_avatars">Mostrar fotos de contatos</string>
     <string name="title_advanced_gravatars">Mostrar Gravatares</string>
@@ -371,10 +370,10 @@
     <string name="title_advanced_distinguish_contacts">Sublinhar o remetente quando o remetente é conhecido como contato local \'para\'</string>
     <string name="title_advanced_show_recipients">Mostrar destinatários no cabeçalho da mensagem</string>
     <string name="title_advanced_font_size_sender">Tamanho do texto do remetente</string>
-    <string name="title_advanced_font_size_subject">Tamanho do texto do assunto</string>
     <string name="title_advanced_subject_top">Mostrar assunto acima do remetente</string>
     <string name="title_advanced_subject_italic">Mostrar assunto em itálico</string>
-    <string name="title_advanced_subject_elipsed">Quando necessário, encurte o assunto</string>
+    <string name="title_advanced_highlight_subject">Destacar assunto</string>
+    <string name="title_advanced_font_size_subject">Tamanho do texto do assunto</string>
     <string name="title_advanced_highlight_color">Cor de destaque</string>
     <string name="title_advanced_keywords">Mostrar palavras-chave no cabeçalho da mensagem</string>
     <string name="title_advanced_labels">Mostrar rótulos do Gmail no cabeçalho da mensagem</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index aa1e84870c..9deacea249 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -321,7 +321,6 @@
     <string name="title_advanced_threading_unread">Mostrar número de mensagens não lidas nas conversas</string>
     <string name="title_advanced_indentation">Indentação esquerda/direita para mensagens recebidas/enviadas em conversas</string>
     <string name="title_advanced_highlight_unread">Destacar mensagens não lidas</string>
-    <string name="title_advanced_highlight_subject">Destacar assunto</string>
     <string name="title_advanced_color_stripe">Mostrar faixa de cores</string>
     <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
     <string name="title_advanced_gravatars">Mostrar Gravatar</string>
@@ -338,10 +337,10 @@
     <string name="title_advanced_distinguish_contacts">Sublinhar o remetente quando o remetente é conhecido como contato local \'para\'</string>
     <string name="title_advanced_show_recipients">Mostrar destinatários no cabeçalho da mensagem</string>
     <string name="title_advanced_font_size_sender">Tamanho da fonte do remetente</string>
-    <string name="title_advanced_font_size_subject">Tamanho da fonte do assunto</string>
     <string name="title_advanced_subject_top">Mostrar assunto acima do remetente</string>
     <string name="title_advanced_subject_italic">Mostrar assunto em itálico</string>
-    <string name="title_advanced_subject_elipsed">Quando necessário, encurte o assunto</string>
+    <string name="title_advanced_highlight_subject">Destacar assunto</string>
+    <string name="title_advanced_font_size_subject">Tamanho da fonte do assunto</string>
     <string name="title_advanced_highlight_color">Cor de destaque</string>
     <string name="title_advanced_keywords">Mostrar palavras-chave no cabeçalho da mensagem</string>
     <string name="title_advanced_labels">Mostrar rótulos do Gmail no cabeçalho da mensagem</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 2424dda2a5..a2cffc6355 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -368,7 +368,6 @@
     <string name="title_advanced_threading_unread">Arată numărul de mesaje necitite în conversații</string>
     <string name="title_advanced_indentation">Aliniere mesaje primite/trimise în stânga/dreapta în conversații</string>
     <string name="title_advanced_highlight_unread">Evidențiază mesajele necitite</string>
-    <string name="title_advanced_highlight_subject">Evidențiază subiect</string>
     <string name="title_advanced_color_stripe">Arată banda de culori</string>
     <string name="title_advanced_avatars">Arată pozele contactelor</string>
     <string name="title_advanced_gravatars">Arată iconițe de pe Gravatar</string>
@@ -387,10 +386,13 @@
     <string name="title_advanced_distinguish_contacts">Subliniază expeditorul atunci când este cunoscut drept un contact `către`</string>
     <string name="title_advanced_show_recipients">Arată destinatarii în antetul mesajului</string>
     <string name="title_advanced_font_size_sender">Mărime text expeditor</string>
-    <string name="title_advanced_font_size_subject">Mărime text subiect</string>
+    <string name="title_advanced_sender_ellipsize">Dacă este necesar, scurtați expeditorul</string>
     <string name="title_advanced_subject_top">Arată subiectul desupra expeditorului</string>
     <string name="title_advanced_subject_italic">Arată subiectul cursiv</string>
-    <string name="title_advanced_subject_elipsed">La nevoie, scurtează subiectul</string>
+    <string name="title_advanced_highlight_subject">Evidențiază subiect</string>
+    <string name="title_advanced_font_size_subject">Mărime text subiect</string>
+    <string name="title_advanced_subject_ellipsize">Dacă este necesar, scurtați subiectul</string>
+    <string name="title_advanced_compact_mode_remark">Numai în modul compact</string>
     <string name="title_advanced_highlight_color">Culoare de evidențiere</string>
     <string name="title_advanced_keywords">Arată cuvinte cheie în antetul mesajului</string>
     <string name="title_advanced_labels">Arată etichetele Gmail în antetul mesajului</string>
@@ -1198,6 +1200,7 @@
     <string name="title_previous">Precedent</string>
     <string name="title_next">Următor</string>
     <string name="title_edit_signature">Editare semnătură</string>
+    <string name="title_edit_signature_remark">Deși Android nu poate afișa tot HTML-ul, acesta va fi trimis așa cum este</string>
     <string name="title_edit_signature_text">Text semnătură</string>
     <string name="title_edit_signature_image">Inserare imagine</string>
     <string name="title_answer_caption">Editare șablon</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 04bde03c76..2a9cfccc9f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -378,7 +378,6 @@
     <string name="title_advanced_threading_unread">Показывать количество непрочитанных сообщений в диалогах</string>
     <string name="title_advanced_indentation">Левый/правый отступ для полученных/отправленных сообщений в диалогах</string>
     <string name="title_advanced_highlight_unread">Выделять непрочитанные сообщения</string>
-    <string name="title_advanced_highlight_subject">Выделять тему сообщения</string>
     <string name="title_advanced_color_stripe">Показывать цветовую полосу</string>
     <string name="title_advanced_avatars">Показывать фотографии контакта</string>
     <string name="title_advanced_gravatars">Показывать Граватары</string>
@@ -397,10 +396,13 @@
     <string name="title_advanced_distinguish_contacts">Подчёркивать отправителя, если он известен как локальный контакт \"Кому\"</string>
     <string name="title_advanced_show_recipients">Показывать получателей в заголовке сообщения</string>
     <string name="title_advanced_font_size_sender">Размера текста поля \"Отправитель\"</string>
-    <string name="title_advanced_font_size_subject">Размера текста поля \"Тема\"</string>
+    <string name="title_advanced_sender_ellipsize">При необходимости сокращать имя отправителя</string>
     <string name="title_advanced_subject_top">Показывать тему выше отправителя</string>
     <string name="title_advanced_subject_italic">Показывать тему сообщения курсивом</string>
-    <string name="title_advanced_subject_elipsed">При необходимости сокращать тему сообщения</string>
+    <string name="title_advanced_highlight_subject">Выделять тему сообщения</string>
+    <string name="title_advanced_font_size_subject">Размера текста поля \"Тема\"</string>
+    <string name="title_advanced_subject_ellipsize">При необходимости сокращать тему сообщения</string>
+    <string name="title_advanced_compact_mode_remark">Только компактный режим</string>
     <string name="title_advanced_highlight_color">Цвет выделения</string>
     <string name="title_advanced_keywords">Показывать ключевые слова в заголовке сообщения</string>
     <string name="title_advanced_labels">Показывать метки Gmail в заголовке сообщения</string>
@@ -1208,6 +1210,7 @@
     <string name="title_previous">Назад</string>
     <string name="title_next">Вперёд</string>
     <string name="title_edit_signature">Изменить подпись</string>
+    <string name="title_edit_signature_remark">Хотя Android не может отобразить весь HTML, он будет отправлен как есть</string>
     <string name="title_edit_signature_text">Текст подписи</string>
     <string name="title_edit_signature_image">Вставить изображение</string>
     <string name="title_answer_caption">Изменить шаблон</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 893f9376ee..76959b63ab 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -372,12 +372,12 @@
     <string name="title_advanced_tabular_background">Použiť rovnakú farbu pozadia ako farbu karty v tabuľkovom štýle</string>
     <string name="title_advanced_cards_shadow">Zatieniť neprečítané správy v štýle kariet</string>
     <string name="title_advanced_date_header">Zoradiť podľa dátumu</string>
+    <string name="title_advanced_date_fixed">Pripnúť na vrchu hlavičku s dátumom</string>
     <string name="title_advanced_date_bold">Dátum zobraziť tučným písmom</string>
     <string name="title_advanced_threading">Vlákna konverzácií</string>
     <string name="title_advanced_threading_unread">Zobrazovať počet neprečítaných správ v konverzáciách</string>
     <string name="title_advanced_indentation">Ľavé/pravé odsadenie prijatých/odoslaných správ v konverzáciách</string>
     <string name="title_advanced_highlight_unread">Zvýrazniť neprečítané správy</string>
-    <string name="title_advanced_highlight_subject">Zvýrazniť predmet</string>
     <string name="title_advanced_color_stripe">Zobraziť farebný prúžok</string>
     <string name="title_advanced_avatars">Zobraziť fotografie kontaktov</string>
     <string name="title_advanced_gravatars">Zobraziť Gravatary</string>
@@ -396,10 +396,10 @@
     <string name="title_advanced_distinguish_contacts">Podčiarknúť odosielateľa ak je v lokálnych kontaktoch</string>
     <string name="title_advanced_show_recipients">Zobraziť príjemcov v hlavičke správy</string>
     <string name="title_advanced_font_size_sender">Veľkosť textu odosielateľ</string>
-    <string name="title_advanced_font_size_subject">Veľkosť textu predmet</string>
     <string name="title_advanced_subject_top">Zobraziť predmet nad odosielateľom</string>
     <string name="title_advanced_subject_italic">Zobraziť predmet kurzívou</string>
-    <string name="title_advanced_subject_elipsed">Skracovať predmet podľa potreby</string>
+    <string name="title_advanced_highlight_subject">Zvýrazniť predmet</string>
+    <string name="title_advanced_font_size_subject">Veľkosť textu predmet</string>
     <string name="title_advanced_highlight_color">Farba vysvietenia</string>
     <string name="title_advanced_keywords">Zobraziť kľúčové slová v hlavičke správy</string>
     <string name="title_advanced_labels">Zobraziť štítky Gmailu v hlavičke správy</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index a1bf349209..05a24238d7 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -238,7 +238,6 @@
     <string name="title_advanced_threading">Niti pogovorov</string>
     <string name="title_advanced_indentation">V pogovorih zamakni prejeta/poslana sporočila levo/desno</string>
     <string name="title_advanced_highlight_unread">Poudari neprebrana sporočila</string>
-    <string name="title_advanced_highlight_subject">Poudari zadevo</string>
     <string name="title_advanced_color_stripe">Prikaži barvno črto</string>
     <string name="title_advanced_avatars">Prikaži slike stikov</string>
     <string name="title_advanced_gravatars">Prikaži splošne podobe</string>
@@ -250,7 +249,7 @@
     <string name="title_advanced_distinguish_contacts">Podčrtaj pošiljatelja, ko je ta poznan kot krajevni stik \'Za\'</string>
     <string name="title_advanced_subject_top">Prikaži zadevo nad pošiljateljem</string>
     <string name="title_advanced_subject_italic">Prikaže zadevo v ležeči pisavi</string>
-    <string name="title_advanced_subject_elipsed">Skrajšaj zadevo, ko je to potrebno</string>
+    <string name="title_advanced_highlight_subject">Poudari zadevo</string>
     <string name="title_advanced_keywords">V glavi sporočila prikaži ključne besede</string>
     <string name="title_advanced_flags">Prikaži zvezdice</string>
     <string name="title_advanced_flags_background">Prikaži obarvano ozadje namesto obarvanih zvezdic</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 297816c924..9b9c240b7a 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -205,7 +205,6 @@
     <string name="title_advanced_name_email">Прикажи имена и е-мејл адресе</string>
     <string name="title_advanced_subject_top">Прикажи наслов изнад пошиљаоца</string>
     <string name="title_advanced_subject_italic">Прикажи наслов курзивом</string>
-    <string name="title_advanced_subject_elipsed">Ако је потребно скратити наслов, скрати га</string>
     <string name="title_advanced_flags">Прикажи звездице</string>
     <string name="title_advanced_flags_background">Прикажи обојену позадину уместо обојених звездица</string>
     <string name="title_advanced_preview">Прикажи претпреглед поруке</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index dffc4e2636..e57a2485f4 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -355,7 +355,6 @@
     <string name="title_advanced_threading_unread">Visa antal olästa meddelanden i konversationer</string>
     <string name="title_advanced_indentation">Vänster/höger indrag mottaget/skickade meddelanden i konversationer</string>
     <string name="title_advanced_highlight_unread">Markera olästa meddelanden</string>
-    <string name="title_advanced_highlight_subject">Markera ämnet</string>
     <string name="title_advanced_color_stripe">Visa färgrand</string>
     <string name="title_advanced_avatars">Visa kontaktfoton</string>
     <string name="title_advanced_gravatars">Visa Gravatars</string>
@@ -374,10 +373,13 @@
     <string name="title_advanced_distinguish_contacts">Understryk avsändaren när avsändaren är känd som lokal \"till\" kontakt</string>
     <string name="title_advanced_show_recipients">Visa mottagare i meddelandehuvudet</string>
     <string name="title_advanced_font_size_sender">Teckenstorlek på avsändare</string>
-    <string name="title_advanced_font_size_subject">Teckenstorlek på ämnesrad</string>
+    <string name="title_advanced_sender_ellipsize">Om det behövs, förkorta avsändaren</string>
     <string name="title_advanced_subject_top">Visa ämne ovanför avsändaren</string>
     <string name="title_advanced_subject_italic">Visa ämnet kursivt</string>
-    <string name="title_advanced_subject_elipsed">När det behövs, förkorta ämnet</string>
+    <string name="title_advanced_highlight_subject">Markera ämnet</string>
+    <string name="title_advanced_font_size_subject">Teckenstorlek på ämnesrad</string>
+    <string name="title_advanced_subject_ellipsize">Om det behövs, förkorta ämnet</string>
+    <string name="title_advanced_compact_mode_remark">Endast kompakt läge</string>
     <string name="title_advanced_highlight_color">Markera färg</string>
     <string name="title_advanced_keywords">Visa nyckelord i sidhuvudet för meddelandet</string>
     <string name="title_advanced_labels">Visa Gmail-etiketter i meddelandehuvud</string>
@@ -1185,6 +1187,7 @@
     <string name="title_previous">Föregående</string>
     <string name="title_next">Nästa</string>
     <string name="title_edit_signature">Redigera signatur</string>
+    <string name="title_edit_signature_remark">Även om Android inte kan visa all HTML, kommer det att skickas som det är</string>
     <string name="title_edit_signature_text">Signatur</string>
     <string name="title_edit_signature_image">Infoga bild</string>
     <string name="title_answer_caption">Redigera mall</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 01ebf0723b..e90363ed9a 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -357,7 +357,6 @@
     <string name="title_advanced_threading_unread">Sohbetlerde okunmamış mesajların sayısını göster</string>
     <string name="title_advanced_indentation">Sohbetlerde alınan/gönderilen mesajları sola/sağa girintile</string>
     <string name="title_advanced_highlight_unread">Okunmamış iletileri vurgula</string>
-    <string name="title_advanced_highlight_subject">Konuyu vurgula</string>
     <string name="title_advanced_color_stripe">Renk şeridini göster</string>
     <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
     <string name="title_advanced_gravatars">Gravatar\'ları göster</string>
@@ -376,10 +375,10 @@
     <string name="title_advanced_distinguish_contacts">Gönderen yerel \'alıcı\' kişisi olarak biliniyorsa gönderenin altını çiz</string>
     <string name="title_advanced_show_recipients">Mesaj başlığında alıcıları göster</string>
     <string name="title_advanced_font_size_sender">Gönderen yazı boyutu</string>
-    <string name="title_advanced_font_size_subject">Konu yazı boyutu</string>
     <string name="title_advanced_subject_top">Gönderenin üzerinde konuyu göster</string>
     <string name="title_advanced_subject_italic">Konuyu eğik yazı ile göster</string>
-    <string name="title_advanced_subject_elipsed">Gerektiğinde konuyu kısaltın</string>
+    <string name="title_advanced_highlight_subject">Konuyu vurgula</string>
+    <string name="title_advanced_font_size_subject">Konu yazı boyutu</string>
     <string name="title_advanced_highlight_color">Rengi vurgula</string>
     <string name="title_advanced_keywords">Mesaj başlığında anahtar kelimeleri göster</string>
     <string name="title_advanced_labels">Mesaj başlığında Gmail etiketlerini göster</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 82e7b22268..6b6fc880a4 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -377,7 +377,6 @@
     <string name="title_advanced_threading_unread">Показувати кількість непрочитаних повідомлень у розмовах</string>
     <string name="title_advanced_indentation">Відступати ліворуч чи праворуч для отриманих або надісланих повідомлень у розмовах</string>
     <string name="title_advanced_highlight_unread">Підсвічувати непрочитані повідомлення</string>
-    <string name="title_advanced_highlight_subject">Підсвічувати тему</string>
     <string name="title_advanced_color_stripe">Показати смугу кольорів</string>
     <string name="title_advanced_avatars">Показувати фото контактів</string>
     <string name="title_advanced_gravatars">Показувати Gravatars</string>
@@ -396,10 +395,10 @@
     <string name="title_advanced_distinguish_contacts">Підкреслювати відправника в полі \'to\', коли відправник відомий як місцевий контакт</string>
     <string name="title_advanced_show_recipients">Показувати отримувачів в заголовку повідомлення</string>
     <string name="title_advanced_font_size_sender">Розмір тексту в полі відправник</string>
-    <string name="title_advanced_font_size_subject">Розмір тексту в полі тема</string>
     <string name="title_advanced_subject_top">Показувати поле тема над полем відправник</string>
     <string name="title_advanced_subject_italic">Показувати поле тема курсивом</string>
-    <string name="title_advanced_subject_elipsed">При необхідності скорочувати тему</string>
+    <string name="title_advanced_highlight_subject">Підсвічувати тему</string>
+    <string name="title_advanced_font_size_subject">Розмір тексту в полі тема</string>
     <string name="title_advanced_highlight_color">Колір підсвічування</string>
     <string name="title_advanced_keywords">Показувати ключові слова в заголовку повідомлення</string>
     <string name="title_advanced_labels">Показувати мітки Gmail в заголовку повідомлення</string>
@@ -1206,6 +1205,7 @@
     <string name="title_previous">Попереднє</string>
     <string name="title_next">Наступне</string>
     <string name="title_edit_signature">Редагувати підпис</string>
+    <string name="title_edit_signature_remark">Хоча Android не може відобразити весь HTML, він буде відправлений такий як є</string>
     <string name="title_edit_signature_text">Текст підпису</string>
     <string name="title_edit_signature_image">Вставити зображення</string>
     <string name="title_answer_caption">Редагувати шаблон</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 8a657a874e..bae2ef7d44 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -348,7 +348,6 @@
     <string name="title_advanced_threading_unread">Hiện số thư chưa đọc trong các cuộc hội thoại</string>
     <string name="title_advanced_indentation">Lùi trái/phải các thư đã nhận/đã gửi trong cuộc hội thoại</string>
     <string name="title_advanced_highlight_unread">Đánh dấu các thư chưa đọc</string>
-    <string name="title_advanced_highlight_subject">Đánh dấu chủ đề</string>
     <string name="title_advanced_color_stripe">Hiện dải màu</string>
     <string name="title_advanced_avatars">Hiện ảnh liên hệ</string>
     <string name="title_advanced_gravatars">Hiện Gravatar</string>
@@ -367,10 +366,10 @@
     <string name="title_advanced_distinguish_contacts">Gạch chân người gửi khi người gửi được biết đến là liên hệ \'đến\'</string>
     <string name="title_advanced_show_recipients">Hiện người nhận ở tiêu đề thư</string>
     <string name="title_advanced_font_size_sender">Cỡ chữ người gửi</string>
-    <string name="title_advanced_font_size_subject">Cỡ chữ chủ đề</string>
     <string name="title_advanced_subject_top">Hiện chủ đề trên người gửi</string>
     <string name="title_advanced_subject_italic">Hiện chủ đề bằng chữ nghiêng</string>
-    <string name="title_advanced_subject_elipsed">Rút ngắn chủ đề nếu cần</string>
+    <string name="title_advanced_highlight_subject">Đánh dấu chủ đề</string>
+    <string name="title_advanced_font_size_subject">Cỡ chữ chủ đề</string>
     <string name="title_advanced_highlight_color">Màu sắc đánh dấu</string>
     <string name="title_advanced_keywords">Hiện từ khoá ở tiêu đề thư</string>
     <string name="title_advanced_labels">Hiện nhãn của Gmail ở tiêu đề thư</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 531ccd70af..bc35c729eb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -347,7 +347,6 @@
     <string name="title_advanced_threading_unread">在对话中显示未读消息的数量</string>
     <string name="title_advanced_indentation">左/右缩进接收/发送的消息</string>
     <string name="title_advanced_highlight_unread">高亮未读消息</string>
-    <string name="title_advanced_highlight_subject">高亮邮件主题</string>
     <string name="title_advanced_color_stripe">头像前显示一条色带</string>
     <string name="title_advanced_avatars">显示联系人头像</string>
     <string name="title_advanced_gravatars">显示 Gravatars 头像</string>
@@ -366,10 +365,10 @@
     <string name="title_advanced_distinguish_contacts">下划线发件人(当其为本地发送给的联系人时)</string>
     <string name="title_advanced_show_recipients">在邮件头中显示收件人</string>
     <string name="title_advanced_font_size_sender">发件人文本大小</string>
-    <string name="title_advanced_font_size_subject">邮件主题文本大小</string>
     <string name="title_advanced_subject_top">在发件人上方显示主题</string>
     <string name="title_advanced_subject_italic">用斜体字显示邮件主题</string>
-    <string name="title_advanced_subject_elipsed">必要时缩短邮件主题</string>
+    <string name="title_advanced_highlight_subject">高亮邮件主题</string>
+    <string name="title_advanced_font_size_subject">邮件主题文本大小</string>
     <string name="title_advanced_highlight_color">高亮色</string>
     <string name="title_advanced_keywords">在邮件头中显示关键字</string>
     <string name="title_advanced_labels">在邮件头中显示 Gmail 标签</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index dd96241e1a..c3bddb09a0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -347,7 +347,6 @@
     <string name="title_advanced_threading_unread">顯示會話中的未讀訊息數</string>
     <string name="title_advanced_indentation">使用左/右縮進形式來表示會話中的已接收/傳送訊息</string>
     <string name="title_advanced_highlight_unread">標亮未讀訊息</string>
-    <string name="title_advanced_highlight_subject">標亮主旨</string>
     <string name="title_advanced_color_stripe">顯示彩色條紋</string>
     <string name="title_advanced_avatars">顯示聯絡人照片</string>
     <string name="title_advanced_gravatars">顯示 Gravatars</string>
@@ -366,10 +365,10 @@
     <string name="title_advanced_distinguish_contacts">當寄件者作為收件聯絡人是本地已知時為其加註底線</string>
     <string name="title_advanced_show_recipients">在訊息標頭中顯示收件者</string>
     <string name="title_advanced_font_size_sender">寄件者字段文字大小</string>
-    <string name="title_advanced_font_size_subject">主旨文字大小</string>
     <string name="title_advanced_subject_top">顯示主旨於寄件者上方位置</string>
     <string name="title_advanced_subject_italic">以斜體風格顯示主旨</string>
-    <string name="title_advanced_subject_elipsed">需要時，截短主旨</string>
+    <string name="title_advanced_highlight_subject">標亮主旨</string>
+    <string name="title_advanced_font_size_subject">主旨文字大小</string>
     <string name="title_advanced_highlight_color">強調色</string>
     <string name="title_advanced_keywords">在訊息標頭中顯示關鍵字</string>
     <string name="title_advanced_labels">在訊息標頭中顯示 Gmail 標籤</string>