diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index b7cbca73da..be8dffda82 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -124,7 +124,6 @@
     <string name="title_identity_name">إسمك</string>
     <string name="title_identity_email">البريد الإلكتروني</string>
     <string name="title_identity_reply_to">الرد على العنوان</string>
-    <string name="title_identity_plain_text">إرسال كنص عادي فقط</string>
     <string name="title_identity_encrypt">تشفير بشكل افتراضي</string>
     <string name="title_identity_read_receipt">طلب إيصال بالقراءة</string>
     <string name="title_identity_delivery_receipt">طلب إيصال بالقراءة</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index b7cbca73da..be8dffda82 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -124,7 +124,6 @@
     <string name="title_identity_name">إسمك</string>
     <string name="title_identity_email">البريد الإلكتروني</string>
     <string name="title_identity_reply_to">الرد على العنوان</string>
-    <string name="title_identity_plain_text">إرسال كنص عادي فقط</string>
     <string name="title_identity_encrypt">تشفير بشكل افتراضي</string>
     <string name="title_identity_read_receipt">طلب إيصال بالقراءة</string>
     <string name="title_identity_delivery_receipt">طلب إيصال بالقراءة</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index b7cbca73da..be8dffda82 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -124,7 +124,6 @@
     <string name="title_identity_name">إسمك</string>
     <string name="title_identity_email">البريد الإلكتروني</string>
     <string name="title_identity_reply_to">الرد على العنوان</string>
-    <string name="title_identity_plain_text">إرسال كنص عادي فقط</string>
     <string name="title_identity_encrypt">تشفير بشكل افتراضي</string>
     <string name="title_identity_read_receipt">طلب إيصال بالقراءة</string>
     <string name="title_identity_delivery_receipt">طلب إيصال بالقراءة</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index b7cbca73da..be8dffda82 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -124,7 +124,6 @@
     <string name="title_identity_name">إسمك</string>
     <string name="title_identity_email">البريد الإلكتروني</string>
     <string name="title_identity_reply_to">الرد على العنوان</string>
-    <string name="title_identity_plain_text">إرسال كنص عادي فقط</string>
     <string name="title_identity_encrypt">تشفير بشكل افتراضي</string>
     <string name="title_identity_read_receipt">طلب إيصال بالقراءة</string>
     <string name="title_identity_delivery_receipt">طلب إيصال بالقراءة</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index e7d2f7fde3..45dc4018f7 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -215,7 +215,6 @@
     <string name="title_identity_name">Vaše jméno</string>
     <string name="title_identity_email">Vaše e-mailová adresa</string>
     <string name="title_identity_reply_to">Adresa pro odpověď</string>
-    <string name="title_identity_plain_text">Odeslat pouze prostý text</string>
     <string name="title_identity_encrypt">Šifrovat ve výchozím stavu</string>
     <string name="title_identity_use_ip_hint">V případě \"neplatného pozdravu\", \"vyžadování platné adresy\" či podobné chyby zkuste změnit toto nastavení</string>
     <string name="title_identity_read_receipt">Požadovat potvrzení o přečtení</string>
@@ -268,7 +267,6 @@
     <string name="title_no_idle">Tento poskytovatel nepodporuje okamžitá oznámení zpráv. Následkem bude opožděný příjem nových zpráv a zvýšená spotřeba baterie.</string>
     <string name="title_no_utf8">Tento poskytovatel nepodporuje UTF-8</string>
     <string name="title_no_sync">Chyby synchronizace od %1$s</string>
-    <string name="title_sync_errors">Synchronizace některých složek selhala</string>
     <string name="title_identity_required">Identita je vyžadována pro odesílání zpráv</string>
     <string name="title_drafts_required">Složka konceptů je vyžadována pro odesílání zpráv</string>
     <string name="title_account_delete">Trvale smazat tento účet?</string>
@@ -410,6 +408,7 @@
     <string name="title_show_addresses">Zobrazit kopii/skrytou kopii</string>
     <string name="title_insert_contact_group">Vložit skupinu kontaktů</string>
     <string name="title_insert_template">Vložit šablonu</string>
+    <string name="title_send_plain_text">Odeslat pouze prostý text</string>
     <string name="title_from_missing">Chybí odesílatel</string>
     <string name="title_to_missing">Chybí příjemce</string>
     <string name="title_attachments_missing">Nebyly staženy všechny přílohy</string>
@@ -492,6 +491,7 @@
     <string name="title_legend_snoozed">Je odloženo</string>
     <string name="title_legend_browsed">Je prohlédnuto/vyhledáno</string>
     <string name="title_legend_answered">Bylo odpovězeno</string>
+    <string name="title_legend_plain_only">Je pouze prostý text</string>
     <string name="title_legend_receipt">Bylo požadováno potvrzení o přečtení</string>
     <string name="title_legend_attachment">Má přílohu</string>
     <string name="title_legend_flagged">Je označeno hvězdičkou</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index d351b947f6..44c7c20045 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -195,7 +195,6 @@
     <string name="title_identity_name">Dit navn</string>
     <string name="title_identity_email">Din e-mailadresse</string>
     <string name="title_identity_reply_to">Svar til-adresse</string>
-    <string name="title_identity_plain_text">Send altid som klartekst</string>
     <string name="title_identity_encrypt">Kryptér som standard</string>
     <string name="title_identity_use_ip_hint">I tilfælde af \'ugyldig hilsen\', \'kræver gyldig adresse\' eller lignende fejl, prøv da at ændre denne indstilling</string>
     <string name="title_identity_read_receipt">Anmod om kvittering for læsning</string>
@@ -248,7 +247,6 @@
     <string name="title_no_idle">Denne udbyder understøtter ikke push-beskeder. Dette vil forsinke modtagelsen af nye meddelelser og øge batteriforbruget.</string>
     <string name="title_no_utf8">Denne udbyder understøtter ikke UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfejl siden %1$s</string>
-    <string name="title_sync_errors">Synkronisering af visse mapper mislykkedes</string>
     <string name="title_identity_required">Identitet påkrævet for at kunne sende meddelelser</string>
     <string name="title_drafts_required">Kladde-mappe påkrævet for at kunne sende meddelelser</string>
     <string name="title_account_delete">Slet denne konto permanent?</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 87f1907d8c..8b3752e620 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Ihr Name</string>
     <string name="title_identity_email">Ihre E-Mail-Adresse</string>
     <string name="title_identity_reply_to">Antwortadresse</string>
-    <string name="title_identity_plain_text">Nur-Text-Email senden</string>
     <string name="title_identity_encrypt">Standardmäßig verschlüsseln</string>
     <string name="title_identity_use_ip_hint">Bei \'invalid greeting\', \'requires valid address\' oder einem ähnlichen Fehler, versuchen Sie, diese Einstellung zu ändern</string>
     <string name="title_identity_read_receipt">Lesebestätigung anfordern</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Dieser Anbieter unterstützt keine Pushnachrichten. Dies verzögert den Empfang neuer E-Mails und erhöht den Akkuverbrauch.</string>
     <string name="title_no_utf8">Dieser Anbieter unterstützt UTF-8 nicht</string>
     <string name="title_no_sync">Synchronisationsfehler seit %1$s</string>
-    <string name="title_sync_errors">Synchronisieren einiger Ordner fehlgeschlagen</string>
     <string name="title_identity_required">Für das Senden von Nachrichten ist ein Name erforderlich</string>
     <string name="title_drafts_required">Ein Entwürfe-Ordner ist erforderlich, um Nachrichten zu senden</string>
     <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
@@ -394,6 +392,7 @@
     <string name="title_show_addresses">CC/BCC anzeigen</string>
     <string name="title_insert_contact_group">Kontaktgruppe einfügen</string>
     <string name="title_insert_template">Vorlage einfügen</string>
+    <string name="title_send_plain_text">Nur Text senden</string>
     <string name="title_from_missing">Absender fehlt</string>
     <string name="title_to_missing">Empfänger fehlt</string>
     <string name="title_attachments_missing">Nicht alle Dateianhänge wurden heruntergeladen</string>
@@ -476,6 +475,7 @@
     <string name="title_legend_snoozed">Wurde zurückgestellt</string>
     <string name="title_legend_browsed">Gesehen oder gesucht</string>
     <string name="title_legend_answered">Wurde beantwortet</string>
+    <string name="title_legend_plain_only">Ist eine Nur-Text-Mail</string>
     <string name="title_legend_receipt">Lesebestätigung wurde angefordert</string>
     <string name="title_legend_attachment">Anhang vorhanden</string>
     <string name="title_legend_flagged">Als wichtig markiert</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index cc46fd6675..caad00189b 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -57,7 +57,6 @@
     <string name="title_identity_name">Το όνομα σας</string>
     <string name="title_identity_email">Η διεύθυνση email σας</string>
     <string name="title_identity_reply_to">Απάντηση στη διεύθυνση αυτή</string>
-    <string name="title_identity_plain_text">Αποστολή μόνο απλού κειμένου</string>
     <string name="title_account_name">Όνομα λογαριασμού</string>
     <string name="title_account_name_hint">Χρησιμοποιείται για τη διαφοροποίηση φακέλων</string>
     <string name="title_account_color">Χρώμα</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 8cc22d6578..c0b280cd13 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -151,6 +151,7 @@
     <string name="title_advanced_images">Mostrar imágenes automáticamente para contactos conocidos</string>
     <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
     <string name="title_advanced_pull_refresh">Tire hacia abajo para actualizar</string>
+    <string name="title_advanced_autoscroll">Desplazar hacia arriba al recibir nuevos mensajes</string>
     <string name="title_advanced_swipenav">Deslice a la izquierda/derecha para ir a la siguiente/anterior conversación</string>
     <string name="title_advanced_autoexpand">Expandir mensajes automáticamente</string>
     <string name="title_advanced_collapse">Contraer mensajes en conversaciones al ir \'atrás\'</string>
@@ -193,12 +194,11 @@
     <string name="title_advanced_search_local_hint">En lugar de buscar en la carpeta de archivo principal en el servidor</string>
     <string name="title_advanced_english_hint">Esto reiniciará la app</string>
     <string name="title_advanced_paranoid_hint">Vea las preguntas frecuentes para más detalles</string>
-    <string name="title_advanced_debug_hint">Activar registro extra y mostrar información de depuración en varios lugares</string>
+    <string name="title_advanced_debug_hint">Habilitar registro adicional y mostrar información de depuración en varios lugares</string>
     <string name="title_select">Seleccione &#8230;</string>
     <string name="title_identity_name">Su nombre</string>
     <string name="title_identity_email">Su dirección de correo electrónico</string>
     <string name="title_identity_reply_to">Responder a la dirección</string>
-    <string name="title_identity_plain_text">Enviar sólo texto plano</string>
     <string name="title_identity_encrypt">Encriptar por defecto</string>
     <string name="title_identity_use_ip_hint">En caso de \'saludo inválido\', \'requiere dirección válida\' o un error similar, intente cambiar esta configuración</string>
     <string name="title_identity_read_receipt">Solicitar confirmación de lectura</string>
@@ -251,7 +251,6 @@
     <string name="title_no_idle">Este proveedor no es compatible con mensajes push. Esto retrasará la recepción de nuevos mensajes y aumentará el uso de batería.</string>
     <string name="title_no_utf8">Este proveedor no es compatible con UTF-8</string>
     <string name="title_no_sync">Errores de sincronización desde %1$s</string>
-    <string name="title_sync_errors">Error al sincronizar algunas carpetas</string>
     <string name="title_identity_required">Se requiere una identidad para enviar mensajes</string>
     <string name="title_drafts_required">Una carpeta de borradores es necesaria para enviar mensajes</string>
     <string name="title_account_delete">¿Eliminar esta cuenta permanentemente?</string>
@@ -284,7 +283,7 @@
     <string name="title_sync_days_remark">Incrementar este valor hará que aumente el consumo de datos y batería</string>
     <string name="title_keep_days">Mantener mensajes (días)</string>
     <string name="title_keep_all">Mantener todos los mensajes</string>
-    <string name="title_auto_delete">Borrar automáticamente mensajes antiguos</string>
+    <string name="title_auto_delete">Eliminar automáticamente mensajes antiguos</string>
     <string name="title_folder_name_missing">Falta nombre de carpeta</string>
     <string name="title_folder_exists">La carpeta %1$s ya existe</string>
     <string name="title_folder_delete">¿Eliminar permanentemente esta carpeta y los mensajes que contenga?</string>
@@ -393,6 +392,7 @@
     <string name="title_show_addresses">Mostrar CC/CCO</string>
     <string name="title_insert_contact_group">Insertar grupo de contactos</string>
     <string name="title_insert_template">Insertar plantilla</string>
+    <string name="title_send_plain_text">Enviar sólo texto plano</string>
     <string name="title_from_missing">Falta remitente</string>
     <string name="title_to_missing">Falta destinatario</string>
     <string name="title_attachments_missing">No todos los adjuntos fueron descargados</string>
@@ -475,6 +475,7 @@
     <string name="title_legend_snoozed">Está postergado</string>
     <string name="title_legend_browsed">Está navegado o buscado</string>
     <string name="title_legend_answered">Ha sido respondido</string>
+    <string name="title_legend_plain_only">Sólo es texto plano</string>
     <string name="title_legend_receipt">Se solicitó confirmación de lectura</string>
     <string name="title_legend_attachment">Tiene adjunto</string>
     <string name="title_legend_flagged">Está destacado</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 486edf33b2..3ee5434387 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Nimesi</string>
     <string name="title_identity_email">Sähköpostiosoitteesi</string>
     <string name="title_identity_reply_to">Vastausosoite</string>
-    <string name="title_identity_plain_text">Lähetä muotoilemattomana tekstinä</string>
     <string name="title_identity_encrypt">Salaa oletusarvoisesti</string>
     <string name="title_identity_use_ip_hint">Virheilmoituksen ollessa \'invalid greeting\', \'requires valid address\' tai muu samankaltainen yritä muuttaa tätä asetusta</string>
     <string name="title_identity_read_receipt">Pyydä vastaanottokuittausta</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Tämä palveluntarjoaja ei tue push-viestejä. Tämä viivästyttää uusien viestien vastaanottamista ja lisää akun käyttöä.</string>
     <string name="title_no_utf8">Tämä palveluntarjoaja ei tue UTF-8:aa</string>
     <string name="title_no_sync">Synkronointivirheitä alkaen %1$s</string>
-    <string name="title_sync_errors">Joidenkin kansioiden synkronointi epäonnistui</string>
     <string name="title_identity_required">Viestien lähettämiseen tarvitaan identiteetti</string>
     <string name="title_drafts_required">Viestien lähettämiseen tarvitaan luonnoskansio</string>
     <string name="title_account_delete">Poistetaanko tämä tili pysyvästi?</string>
@@ -394,6 +392,7 @@
     <string name="title_show_addresses">Näytä kopio/piilokopio</string>
     <string name="title_insert_contact_group">Lisää yhteystietoryhmä</string>
     <string name="title_insert_template">Lisää malli</string>
+    <string name="title_send_plain_text">Lähetä muotoilemattomana tekstinä</string>
     <string name="title_from_missing">Lähettäjä puuttuu</string>
     <string name="title_to_missing">Vastaanottaja puuttuu</string>
     <string name="title_attachments_missing">Kaikkia liitteitä ei ole ladattu</string>
@@ -476,6 +475,7 @@
     <string name="title_legend_snoozed">On torkutettu</string>
     <string name="title_legend_browsed">Selattu tai haettu</string>
     <string name="title_legend_answered">Vastattu</string>
+    <string name="title_legend_plain_only">On muotoilematon teksti</string>
     <string name="title_legend_receipt">Kuittaus pyydetty</string>
     <string name="title_legend_attachment">Sisältää liitteen</string>
     <string name="title_legend_flagged">Tähdellinen</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1654fb2d1d..1023ef6d2a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Votre nom</string>
     <string name="title_identity_email">Votre adresse e-mail</string>
     <string name="title_identity_reply_to">Répondre à l\'adresse</string>
-    <string name="title_identity_plain_text">Envoyer en texte brut uniquement</string>
     <string name="title_identity_encrypt">Chiffrer par défaut</string>
     <string name="title_identity_use_ip_hint">En cas de \"connexion invalide\", \"nécessite une adresse valide\" ou une erreur similaire, essayez de modifier ce paramètre</string>
     <string name="title_identity_read_receipt">Demander une confirmation de lecture</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Ce fournisseur ne gère pas les messages en mode push. Cela va retarder la réception de nouveaux messages et augmenter l\'utilisation de la batterie.</string>
     <string name="title_no_utf8">Ce fournisseur ne prend pas en charge l\'UTF-8</string>
     <string name="title_no_sync">Erreurs de synchronisation depuis %1$s</string>
-    <string name="title_sync_errors">La synchronisation de certains dossiers a échoué</string>
     <string name="title_identity_required">Une identité est nécessaire pour envoyer des messages</string>
     <string name="title_drafts_required">Un dossier brouillon est nécessaire pour envoyer des messages</string>
     <string name="title_account_delete">Supprimer définitivement ce compte ?</string>
@@ -394,6 +392,7 @@
     <string name="title_show_addresses">Afficher Cc/Cci</string>
     <string name="title_insert_contact_group">Insérer un groupe de contacts</string>
     <string name="title_insert_template">Insérer un modèle</string>
+    <string name="title_send_plain_text">Envoyer en texte brut uniquement</string>
     <string name="title_from_missing">Expéditeur manquant</string>
     <string name="title_to_missing">Destinataire manquant</string>
     <string name="title_attachments_missing">Les pièces jointes ne sont pas toutes téléchargées</string>
@@ -476,6 +475,7 @@
     <string name="title_legend_snoozed">Est différé</string>
     <string name="title_legend_browsed">Est parcouru ou recherché</string>
     <string name="title_legend_answered">A reçu une réponse</string>
+    <string name="title_legend_plain_only">Texte brut seulement</string>
     <string name="title_legend_receipt">Un accusé de réception a été demandé</string>
     <string name="title_legend_attachment">A une pièce jointe</string>
     <string name="title_legend_flagged">Est suivi</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 33d18604f8..c01aec0f35 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Il tuo nome</string>
     <string name="title_identity_email">Il tuo indirizzo email</string>
     <string name="title_identity_reply_to">Rispondi all\'indirizzo</string>
-    <string name="title_identity_plain_text">Invia solo testo semplice</string>
     <string name="title_identity_encrypt">Cripta di default</string>
     <string name="title_identity_use_ip_hint">In caso di \"saluto non valido\", \"richiede un indirizzo valido\" o un errore simile, provare a modificare questa impostazione</string>
     <string name="title_identity_read_receipt">Richiedi conferma di lettura</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Questo fornitore non supporta i messaggi push. Ciò ritarderà la ricezione di nuovi messaggi e aumenterà l\'utilizzo della batteria.</string>
     <string name="title_no_utf8">Questo provider non supporta UTF-8</string>
     <string name="title_no_sync">Errori di sincronizzazione da %1$s</string>
-    <string name="title_sync_errors">Sincronizzazione di alcune cartelle fallita</string>
     <string name="title_identity_required">È necessaria un\'identità per inviare messaggi</string>
     <string name="title_drafts_required">Per inviare messaggi è necessaria una cartella bozze</string>
     <string name="title_account_delete">Eliminare questo account permanentemente?</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 940bc199d4..b0941aba3e 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Uw naam</string>
     <string name="title_identity_email">Uw e-mailadres</string>
     <string name="title_identity_reply_to">Antwoord op adres</string>
-    <string name="title_identity_plain_text">Verstuur alleen platte tekst</string>
     <string name="title_identity_encrypt">Standaard versleutelen</string>
     <string name="title_identity_use_ip_hint">In geval van \'invalid greeting\', \'requires valid address\' of een soortgelijke fout, probeer deze instelling te wijzigen</string>
     <string name="title_identity_read_receipt">Vraag leesbevestiging</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Deze provider biedt geen ondersteuning voor push-berichten. Dit zal het ontvangen van nieuwe berichten vertragen en het gebruik van de batterij te verhogen.</string>
     <string name="title_no_utf8">Deze provider ondersteunt geen UTF-8</string>
     <string name="title_no_sync">Synchronisatiefouten sinds %1$s</string>
-    <string name="title_sync_errors">Synchroniseren van sommige mappen mislukt</string>
     <string name="title_identity_required">Een identiteit is vereist om berichten te verzenden</string>
     <string name="title_drafts_required">Een concepten map is vereist om berichten te verzenden</string>
     <string name="title_account_delete">Verwijder dit account permanent?</string>
@@ -394,6 +392,7 @@
     <string name="title_show_addresses">Toon CC/BCC</string>
     <string name="title_insert_contact_group">Contactgroep toevoegen</string>
     <string name="title_insert_template">Sjabloon invoegen</string>
+    <string name="title_send_plain_text">Verstuur alleen platte tekst</string>
     <string name="title_from_missing">Zender ontbreekt</string>
     <string name="title_to_missing">Ontvanger ontbreekt</string>
     <string name="title_attachments_missing">Niet alle bijlagen zijn gedownload</string>
@@ -476,6 +475,7 @@
     <string name="title_legend_snoozed">Is gesluimerd</string>
     <string name="title_legend_browsed">Is gebladerd of gezocht</string>
     <string name="title_legend_answered">Is beantwoord</string>
+    <string name="title_legend_plain_only">Is alleen platte tekst</string>
     <string name="title_legend_receipt">Ontvangstbevestiging werd gevraagd</string>
     <string name="title_legend_attachment">Heeft bijlagen</string>
     <string name="title_legend_flagged">Heeft een star</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 15940e27bc..3f60164053 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Ditt navn</string>
     <string name="title_identity_email">Din e-postadresse</string>
     <string name="title_identity_reply_to">Svar til adressen</string>
-    <string name="title_identity_plain_text">Send bare ren tekst</string>
     <string name="title_identity_encrypt">Krypter som standard</string>
     <string name="title_identity_use_ip_hint">I tilfelle \'ugyldig hilsen\', \'krever gyldig adresse\' eller en lignende feil, prøv å endre denne innstillingen</string>
     <string name="title_identity_read_receipt">Be om lesebekreftelse</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Denne leverandøren støtter ikke push-meldinger. Dette vil forsinke mottak av nye meldinger og øke batteriforbruket.</string>
     <string name="title_no_utf8">Denne leverandøren støtter ikke UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfeil siden %1$s</string>
-    <string name="title_sync_errors">Synkronisering av noen mapper mislyktes</string>
     <string name="title_identity_required">En identitet er nødvendig for å sende meldinger</string>
     <string name="title_drafts_required">Det kreves en kladd mappe for å kunne sende meldinger</string>
     <string name="title_account_delete">Slett denne konto en permanent?</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 15940e27bc..3f60164053 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -199,7 +199,6 @@
     <string name="title_identity_name">Ditt navn</string>
     <string name="title_identity_email">Din e-postadresse</string>
     <string name="title_identity_reply_to">Svar til adressen</string>
-    <string name="title_identity_plain_text">Send bare ren tekst</string>
     <string name="title_identity_encrypt">Krypter som standard</string>
     <string name="title_identity_use_ip_hint">I tilfelle \'ugyldig hilsen\', \'krever gyldig adresse\' eller en lignende feil, prøv å endre denne innstillingen</string>
     <string name="title_identity_read_receipt">Be om lesebekreftelse</string>
@@ -252,7 +251,6 @@
     <string name="title_no_idle">Denne leverandøren støtter ikke push-meldinger. Dette vil forsinke mottak av nye meldinger og øke batteriforbruket.</string>
     <string name="title_no_utf8">Denne leverandøren støtter ikke UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfeil siden %1$s</string>
-    <string name="title_sync_errors">Synkronisering av noen mapper mislyktes</string>
     <string name="title_identity_required">En identitet er nødvendig for å sende meldinger</string>
     <string name="title_drafts_required">Det kreves en kladd mappe for å kunne sende meldinger</string>
     <string name="title_account_delete">Slett denne konto en permanent?</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 53b128b09f..ac928f97a5 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -209,7 +209,6 @@
     <string name="title_identity_name">Twoja nazwa</string>
     <string name="title_identity_email">Twój adres e-mail</string>
     <string name="title_identity_reply_to">Odpowiedz na adres</string>
-    <string name="title_identity_plain_text">Wyślij tylko zwykły tekst</string>
     <string name="title_identity_encrypt">Szyfruj domyślnie</string>
     <string name="title_identity_use_ip_hint">W przypadku „nieprawidłowego powitania”, „wymaga prawidłowego adresu” lub podobnego błędu spróbuj zmienić to ustawienie</string>
     <string name="title_identity_read_receipt">Poproś o potwierdzenie odczytu</string>
@@ -261,7 +260,6 @@
     <string name="title_no_idle">Ten dostawca nie obsługuje wiadomości push. To opóźni otrzymywanie nowych wiadomości i zwiększy zużycie baterii.</string>
     <string name="title_no_utf8">Ten dostawca nie wspiera UTF-8</string>
     <string name="title_no_sync">Błędy synchornizacji od %1$s</string>
-    <string name="title_sync_errors">Synchronizacja niektórych folderów nie powiodła się</string>
     <string name="title_identity_required">Do wysyłania wiadomości wymagana jest tożsamość</string>
     <string name="title_drafts_required">Folder szkiców jest wymagany do wysyłania wiadomości</string>
     <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 06609d124c..15436fbba1 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -198,7 +198,6 @@
     <string name="title_identity_name">Seu nome</string>
     <string name="title_identity_email">Seu endereço de e-mail</string>
     <string name="title_identity_reply_to">Resposta para o endereço</string>
-    <string name="title_identity_plain_text">Enviar apenas em texto simples</string>
     <string name="title_identity_encrypt">Criptografar por padrão</string>
     <string name="title_identity_use_ip_hint">Em caso de \'saudação inválida\', \'requer um endereço válido\' ou um erro similar, tente alterar esta configuração</string>
     <string name="title_identity_read_receipt">Solicitar recibo de leitura</string>
@@ -251,7 +250,6 @@
     <string name="title_no_idle">Este provedor não suporta mensagens push. Isso irá atrasar o recebimento de novas mensagens e aumentar o uso da bateria.</string>
     <string name="title_no_utf8">Este provedor de e-mail não suporta UTF-8</string>
     <string name="title_no_sync">Erros de sincronização desde %1$s</string>
-    <string name="title_sync_errors">Falha ao sincronizar algumas pastas</string>
     <string name="title_identity_required">Uma identidade é necessária para enviar mensagens</string>
     <string name="title_drafts_required">Uma pasta de rascunhos é necessário para enviar mensagens</string>
     <string name="title_account_delete">Excluir esta conta permanentemente?</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index b64f6821fe..87d8882cb5 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -206,7 +206,6 @@
     <string name="title_identity_name">Numele dumneavoastră</string>
     <string name="title_identity_email">Adresa dvs. de e-mail</string>
     <string name="title_identity_reply_to">Răspuns la adresa</string>
-    <string name="title_identity_plain_text">Trimite numai text simplu</string>
     <string name="title_identity_encrypt">Criptare în mod implicit</string>
     <string name="title_identity_use_ip_hint">În cazul în care apare erori de tipul \'invalid greeting\', \'requires valid address\' sau similare, încercați să schimbați această setare</string>
     <string name="title_identity_read_receipt">Solicitare confirmare citire</string>
@@ -259,7 +258,6 @@
     <string name="title_no_idle">Acest furnizor de servicii e-mail nu suporta mesaje push. Acest fapt va duce la întârzierea recepției mesajelor și un consum mai mare al bateriei.</string>
     <string name="title_no_utf8">Acest furnizor nu suportă UTF-8</string>
     <string name="title_no_sync">Erori de sincronizare începând cu %1$s</string>
-    <string name="title_sync_errors">Sincronizarea unor dosare a eșuat</string>
     <string name="title_identity_required">O identitate este necesară pentru a trimite mesaje</string>
     <string name="title_drafts_required">Un dosar de ciorne este necesar pentru a trimite mesaje</string>
     <string name="title_account_delete">Ștergeți definitiv acest cont?</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ceaef1a1a1..5967ad98f2 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -215,7 +215,6 @@
     <string name="title_identity_name">Ваше имя</string>
     <string name="title_identity_email">Ваш эл. адрес</string>
     <string name="title_identity_reply_to">Обратный адрес</string>
-    <string name="title_identity_plain_text">Отправка простым текстом</string>
     <string name="title_identity_encrypt">Шифровать по умолчанию</string>
     <string name="title_identity_use_ip_hint">В случае ошибки \'invalid greeting\', \'requires valid address\' или аналогичной, попробуйте изменить этот параметр</string>
     <string name="title_identity_read_receipt">Запросить уведомления о прочтении</string>
@@ -268,7 +267,6 @@
     <string name="title_no_idle">Этот провайдер не поддерживает push-сообщения. Это задержит прием новых сообщений и увеличит расход батареи.</string>
     <string name="title_no_utf8">Этот провайдер не поддерживает UTF-8</string>
     <string name="title_no_sync">Ошибки синхронизации после %1$s</string>
-    <string name="title_sync_errors">Синхронизация некоторых папок не удалась</string>
     <string name="title_identity_required">Для отправки сообщений требуется идентификатор</string>
     <string name="title_drafts_required">Для отправки сообщений требуется папка черновиков</string>
     <string name="title_account_delete">Удалить эту учетную запись навсегда?</string>
@@ -410,6 +408,7 @@
     <string name="title_show_addresses">Показать CC / BCC</string>
     <string name="title_insert_contact_group">Добавить группу контактов</string>
     <string name="title_insert_template">Вставить шаблон</string>
+    <string name="title_send_plain_text">Отправить только простым текстом</string>
     <string name="title_from_missing">Отправитель отсутствует</string>
     <string name="title_to_missing">Получатель отсутствует</string>
     <string name="title_attachments_missing">Не все вложения загружены</string>
@@ -492,6 +491,7 @@
     <string name="title_legend_snoozed">Отложено</string>
     <string name="title_legend_browsed">Сообщение на сервере</string>
     <string name="title_legend_answered">Был дан ответ</string>
+    <string name="title_legend_plain_only">Только простой текст</string>
     <string name="title_legend_receipt">Уведомление запрошено</string>
     <string name="title_legend_attachment">Имеет вложение</string>
     <string name="title_legend_flagged">Отмечено</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 50cecef87b..e2216f3c9f 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -184,7 +184,6 @@
     <string name="title_identity_name">Ditt namn</string>
     <string name="title_identity_email">Din e-postadress</string>
     <string name="title_identity_reply_to">Svara till adress</string>
-    <string name="title_identity_plain_text">Skicka oformaterad text</string>
     <string name="title_identity_encrypt">Kryptera som standard</string>
     <string name="title_identity_read_receipt">Begär läskvitto</string>
     <string name="title_identity_delivery_receipt">Begär leveranskvitto</string>
@@ -233,7 +232,6 @@
     <string name="title_no_idle">Leverantören stöder inte push-meddelanden. Detta kommer att fördröja mottagning av nya meddelanden och öka batterianvändningen.</string>
     <string name="title_no_utf8">Denna leverantör stöder inte UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfel sedan %1$s</string>
-    <string name="title_sync_errors">Synkronisering av vissa mappar misslyckades</string>
     <string name="title_identity_required">En identitet krävs för att skicka meddelanden</string>
     <string name="title_drafts_required">En mapp för utkast krävs för att skicka meddelanden</string>
     <string name="title_account_delete">Ta bort detta konto permanent?</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 2d7c0b3281..166d906298 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -190,7 +190,6 @@
     <string name="title_identity_name">Adınız</string>
     <string name="title_identity_email">E-posta adresiniz</string>
     <string name="title_identity_reply_to">Yanıtlama adresi</string>
-    <string name="title_identity_plain_text">Yalnızca düz metin gönder</string>
     <string name="title_identity_encrypt">Öntanımlı olarak şifrele</string>
     <string name="title_identity_use_ip_hint">\'Geçersiz selamlaşma\', \'geçerli adres gerekir\' veya benzer bir hata olması durumunda, bu ayarı değiştirmeyi deneyin</string>
     <string name="title_identity_read_receipt">Okundu bilgisi iste</string>
@@ -243,7 +242,7 @@
     <string name="title_no_idle">Bu sağlayıcı anlık mesajları desteklemiyor. Bu, yeni mesajların alınmasını geciktirecek ve pil kullanımını artıracaktır.</string>
     <string name="title_no_utf8">Bu sağlayıcı UTF-8\'i desteklemiyor</string>
     <string name="title_no_sync">%1$s\'den beri eşzamanlama hataları</string>
-    <string name="title_sync_errors">Bazı klasörlerin eşzamanlaması başarısız oldu</string>
+    <string name="title_identity_required">İleti göndermek için bir kimlik gerekli</string>
     <string name="title_drafts_required">İleti göndermek için taslaklar klasörü gerekir</string>
     <string name="title_account_delete">Bu hesap kalıcı olarak silinsin mi?</string>
     <string name="title_identity_delete">Bu kimlik kalıcı olarak silinsin mi?</string>
@@ -312,6 +311,7 @@
     <string name="title_download_all">Tümünü indir</string>
     <string name="title_save_all">Tümünü kaydet</string>
     <string name="title_show_html">Orjinali göster</string>
+    <string name="title_show_formatted">Biçimli göster</string>
     <string name="title_trash">Çöp Kutusu</string>
     <string name="title_copy">Kopyala &#8230;</string>
     <string name="title_subscribe">Abonelik</string>
@@ -372,6 +372,7 @@
     <string name="title_send_at">&#8230;\'te gönder</string>
     <string name="title_style_bold">Kalın yazı</string>
     <string name="title_style_italic">Eğik yazı</string>
+    <string name="title_style_underline">Alt çizgi</string>
     <string name="title_style_size">Boyut</string>
     <string name="title_style_color">Renk</string>
     <string name="title_style_clear">Biçimlendirmeyi temizle</string>
@@ -416,12 +417,14 @@
     <string name="title_address_invalid">Geçersiz:</string>
     <string name="title_previous">Önceki</string>
     <string name="title_next">Sonraki</string>
+    <string name="title_answer_caption">Kalıbı Düzenle</string>
     <string name="title_answer_reply">Yanıt kalıbı</string>
     <string name="title_answer_name">Kalıp adı</string>
     <string name="title_answer_hide">Menülerden gizle</string>
     <string name="title_answer_text">Kalıp metni</string>
     <string name="title_answer_template_name">$name$ gönderenin tam adı ile değiştirilecek</string>
     <string name="title_answer_template_email">$email$ gönderenin e-posta adresi ile değiştirilecek</string>
+    <string name="title_rule_caption">Kuralı düzenle</string>
     <string name="title_rule_name">Ad</string>
     <string name="title_rule_order">Sıralama</string>
     <string name="title_rule_enabled">Etkin</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e7eecdb7a9..4ab3807d53 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -143,6 +143,7 @@
     <string name="title_advanced_images">自动显示来自已知联系人邮件中的图片</string>
     <string name="title_advanced_actionbar">对话操作栏</string>
     <string name="title_advanced_pull_refresh">下拉刷新</string>
+    <string name="title_advanced_autoscroll">在收到新消息时滚动至顶部</string>
     <string name="title_advanced_swipenav">向左/右滑动来前往下一个/上一个邮件会话</string>
     <string name="title_advanced_autoexpand">自动伸展消息</string>
     <string name="title_advanced_collapse">按返回键折叠对话中的邮件</string>
@@ -190,7 +191,6 @@
     <string name="title_identity_name">姓名</string>
     <string name="title_identity_email">电子邮件地址</string>
     <string name="title_identity_reply_to">回复地址</string>
-    <string name="title_identity_plain_text">仅发送纯文本</string>
     <string name="title_identity_encrypt">默认加密</string>
     <string name="title_identity_use_ip_hint">如果遇到“无效问候”，“需要有效的地址”或类似错误，请尝试更改此设置</string>
     <string name="title_identity_read_receipt">请求读取回执</string>
@@ -243,7 +243,6 @@
     <string name="title_no_idle">该提供商不支持消息推送，这将延迟新消息的接收并增加电池用量</string>
     <string name="title_no_utf8">该邮件服务供应商不支持UTF-8字符集</string>
     <string name="title_no_sync">从 %1$s 开始同步错误</string>
-    <string name="title_sync_errors">一些文件夹同步失败</string>
     <string name="title_identity_required">需要一个身份来发送消息</string>
     <string name="title_drafts_required">需要一个草稿文件夹来发送消息</string>
     <string name="title_account_delete">确定永久删除这个账户吗？</string>
@@ -385,6 +384,7 @@
     <string name="title_show_addresses">显示抄送和密送</string>
     <string name="title_insert_contact_group">插入联系人组</string>
     <string name="title_insert_template">插入模板</string>
+    <string name="title_send_plain_text">仅发送纯文本</string>
     <string name="title_from_missing">缺少发件人</string>
     <string name="title_to_missing">缺少收件人</string>
     <string name="title_attachments_missing">没有下载全部附件</string>
@@ -467,6 +467,7 @@
     <string name="title_legend_snoozed">已暂停</string>
     <string name="title_legend_browsed">已浏览或搜索</string>
     <string name="title_legend_answered">已回复</string>
+    <string name="title_legend_plain_only">仅纯文本</string>
     <string name="title_legend_receipt">请求收据</string>
     <string name="title_legend_attachment">有附件</string>
     <string name="title_legend_flagged">已标星</string>