diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 2c7ad8c10a..5a6ffe2bf5 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -189,7 +189,6 @@
     <string name="title_synchronize_all">زامن كافة الرسائل</string>
     <string name="title_synchronize_enabled">مزامنة</string>
     <string name="title_delete_local">حذف الرسائل المحلية</string>
-    <string name="title_empty_trash">إفراغ سلّة المهملات</string>
     <string name="title_edit_properties">تعديل الخصائص</string>
     <string name="title_edit_rules">تعديل القواعد</string>
     <string name="title_folder_name">إسم المجلد</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 2c7ad8c10a..5a6ffe2bf5 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -189,7 +189,6 @@
     <string name="title_synchronize_all">زامن كافة الرسائل</string>
     <string name="title_synchronize_enabled">مزامنة</string>
     <string name="title_delete_local">حذف الرسائل المحلية</string>
-    <string name="title_empty_trash">إفراغ سلّة المهملات</string>
     <string name="title_edit_properties">تعديل الخصائص</string>
     <string name="title_edit_rules">تعديل القواعد</string>
     <string name="title_folder_name">إسم المجلد</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 2c7ad8c10a..5a6ffe2bf5 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -189,7 +189,6 @@
     <string name="title_synchronize_all">زامن كافة الرسائل</string>
     <string name="title_synchronize_enabled">مزامنة</string>
     <string name="title_delete_local">حذف الرسائل المحلية</string>
-    <string name="title_empty_trash">إفراغ سلّة المهملات</string>
     <string name="title_edit_properties">تعديل الخصائص</string>
     <string name="title_edit_rules">تعديل القواعد</string>
     <string name="title_folder_name">إسم المجلد</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 843a1d7040..49622df0ad 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -255,7 +255,6 @@
     <string name="title_synchronize_all">زامن كافة الرسائل</string>
     <string name="title_synchronize_enabled">مزامنة</string>
     <string name="title_delete_local">حذف الرسائل المحلية</string>
-    <string name="title_empty_trash">إفراغ سلّة المهملات</string>
     <string name="title_edit_properties">تعديل الخصائص</string>
     <string name="title_edit_rules">تعديل القواعد</string>
     <string name="title_folder_name">إسم المجلد</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index b0511640f8..ac629bed7d 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -228,9 +228,7 @@
     <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
     <string name="title_synchronize_now">İndi eyniləşdir</string>
     <string name="title_delete_local">Yerli mesajları sil</string>
-    <string name="title_empty_trash">Tullantı qovluğunu təmizlə</string>
     <string name="title_edit_properties">Xüsusiyyətlərə düzəliş et</string>
-    <string name="title_empty_trash_ask">Bütün tullantı mesajları birdəfəlik silinsin?</string>
     <string name="title_delete_operation">Bir xəta mesajı ilə əməliyyatlar silinsin?</string>
     <string name="title_folder_name">Qovluq adı</string>
     <string name="title_display_name">Ekran adı</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index e70da6325c..570100ac0a 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -518,18 +518,12 @@
     <string name="title_synchronize_enabled">Синхронизиране</string>
     <string name="title_delete_local">Изтриване на локалните съобщения</string>
     <string name="title_delete_browsed">Изтриване на търсените съобщения</string>
-    <string name="title_empty_trash">Изпразване на кошчето</string>
-    <string name="title_empty_spam">Изтриване на спама</string>
     <string name="title_edit_properties">Редактиране на свойствата</string>
     <string name="title_edit_rules">Редактиране на правилата</string>
     <string name="title_create_channel">Създаване на канал за известия</string>
     <string name="title_edit_channel">Редактиране на канал за известия</string>
     <string name="title_delete_channel">Изтриване на канал за известия</string>
     <string name="title_create_sub_folder">Създаване на подпапка</string>
-    <string name="title_empty_trash_ask">Изтриване на съобщенията завиханги?</string>
-    <string name="title_empty_spam_ask">Изтриване на целия спам завинаги?</string>
-    <string name="title_empty_trash_all_ask">Да се изтрият ли завинаги всички изтрити съобщения от всички профили?</string>
-    <string name="title_empty_spam_all_ask">Да се изтрият ли трайно всички спам съобщения от всички профили?</string>
     <string name="title_delete_operation">Да се изтрият ли операциите със съобщение за грешка?</string>
     <string name="title_delete_contacts">Изтрий локалните контакти?</string>
     <string name="title_no_operations">Няма чакащи операции</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 58f98da224..41087e17aa 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -413,16 +413,12 @@
     <string name="title_synchronize_enabled">Sincronitza</string>
     <string name="title_delete_local">Esborra els missatges locals</string>
     <string name="title_delete_browsed">Suprimeix els missatges cercats/navegats</string>
-    <string name="title_empty_trash">Buida la paperera</string>
-    <string name="title_empty_spam">Buidar Correu Brossa</string>
     <string name="title_edit_properties">Edita les propietats</string>
     <string name="title_edit_rules">Edita les regles</string>
     <string name="title_create_channel">Crea un canal de notificació</string>
     <string name="title_edit_channel">Edita un canal de notificació</string>
     <string name="title_delete_channel">Esborra un canal de notificació</string>
     <string name="title_create_sub_folder">Crea una nova carpeta</string>
-    <string name="title_empty_trash_ask">Vols buidar la paperera?</string>
-    <string name="title_empty_spam_ask">Vols buidar el correu brossa per sempre?</string>
     <string name="title_delete_operation">Vols suprimir les operacions amb un missatge d\'error?</string>
     <string name="title_delete_contacts">Esborrar tots els contactes locals?</string>
     <string name="title_no_operations">Sense operacions pendents</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index a1b2e74c79..ce4691d84e 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -384,6 +384,8 @@
     <string name="title_advanced_import_key">Importovat privátní klíč</string>
     <string name="title_advanced_manage_keys">Spravovat privátní klíče</string>
     <string name="title_advanced_external_search">Povolit ostatním aplikacím vyhledávat ve zprávách</string>
+    <string name="title_advanced_conversation_actions">Navrhovat akce</string>
+    <string name="title_advanced_conversation_actions_replies">Navrhovat texty odpovědí</string>
     <string name="title_advanced_fts">Sestavit index vyhledávání</string>
     <string name="title_advanced_fts_indexed">Indexováno %1$d / %2$d zpráv (%3$s)</string>
     <string name="title_advanced_english">Vynutit anglický jazyk</string>
@@ -539,18 +541,14 @@
     <string name="title_synchronize_enabled">Synchronizovat</string>
     <string name="title_delete_local">Smazat místní zprávy</string>
     <string name="title_delete_browsed">Smazat prohlédnuté/vyhledané zprávy</string>
-    <string name="title_empty_trash">Vysypat koš</string>
-    <string name="title_empty_spam">Vyprázdnit nevyžádané</string>
+    <string name="title_empty_trash">Vyprázdnit lokální koš</string>
+    <string name="title_empty_spam">Vyprázdnit lokální spam</string>
     <string name="title_edit_properties">Upravit vlastnosti</string>
     <string name="title_edit_rules">Upravit pravidla</string>
     <string name="title_create_channel">Vytvořit kanál oznámení</string>
     <string name="title_edit_channel">Upravit kanál oznámení</string>
     <string name="title_delete_channel">Smazat kanál oznámení</string>
     <string name="title_create_sub_folder">Vytvořit podsložku</string>
-    <string name="title_empty_trash_ask">Trvale odstranit všechny zprávy v koši?</string>
-    <string name="title_empty_spam_ask">Trvale odstranit všechny nevyžádané zprávy?</string>
-    <string name="title_empty_trash_all_ask">Trvale odstranit všechny zprávy v koši ze všech účtů?</string>
-    <string name="title_empty_spam_all_ask">Trvale odstranit všechny nevyžádané zprávy ze všech účtů?</string>
     <string name="title_delete_operation">Smazat operace s chybovou hláškou?</string>
     <string name="title_delete_contacts">Smazat všechny místní kontakty?</string>
     <string name="title_no_operations">Žádné probíhající operace</string>
@@ -1020,6 +1018,8 @@
     <string name="title_loading">Načítání &#8230;</string>
     <string name="title_set">Nastavit</string>
     <string name="title_fetching_again">Opětovné získávání zprávy ze serveru</string>
+    <string name="title_conversation_actions">Akce</string>
+    <string name="title_conversation_action_reply">Odpovědět s: \'%1$s\'</string>
     <string name="title_icalendar_accept">Přijmout</string>
     <string name="title_icalendar_decline">Odmítnout</string>
     <string name="title_icalendar_maybe">Nezávazně</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 050861c9f7..457fd70a8d 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -363,6 +363,9 @@
     <string name="title_advanced_import_key">Importér privat nøgle</string>
     <string name="title_advanced_manage_keys">Håndtér private nøgler</string>
     <string name="title_advanced_external_search">Tillad andre apps at søge i beskeder</string>
+    <string name="title_advanced_shortcuts">Vis ofte anvendte kontakter i Android-delingsmenuen</string>
+    <string name="title_advanced_conversation_actions">Foreslå handlinger</string>
+    <string name="title_advanced_conversation_actions_replies">Foreslå svartekster</string>
     <string name="title_advanced_fts">Opbyg søgeindeks</string>
     <string name="title_advanced_fts_indexed">%1$d/%2$d beskeder indekseret (%3$s)</string>
     <string name="title_advanced_english">Gennemtving engelsk sprog</string>
@@ -518,18 +521,12 @@
     <string name="title_synchronize_enabled">Synkroniserer</string>
     <string name="title_delete_local">Slet lokale beskeder</string>
     <string name="title_delete_browsed">Slet gennemsete/søgte beskeder</string>
-    <string name="title_empty_trash">Tøm papirkurven</string>
-    <string name="title_empty_spam">Tøm spam</string>
     <string name="title_edit_properties">Redigér egenskaber</string>
     <string name="title_edit_rules">Redigér regler</string>
     <string name="title_create_channel">Opret notifikationskanal</string>
     <string name="title_edit_channel">Redigér notifikationskanal</string>
     <string name="title_delete_channel">Slet notifikationskanal</string>
     <string name="title_create_sub_folder">Opret undermappe</string>
-    <string name="title_empty_trash_ask">Slet alt indhold i papirkurven permanent?</string>
-    <string name="title_empty_spam_ask">Slet alle spambeskeder permanent?</string>
-    <string name="title_empty_trash_all_ask">Slet permanent alt indhold i papirkurven for alle konti?</string>
-    <string name="title_empty_spam_all_ask">Slet permanent alle spam-meddelelser for alle konti?</string>
     <string name="title_delete_operation">Slet operationer med en fejlmeddelelse?</string>
     <string name="title_delete_contacts">Slet alle lokale kontakter?</string>
     <string name="title_no_operations">Ingen afventende handlinger</string>
@@ -1000,6 +997,8 @@
     <string name="title_loading">Indlæser &#8230;</string>
     <string name="title_set">Indstil</string>
     <string name="title_fetching_again">Henter beskeder igen fra server</string>
+    <string name="title_conversation_actions">Handlinger</string>
+    <string name="title_conversation_action_reply">Svar med: \'%1$s\'</string>
     <string name="title_icalendar_accept">Acceptér</string>
     <string name="title_icalendar_decline">Afvis</string>
     <string name="title_icalendar_maybe">Måske</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 0938884ecb..a6e5a4437c 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -163,6 +163,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_setup_error">Fehler</string>
     <string name="title_setup_export">Einstellungen exportieren</string>
     <string name="title_setup_import">Einstellungen importieren</string>
+    <string name="title_setup_export_do">Gmail-Konten, die mit geräteinternen Google-Konten verknüpft sind, können nicht exportiert werden</string>
     <string name="title_setup_import_do">Importierte Konten werden hinzugefügt, ohne vorhandene zu überschreiben</string>
     <string name="title_setup_password">Passwort</string>
     <string name="title_setup_password_chars">Passwort enthält Kontroll- oder Leerzeichen</string>
@@ -364,7 +365,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_import_key">Privaten Schlüssel importieren</string>
     <string name="title_advanced_manage_keys">Private Schlüssel verwalten</string>
     <string name="title_advanced_external_search">Anderen Apps erlauben in Nachrichten zu suchen</string>
-    <string name="title_advanced_shortcuts">Häufig verwendete Kontakte im Android Freigabemenü anzeigen</string>
+    <string name="title_advanced_shortcuts">Häufig verwendete Kontakte im Android-Teilen-Menü anzeigen</string>
     <string name="title_advanced_conversation_actions">Aktionen vorschlagen</string>
     <string name="title_advanced_conversation_actions_replies">Antworttext vorschlagen</string>
     <string name="title_advanced_fts">Suchindex erstellen</string>
@@ -522,18 +523,18 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_synchronize_enabled">Synchronisieren</string>
     <string name="title_delete_local">Lokale Nachrichten löschen</string>
     <string name="title_delete_browsed">Durchsuchte Nachrichten löschen</string>
-    <string name="title_empty_trash">Papierkorb leeren</string>
-    <string name="title_empty_spam">Spam-Nachrichten löschen</string>
+    <string name="title_empty_trash">Lokalen Papierkorb leeren</string>
+    <string name="title_empty_spam">Lokalen Spam leeren</string>
     <string name="title_edit_properties">Eigenschaften bearbeiten</string>
     <string name="title_edit_rules">Regel bearbeiten</string>
     <string name="title_create_channel">Benachrichtigungskanal erstellen</string>
     <string name="title_edit_channel">Benachrichtigungskanal bearbeiten</string>
     <string name="title_delete_channel">Benachrichtigungskanal löschen</string>
     <string name="title_create_sub_folder">Unterordner erstellen</string>
-    <string name="title_empty_trash_ask">Alle gelöschten Nachrichten dauerhaft löschen?</string>
-    <string name="title_empty_spam_ask">Alle Spam-Nachrichten dauerhaft löschen?</string>
-    <string name="title_empty_trash_all_ask">Alle gelöschten Nachrichten aller Konten dauerhaft löschen?</string>
-    <string name="title_empty_spam_all_ask">Alle Spam-Nachrichten aller Konten dauerhaft löschen?</string>
+    <string name="title_empty_trash_ask">Alle lokalen gelöschten Nachrichten dauerhaft löschen?</string>
+    <string name="title_empty_spam_ask">Alle lokalen Spam-Nachrichten dauerhaft löschen?</string>
+    <string name="title_empty_trash_all_ask">Alle lokalen gelöschten Nachrichten aller Konten dauerhaft löschen?</string>
+    <string name="title_empty_spam_all_ask">Alle lokalen Spam-Nachrichten aller Konten dauerhaft löschen?</string>
     <string name="title_delete_operation">Vorgänge mit einer Fehlermeldung löschen?</string>
     <string name="title_delete_contacts">Alle lokale Kontakte löschen?</string>
     <string name="title_no_operations">Keine weiteren Vorgänge</string>
@@ -858,6 +859,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_legend_section_folders">Ordner</string>
     <string name="title_legend_section_messages">Nachrichten</string>
     <string name="title_legend_section_compose">Verfassen</string>
+    <string name="title_legend_section_keyboard">Tastatur</string>
     <string name="title_legend_oauth">OAuth-Autorisierung</string>
     <string name="title_legend_primary_connected">Konto verbunden</string>
     <string name="title_legend_primary_disconnected">Konto getrennt</string>
@@ -947,6 +949,13 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_legend_delete">Löschen</string>
     <string name="title_legend_count">Zählen</string>
     <string name="title_legend_folder_type">Ordnertyp</string>
+    <string name="title_legend_enter">Öffnen</string>
+    <string name="title_legend_a">Archivieren</string>
+    <string name="title_legend_c">Verfassen</string>
+    <string name="title_legend_n">Weiter</string>
+    <string name="title_legend_p">Zurück</string>
+    <string name="title_legend_s">Aus-/Abwählen</string>
+    <string name="title_legend_t">Text fokussieren</string>
     <string name="title_hint_folder_actions">Drücken Sie lange auf einen Ordner für Optionen, wie das Hinzufügen eines Ordners in die Navigation für schnellen Zugriff</string>
     <string name="title_hint_folder_sync">Um Akkuverbrauch und Datennutzung zu reduzieren, werden standardmäßig nicht alle Ordner und E-Mails synchronisiert</string>
     <string name="title_hint_support">Wenn Sie eine Frage oder ein Problem haben, verwenden Sie bitte die Hilfe im Menü</string>
@@ -1005,7 +1014,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_set">Setzen</string>
     <string name="title_fetching_again">Nachricht wird erneut vom Server abgerufen</string>
     <string name="title_conversation_actions">Aktionen</string>
-    <string name="title_conversation_action_reply">Antwort beginnen mit: \'%1$s\'</string>
+    <string name="title_conversation_action_reply">Antworten mit: \'%1$s\'</string>
     <string name="title_icalendar_accept">Akzeptieren</string>
     <string name="title_icalendar_decline">Ablehnen</string>
     <string name="title_icalendar_maybe">Vielleicht</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 103678d813..50d02f7dde 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_setup_error">Error</string>
     <string name="title_setup_export">Exportar ajustes</string>
     <string name="title_setup_import">Importar ajustes</string>
+    <string name="title_setup_export_do">Las cuentas de Gmail vinculadas a cuentas de Google en el dispositivo no se pueden exportar</string>
     <string name="title_setup_import_do">Las cuentas importadas serán añadidas sin sobreescribir las existentes</string>
     <string name="title_setup_password">Contraseña</string>
     <string name="title_setup_password_chars">La contraseña contiene caracteres de control o espacios en blanco</string>
@@ -365,6 +366,8 @@
     <string name="title_advanced_manage_keys">Administrar claves privadas</string>
     <string name="title_advanced_external_search">Permitir que otras aplicaciones busquen en mensajes</string>
     <string name="title_advanced_shortcuts">Mostrar contactos frecuentes en el menú compartir de Android</string>
+    <string name="title_advanced_conversation_actions">Sugerir acciones</string>
+    <string name="title_advanced_conversation_actions_replies">Sugerir textos de respuesta</string>
     <string name="title_advanced_fts">Crear índice de búsqueda</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d mensajes indexados (%3$s)</string>
     <string name="title_advanced_english">Forzar idioma inglés</string>
@@ -520,18 +523,18 @@
     <string name="title_synchronize_enabled">Sincronizar</string>
     <string name="title_delete_local">Eliminar mensajes locales</string>
     <string name="title_delete_browsed">Eliminar mensajes explorados/buscados</string>
-    <string name="title_empty_trash">Vaciar papelera</string>
-    <string name="title_empty_spam">Vaciar spam</string>
+    <string name="title_empty_trash">Vaciar papelera local</string>
+    <string name="title_empty_spam">Vaciar spam local</string>
     <string name="title_edit_properties">Editar propiedades</string>
     <string name="title_edit_rules">Editar reglas</string>
     <string name="title_create_channel">Crear canal de notificación</string>
     <string name="title_edit_channel">Editar canal de notificación</string>
     <string name="title_delete_channel">Eliminar canal de notificación</string>
     <string name="title_create_sub_folder">Crear subcarpeta</string>
-    <string name="title_empty_trash_ask">¿Eliminar todos los mensajes borrados permanentemente?</string>
-    <string name="title_empty_spam_ask">¿Eliminar todos los mensajes spam permanentemente?</string>
-    <string name="title_empty_trash_all_ask">¿Eliminar todos los mensajes en papelera de todas las cuentas permanentemente?</string>
-    <string name="title_empty_spam_all_ask">¿Eliminar permanentemente todos los mensajes de spam de todas las cuentas?</string>
+    <string name="title_empty_trash_ask">¿Borrar todos los mensajes de la papelera local permanentemente?</string>
+    <string name="title_empty_spam_ask">¿Borrar todos los mensajes de spam locales permanentemente?</string>
+    <string name="title_empty_trash_all_ask">¿Borrar permanentemente todos los mensajes locales eliminados de todas las cuentas?</string>
+    <string name="title_empty_spam_all_ask">¿Borrar permanentemente todos los mensajes de spam locales de todas las cuentas?</string>
     <string name="title_delete_operation">¿Eliminar operaciones con un mensaje de error?</string>
     <string name="title_delete_contacts">¿Eliminar todos los contactos locales?</string>
     <string name="title_no_operations">No hay operaciones pendientes</string>
@@ -1002,6 +1005,8 @@
     <string name="title_loading">Cargando &#8230;</string>
     <string name="title_set">Aplicar</string>
     <string name="title_fetching_again">Recuperando mensaje nuevamente del servidor</string>
+    <string name="title_conversation_actions">Acciones</string>
+    <string name="title_conversation_action_reply">Responder con: \'%1$s\'</string>
     <string name="title_icalendar_accept">Aceptar</string>
     <string name="title_icalendar_decline">Rechazar</string>
     <string name="title_icalendar_maybe">Tal vez</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index a899f043fa..12ca66c0fc 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -362,6 +362,8 @@
     <string name="title_advanced_manage_keys">Kudeatu gako pribatuak</string>
     <string name="title_advanced_external_search">Baimendu beste aplikazioei mezuetan bilatzea</string>
     <string name="title_advanced_shortcuts">Erakutsi maiz erabilitako kontaktuak Android partekatzeko menuan</string>
+    <string name="title_advanced_conversation_actions">Iradoki ekintzak</string>
+    <string name="title_advanced_conversation_actions_replies">Iradoki erantzuteko testuak</string>
     <string name="title_advanced_fts">Sortu bilaketa-indizea</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d mezu indexatuak (%3$s)</string>
     <string name="title_advanced_english">Behartu hizkuntza ingelesa</string>
@@ -516,18 +518,12 @@
     <string name="title_synchronize_enabled">Sinkronizatu</string>
     <string name="title_delete_local">Ezabatu mezu lokalak</string>
     <string name="title_delete_browsed">Ezabatu ikusitako/bilatutako mezuak</string>
-    <string name="title_empty_trash">Hustu zakarrontzia</string>
-    <string name="title_empty_spam">Hustu spama</string>
     <string name="title_edit_properties">Editatu propietateak</string>
     <string name="title_edit_rules">Editatu arauak</string>
     <string name="title_create_channel">Sortu jakinarazpen kanala</string>
     <string name="title_edit_channel">Editatu jakinarazpen kanala</string>
     <string name="title_delete_channel">Ezabatu jakinarazpen kanala</string>
     <string name="title_create_sub_folder">Sortu azpi-karpeta</string>
-    <string name="title_empty_trash_ask">Ezabatu zakarrontziko mezuak behin betiko?</string>
-    <string name="title_empty_spam_ask">Ezabatu spam mezuak behin betiko?</string>
-    <string name="title_empty_trash_all_ask">Ezabatu kontu guztietako zaborrontziko mezu guztiak behin betiko?</string>
-    <string name="title_empty_spam_all_ask">Ezabatu kontu guztietako spam mezu guztiak behin betiko?</string>
     <string name="title_delete_operation">Ezabatu errore mezua duten eragiketak?</string>
     <string name="title_delete_contacts">Ezabatu kontaktu lokal guztiak?</string>
     <string name="title_no_operations">Ez dago eragiketarik egiteke</string>
@@ -998,6 +994,8 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_loading">Kargatzen &#8230;</string>
     <string name="title_set">Ezarri</string>
     <string name="title_fetching_again">Mezua berriro zerbitzaritik jasotzen</string>
+    <string name="title_conversation_actions">Ekintzak</string>
+    <string name="title_conversation_action_reply">Erantzun honekin: \'%1$s\'</string>
     <string name="title_icalendar_accept">Onartu</string>
     <string name="title_icalendar_decline">Errefusatu</string>
     <string name="title_icalendar_maybe">Agian</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 85db6de50b..2bf92c635d 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -149,10 +149,8 @@
     <string name="title_advanced_browse">مرور پیام‌های روی سرور</string>
     <string name="title_synchronize_now">هم اکنون همگام سازی شود</string>
     <string name="title_delete_local">حذف پیام های داخلی</string>
-    <string name="title_empty_trash">خالی کردن سطل آشغال</string>
     <string name="title_edit_properties">ویرایش ویژگی‌ها</string>
     <string name="title_edit_rules">ویرایش دستورات</string>
-    <string name="title_empty_trash_ask">حذف همیشگی کلیه پیام‌های سطل آشغال؟</string>
     <string name="title_delete_operation">حذف عملیات با دریافت پیام خطا؟</string>
     <string name="title_no_operations">عملیاتی در انتظار وجود ندارد </string>
     <string name="title_folder_name">نام پوشه</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index c98e2de5d9..a1694e2154 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -161,6 +161,7 @@
     <string name="title_setup_error">Virhe</string>
     <string name="title_setup_export">Vie asetukset</string>
     <string name="title_setup_import">Tuo asetukset</string>
+    <string name="title_setup_export_do">Gmail-tilejä, jotka on linkitetty laitteen Google-tileihin, ei voi viedä</string>
     <string name="title_setup_import_do">Tuodut tilit lisätään korvaamatta olemassa olevia</string>
     <string name="title_setup_password">Salasana</string>
     <string name="title_setup_password_chars">Salasana sisältää ohjaus- tai tyhjätilamerkkejä</string>
@@ -362,6 +363,8 @@
     <string name="title_advanced_manage_keys">Hallinnoi yksityisiä avaimia</string>
     <string name="title_advanced_external_search">Salli muiden sovellusten hakea viesteistä</string>
     <string name="title_advanced_shortcuts">Näytä usein käytetyt yhteystiedot Androidin jakamisvalikossa</string>
+    <string name="title_advanced_conversation_actions">Ehdota toimintoja</string>
+    <string name="title_advanced_conversation_actions_replies">Ehdota vastaustekstejä</string>
     <string name="title_advanced_fts">Rakenna haun indeksi</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d viestiä indeksoitu (%3$s)</string>
     <string name="title_advanced_english">Pakota englannin kieli</string>
@@ -517,18 +520,16 @@
     <string name="title_synchronize_enabled">Synkronoi</string>
     <string name="title_delete_local">Poista paikalliset viestit</string>
     <string name="title_delete_browsed">Poista selatut/haetut viestit</string>
-    <string name="title_empty_trash">Tyhjennä roskakori</string>
-    <string name="title_empty_spam">Poista roskapostit</string>
+    <string name="title_empty_trash">Tyhjennä paikallinen roskakori</string>
+    <string name="title_empty_spam">Tyhjennä paikalliset roskapostit</string>
     <string name="title_edit_properties">Muokkaa ominaisuuksia</string>
     <string name="title_edit_rules">Muokkaa sääntöjä</string>
     <string name="title_create_channel">Luo ilmoituskanava</string>
     <string name="title_edit_channel">Muokkaa ilmoituskanavaa</string>
     <string name="title_delete_channel">Poista ilmoituskanava</string>
     <string name="title_create_sub_folder">Luo alikansio</string>
-    <string name="title_empty_trash_ask">Tyhjennetäänkö roskakori pysyvästi?</string>
-    <string name="title_empty_spam_ask">Poistetaanko kaikki roskapostit pysyvästi?</string>
-    <string name="title_empty_trash_all_ask">Tyhjennetäänkö pysyvästi kaikkien tilien roskakoreissa olevat viestit?</string>
-    <string name="title_empty_spam_all_ask">Tyhjennetäänkö pysyvästi kaikkien tilien roskapostiviestit?</string>
+    <string name="title_empty_trash_ask">Tyhjennetäänkö paikallinen roskakori pysyvästi?</string>
+    <string name="title_empty_spam_ask">Poistetaanko paikalliset roskapostit pysyvästi?</string>
     <string name="title_delete_operation">Poistetaanko toimenpiteet, joille on virheilmoitus?</string>
     <string name="title_delete_contacts">Poistetaanko kaikki paikalliset yhteystiedot?</string>
     <string name="title_no_operations">Ei odottavia toimenpiteitä</string>
@@ -999,6 +1000,8 @@
     <string name="title_loading">Ladataan &#8230;</string>
     <string name="title_set">Aseta</string>
     <string name="title_fetching_again">Haetaan viesti uudestaan palvelimelta</string>
+    <string name="title_conversation_actions">Toiminnot</string>
+    <string name="title_conversation_action_reply">Vastaa tekstillä: \'%1$s\'</string>
     <string name="title_icalendar_accept">Hyväksy</string>
     <string name="title_icalendar_decline">Hylkää</string>
     <string name="title_icalendar_maybe">Ehkä</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 65de9c681e..a66d27645a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_error">Erreur</string>
     <string name="title_setup_export">Exporter les paramètres</string>
     <string name="title_setup_import">Importer les paramètres</string>
+    <string name="title_setup_export_do">Les comptes Gmail liés aux comptes Google sur l\'appareil ne peuvent pas être exportés</string>
     <string name="title_setup_import_do">Les comptes importés seront ajoutés sans écraser les comptes existants</string>
     <string name="title_setup_password">Mot de passe</string>
     <string name="title_setup_password_chars">Le mot de passe contient des caractères de contrôle ou des espaces</string>
@@ -521,18 +522,18 @@
     <string name="title_synchronize_enabled">Synchroniser</string>
     <string name="title_delete_local">Supprimer les messages locaux</string>
     <string name="title_delete_browsed">Supprimer les messages consultés/recherchés</string>
-    <string name="title_empty_trash">Vider la corbeille</string>
-    <string name="title_empty_spam">Vider le dossier de spam</string>
+    <string name="title_empty_trash">Vider la corbeille locale</string>
+    <string name="title_empty_spam">Vider le spam local</string>
     <string name="title_edit_properties">Éditer les propriétés</string>
     <string name="title_edit_rules">Modifier les règles</string>
     <string name="title_create_channel">Créer un canal de notification</string>
     <string name="title_edit_channel">Modifier un canal de notification</string>
     <string name="title_delete_channel">Supprimer un canal de notification</string>
     <string name="title_create_sub_folder">Créer un sous-dossier</string>
-    <string name="title_empty_trash_ask">Supprimer définitivement tous les messages de la corbeille ?</string>
-    <string name="title_empty_spam_ask">Supprimer définitivement tous les messages indésirables ?</string>
-    <string name="title_empty_trash_all_ask">Supprimer définitivement tous les messages mis à la corbeille de tous les comptes ?</string>
-    <string name="title_empty_spam_all_ask">Supprimer définitivement tous les messages indésirables de tous les comptes ?</string>
+    <string name="title_empty_trash_ask">Supprimer définitivement tous les messages de la corbeille locale ?</string>
+    <string name="title_empty_spam_ask">Supprimer définitivement tous les spams locaux ?</string>
+    <string name="title_empty_trash_all_ask">Supprimer définitivement tous les messages de la corbeille locale de tous les comptes ?</string>
+    <string name="title_empty_spam_all_ask">Supprimer définitivement tous les messages de spam locaux de tous les comptes ?</string>
     <string name="title_delete_operation">Supprimer les opérations avec un message d\'erreur ?</string>
     <string name="title_delete_contacts">Supprimer tous les contacts locaux ?</string>
     <string name="title_no_operations">Aucune opération en attente</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index b22ca4a34c..67035da9ef 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -230,8 +230,6 @@
     <string name="title_no_password">Wachtwurd ûntbrekt</string>
     <string name="title_review">Resinsje</string>
     <string name="title_synchronize_enabled">Syngronisearje</string>
-    <string name="title_empty_trash">Lege jiskefet</string>
-    <string name="title_empty_spam">Spam leech</string>
     <string name="title_edit_rules">Bewurkje regel</string>
     <string name="title_folder_name">Map namme</string>
     <string name="title_display_name">Display namme</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index e928a54326..b2a2a8110f 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -514,18 +514,12 @@
     <string name="title_synchronize_enabled">Sinkroniziraj</string>
     <string name="title_delete_local">Izbrišite lokalne poruke</string>
     <string name="title_delete_browsed">Brisanje pregledanih / pretraženih poruka</string>
-    <string name="title_empty_trash">Isprazni Otpad</string>
-    <string name="title_empty_spam">Izprazni spam</string>
     <string name="title_edit_properties">Uredi svojstva</string>
     <string name="title_edit_rules">Uredi pravila</string>
     <string name="title_create_channel">Stvorite kanal obavijesti</string>
     <string name="title_edit_channel">Uredi kanal obavijesti</string>
     <string name="title_delete_channel">Izbriši kanal obavijesti</string>
     <string name="title_create_sub_folder">Stvori podmapu</string>
-    <string name="title_empty_trash_ask">Želite li trajno izbrisati sve poruke u otpadu?</string>
-    <string name="title_empty_spam_ask">Želite li trajno izbrisati sve poruke označene kao spam?</string>
-    <string name="title_empty_trash_all_ask">Želite li trajno izbrisati sve poruke u otpadu svih računa?</string>
-    <string name="title_empty_spam_all_ask">Trajno izbrisati sve neželjene poruke svih računa?</string>
     <string name="title_delete_operation">Brisanje operacija s porukom o pogrešci?</string>
     <string name="title_delete_contacts">Želite li izbrisati sve lokalne kontakte?</string>
     <string name="title_no_operations">Nema operacija na čekanju</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index eb0b94530c..5d1f411c08 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -460,18 +460,12 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_synchronize_all">Összesen üzenet szinkronizálása</string>
     <string name="title_synchronize_enabled">Szinkronizálás</string>
     <string name="title_delete_local">Helyi üzenetek törlése</string>
-    <string name="title_empty_trash">Kuka ürítése</string>
-    <string name="title_empty_spam">Spam kiürítése</string>
     <string name="title_edit_properties">Tulajdonságok szerkesztése</string>
     <string name="title_edit_rules">Szabályok szerkesztése</string>
     <string name="title_create_channel">Értesítési csatorna létrehozása</string>
     <string name="title_edit_channel">Értesítési csatorna szerkesztése</string>
     <string name="title_delete_channel">Értesítési csatorna törlése</string>
     <string name="title_create_sub_folder">Almappa létrehozása</string>
-    <string name="title_empty_trash_ask">Véglegesen törli a kuka tartalmát?</string>
-    <string name="title_empty_spam_ask">Véglegesen törli az összes spamet?</string>
-    <string name="title_empty_trash_all_ask">Véglegesen törli az összes fiókhoz tartozó, összes kuka tartalmát?</string>
-    <string name="title_empty_spam_all_ask">Véglegesen törli az összes fiókhoz tartozó, összes spamet?</string>
     <string name="title_delete_contacts">Törli a helyi névjegyzéket?</string>
     <string name="title_no_operations">Nincs végrehajtásra váró művelet</string>
     <string name="title_folder_name">Mappanév</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 11fc00208f..68181cbfb2 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_error">Errore</string>
     <string name="title_setup_export">Esporta impostazioni</string>
     <string name="title_setup_import">Importa impostazioni</string>
+    <string name="title_setup_export_do">Gli account Gmail collegati agli account Google sul dispositivo non possono essere esportati</string>
     <string name="title_setup_import_do">Gli account importati saranno aggiunti senza sovrascrivere quelli esistenti</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_chars">La password contiene caratteri di controllo o spazi vuoti</string>
@@ -521,18 +522,18 @@
     <string name="title_synchronize_enabled">Sincronizza</string>
     <string name="title_delete_local">Elimina i messaggi locali</string>
     <string name="title_delete_browsed">Elimina i messaggi sfogliati/ricercati</string>
-    <string name="title_empty_trash">Svuota cestino</string>
-    <string name="title_empty_spam">Svuota spam</string>
+    <string name="title_empty_trash">Svuota cestino locale</string>
+    <string name="title_empty_spam">Svuota spam locale</string>
     <string name="title_edit_properties">Modifica le proprietà</string>
     <string name="title_edit_rules">Modifica regole</string>
     <string name="title_create_channel">Crea un canale di notifica</string>
     <string name="title_edit_channel">Modifica canale di notifica</string>
     <string name="title_delete_channel">Elimina canale di notifica</string>
     <string name="title_create_sub_folder">Crea sottocartella</string>
-    <string name="title_empty_trash_ask">Eliminare definitivamente tutti i messaggi cestinati?</string>
-    <string name="title_empty_spam_ask">Eliminare tutti i messaggi spam definitivamente?</string>
-    <string name="title_empty_trash_all_ask">Eliminare definitivamente tutti i messaggi cestinati di tutti gli account?</string>
-    <string name="title_empty_spam_all_ask">Eliminare definitivamente tutti i messaggi di spam di tutti gli account?</string>
+    <string name="title_empty_trash_ask">Eliminare definitivamente tutti i messaggi cestinati localmente?</string>
+    <string name="title_empty_spam_ask">Eliminare definitivamente tutti i messaggi spam locali?</string>
+    <string name="title_empty_trash_all_ask">Eliminare definitivamente tutti i messaggi cestinati locali di tutti gli account?</string>
+    <string name="title_empty_spam_all_ask">Eliminare definitivamente tutti i messaggi di spam locali di tutti gli account?</string>
     <string name="title_delete_operation">Eliminare le operazioni con un messaggio di errore?</string>
     <string name="title_delete_contacts">Eliminare tutti i contatti locali?</string>
     <string name="title_no_operations">Nessuna operazione in sospeso</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index cb0db71284..a9c493a622 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -504,18 +504,12 @@ Microsoft Exchange WebサービスやMicrosoft ActiveSyncなどの非標準プ
     <string name="title_synchronize_enabled">同期</string>
     <string name="title_delete_local">ローカルのメッセージを削除</string>
     <string name="title_delete_browsed">閲覧/検索したメッセージを削除</string>
-    <string name="title_empty_trash">ゴミ箱を空にする</string>
-    <string name="title_empty_spam">迷惑メールを空にします</string>
     <string name="title_edit_properties">プロパティを編集</string>
     <string name="title_edit_rules">ルールを編集</string>
     <string name="title_create_channel">通知チャンネルを作成</string>
     <string name="title_edit_channel">通知チャンネルを編集</string>
     <string name="title_delete_channel">通知チャンネルを削除</string>
     <string name="title_create_sub_folder">サブフォルダーを作成</string>
-    <string name="title_empty_trash_ask">ゴミ箱にある全てのメッセージを完全に削除しますか？</string>
-    <string name="title_empty_spam_ask">全ての迷惑メールを完全に削除しますか？</string>
-    <string name="title_empty_trash_all_ask">全てのアカウントのゴミ箱メッセージを完全に削除しますか？</string>
-    <string name="title_empty_spam_all_ask">全てのアカウントの迷惑メールを完全に削除しますか？</string>
     <string name="title_delete_operation">エラーメッセージのある操作を削除しますか？</string>
     <string name="title_delete_contacts">ローカルにある全ての連絡先を削除しますか？</string>
     <string name="title_no_operations">保留中の操作は有りません</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 9c9852a690..505b3c4095 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -161,6 +161,7 @@
     <string name="title_setup_error">Fout</string>
     <string name="title_setup_export">Exporteer instellingen</string>
     <string name="title_setup_import">Importeer instellingen</string>
+    <string name="title_setup_export_do">Gmail accounts gekoppeld aan Google accounts op je toestel kunnen niet worden geëxporteerd</string>
     <string name="title_setup_import_do">Geïmporteerde accounts worden toegevoegd zonder de bestaande te overschrijven</string>
     <string name="title_setup_password">Wachtwoord</string>
     <string name="title_setup_password_chars">Wachtwoord bevat controle of witruimte tekens</string>
@@ -520,18 +521,18 @@
     <string name="title_synchronize_enabled">Synchroniseren</string>
     <string name="title_delete_local">Verwijder lokale berichten</string>
     <string name="title_delete_browsed">Verwijder gebladerde/gezochte berichten</string>
-    <string name="title_empty_trash">Prullenbak leegmaken</string>
-    <string name="title_empty_spam">Spam-map leegmaken</string>
+    <string name="title_empty_trash">Lokale prullenbak leegmaken</string>
+    <string name="title_empty_spam">Lokale spam leegmaken</string>
     <string name="title_edit_properties">Bewerk eigenschappen</string>
     <string name="title_edit_rules">Bewerk regels</string>
     <string name="title_create_channel">Meldingskanaal maken</string>
     <string name="title_edit_channel">Meldingskanaal wijzigen</string>
     <string name="title_delete_channel">Meldingskanaal verwijderen</string>
     <string name="title_create_sub_folder">Maak submap</string>
-    <string name="title_empty_trash_ask">Alle weggegooide berichten definitief verwijderen?</string>
-    <string name="title_empty_spam_ask">Alle spam berichten definitief verwijderen?</string>
-    <string name="title_empty_trash_all_ask">Alle weggegooide berichten van alle accounts definitief verwijderen?</string>
-    <string name="title_empty_spam_all_ask">Alle spamberichten van alle accounts permanent verwijderen?</string>
+    <string name="title_empty_trash_ask">Alle lokaal weggegooide berichten definitief verwijderen?</string>
+    <string name="title_empty_spam_ask">Alle lokale spam berichten definitief verwijderen?</string>
+    <string name="title_empty_trash_all_ask">Alle lokaal weggegooide berichten van alle accounts definitief verwijderen?</string>
+    <string name="title_empty_spam_all_ask">Alle lokale spamberichten van alle accounts permanent verwijderen?</string>
     <string name="title_delete_operation">Bewerkingen met een foutmelding verwijderen?</string>
     <string name="title_delete_contacts">Verwijder alle lokale contacten?</string>
     <string name="title_no_operations">Geen openstaande bewerkingen</string>
@@ -856,6 +857,7 @@
     <string name="title_legend_section_folders">Mappen</string>
     <string name="title_legend_section_messages">Berichten</string>
     <string name="title_legend_section_compose">Opstellen</string>
+    <string name="title_legend_section_keyboard">Toetsenbord</string>
     <string name="title_legend_oauth">OAuth autorisatie</string>
     <string name="title_legend_primary_connected">Account verbonden</string>
     <string name="title_legend_primary_disconnected">Account niet verbonden</string>
@@ -945,6 +947,16 @@
     <string name="title_legend_delete">Verwijderen</string>
     <string name="title_legend_count">Aantal</string>
     <string name="title_legend_folder_type">Maptype</string>
+    <string name="title_legend_enter">Openen</string>
+    <string name="title_legend_a">Archiveren</string>
+    <string name="title_legend_c">Opstellen</string>
+    <string name="title_legend_d">Prullenbak (verwijderen)</string>
+    <string name="title_legend_m">Menu (meerdere selecteren)</string>
+    <string name="title_legend_n">Volgende</string>
+    <string name="title_legend_p">Vorige</string>
+    <string name="title_legend_r">Beantwoorden</string>
+    <string name="title_legend_s">Selecteer/deselecteer</string>
+    <string name="title_legend_t">Focus tekst</string>
     <string name="title_hint_folder_actions">Druk lang op de map voor opties, zoals het toevoegen van een map aan het navigatiemenu voor snelle toegang</string>
     <string name="title_hint_folder_sync">Om het gebruik van de batterij en het netwerk te beperken, worden niet alle mappen en niet alle berichten standaard gesynchroniseerd</string>
     <string name="title_hint_support">Als u een vraag of een probleem heeft, gebruik dan het menu ondersteuning om hulp te krijgen</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index dafa355edf..1f0a7452ae 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_error">Feil</string>
     <string name="title_setup_export">Eksporter innstillingene</string>
     <string name="title_setup_import">Importer innstillinger</string>
+    <string name="title_setup_export_do">Gmail-kontoer som er koblet til Google-kontoer på enheten, kan ikke eksporteres</string>
     <string name="title_setup_import_do">Importerte kontoer vil bli lagt til uten å overskrive eksisterende</string>
     <string name="title_setup_password">Passord</string>
     <string name="title_setup_password_chars">Passord inneholder kontroll eller mellomromstegn</string>
@@ -521,18 +522,18 @@
     <string name="title_synchronize_enabled">Synkroniser</string>
     <string name="title_delete_local">Slett lokale meldinger</string>
     <string name="title_delete_browsed">Slett bladde/søkte meldinger</string>
-    <string name="title_empty_trash">Tøm papirkurven</string>
-    <string name="title_empty_spam">Tøm søppelpost</string>
+    <string name="title_empty_trash">Tøm lokalt søppel</string>
+    <string name="title_empty_spam">Tøm lokal spam</string>
     <string name="title_edit_properties">Redigere egenskaper</string>
     <string name="title_edit_rules">Redigere regler</string>
     <string name="title_create_channel">Opprett varselkanal</string>
     <string name="title_edit_channel">Rediger varselkanal</string>
     <string name="title_delete_channel">Slett varselkanal</string>
     <string name="title_create_sub_folder">Lag undermappe</string>
-    <string name="title_empty_trash_ask">Slett alle slettede meldinger permanent?</string>
-    <string name="title_empty_spam_ask">Vil du slette alle spam meldinger permanent?</string>
-    <string name="title_empty_trash_all_ask">Vil du slette alle papirkurvmeldinger på alle kontoer permanent?</string>
-    <string name="title_empty_spam_all_ask">Vil du slette alle spammeldinger på alle kontoer permanent?</string>
+    <string name="title_empty_trash_ask">Vil du slette alle lokale søppelmeldinger permanent?</string>
+    <string name="title_empty_spam_ask">Vil du slette alle lokale spammeldinger permanent?</string>
+    <string name="title_empty_trash_all_ask">Vil du slette alle lokale søppelmeldinger på alle kontoer permanent?</string>
+    <string name="title_empty_spam_all_ask">Vil du slette alle lokale spam-meldinger på alle kontoer permanent?</string>
     <string name="title_delete_operation">Slett operasjoner med en feilmelding?</string>
     <string name="title_delete_contacts">Slette alle lokale kontakter?</string>
     <string name="title_no_operations">Ingen ventende operasjoner</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index dafa355edf..1f0a7452ae 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_error">Feil</string>
     <string name="title_setup_export">Eksporter innstillingene</string>
     <string name="title_setup_import">Importer innstillinger</string>
+    <string name="title_setup_export_do">Gmail-kontoer som er koblet til Google-kontoer på enheten, kan ikke eksporteres</string>
     <string name="title_setup_import_do">Importerte kontoer vil bli lagt til uten å overskrive eksisterende</string>
     <string name="title_setup_password">Passord</string>
     <string name="title_setup_password_chars">Passord inneholder kontroll eller mellomromstegn</string>
@@ -521,18 +522,18 @@
     <string name="title_synchronize_enabled">Synkroniser</string>
     <string name="title_delete_local">Slett lokale meldinger</string>
     <string name="title_delete_browsed">Slett bladde/søkte meldinger</string>
-    <string name="title_empty_trash">Tøm papirkurven</string>
-    <string name="title_empty_spam">Tøm søppelpost</string>
+    <string name="title_empty_trash">Tøm lokalt søppel</string>
+    <string name="title_empty_spam">Tøm lokal spam</string>
     <string name="title_edit_properties">Redigere egenskaper</string>
     <string name="title_edit_rules">Redigere regler</string>
     <string name="title_create_channel">Opprett varselkanal</string>
     <string name="title_edit_channel">Rediger varselkanal</string>
     <string name="title_delete_channel">Slett varselkanal</string>
     <string name="title_create_sub_folder">Lag undermappe</string>
-    <string name="title_empty_trash_ask">Slett alle slettede meldinger permanent?</string>
-    <string name="title_empty_spam_ask">Vil du slette alle spam meldinger permanent?</string>
-    <string name="title_empty_trash_all_ask">Vil du slette alle papirkurvmeldinger på alle kontoer permanent?</string>
-    <string name="title_empty_spam_all_ask">Vil du slette alle spammeldinger på alle kontoer permanent?</string>
+    <string name="title_empty_trash_ask">Vil du slette alle lokale søppelmeldinger permanent?</string>
+    <string name="title_empty_spam_ask">Vil du slette alle lokale spammeldinger permanent?</string>
+    <string name="title_empty_trash_all_ask">Vil du slette alle lokale søppelmeldinger på alle kontoer permanent?</string>
+    <string name="title_empty_spam_all_ask">Vil du slette alle lokale spam-meldinger på alle kontoer permanent?</string>
     <string name="title_delete_operation">Slett operasjoner med en feilmelding?</string>
     <string name="title_delete_contacts">Slette alle lokale kontakter?</string>
     <string name="title_no_operations">Ingen ventende operasjoner</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 7be090ee43..4bed994945 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -538,18 +538,12 @@
     <string name="title_synchronize_enabled">Synchronizuj</string>
     <string name="title_delete_local">Usuń wiadomości lokalne</string>
     <string name="title_delete_browsed">Usuń przejrzane/przeszukane wiadomości</string>
-    <string name="title_empty_trash">Opróżnij kosz</string>
-    <string name="title_empty_spam">Opróżnij Spam</string>
     <string name="title_edit_properties">Edytuj właściwości</string>
     <string name="title_edit_rules">Edytuj reguły</string>
     <string name="title_create_channel">Utwórz kanał powiadomień</string>
     <string name="title_edit_channel">Edytuj kanał powiadomień</string>
     <string name="title_delete_channel">Usuń kanał powiadomień</string>
     <string name="title_create_sub_folder">Utwórz podfolder</string>
-    <string name="title_empty_trash_ask">Trwale usunąć wszystkie wiadomości z kosza?</string>
-    <string name="title_empty_spam_ask">Czy trwale usunąć wszystkie wiadomości - spam?</string>
-    <string name="title_empty_trash_all_ask">Usunąć wszystkie skasowane wiadomości z koszy dla wszystkich kont?</string>
-    <string name="title_empty_spam_all_ask">Usunąć wszystkie wiadomości spam dla wszystkich kont?</string>
     <string name="title_delete_operation">Usunąć działania z informacją o błędzie?</string>
     <string name="title_delete_contacts">Usunąć wszystkie lokalne kontakty?</string>
     <string name="title_no_operations">Nie ma oczekujących operacji</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index dccea7a675..7d1bfc1ed4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -468,18 +468,12 @@
     <string name="title_synchronize_enabled">Sincronizar</string>
     <string name="title_delete_local">Excluir mensagens locais</string>
     <string name="title_delete_browsed">Excluir mensagens navegadas/pesquisadas</string>
-    <string name="title_empty_trash">Esvaziar lixeira</string>
-    <string name="title_empty_spam">Esvaziar spam</string>
     <string name="title_edit_properties">Editar propriedades</string>
     <string name="title_edit_rules">Editar regras</string>
     <string name="title_create_channel">Criar canal de notificação</string>
     <string name="title_edit_channel">Editar canal de notificação</string>
     <string name="title_delete_channel">Excluir canal de notificação</string>
     <string name="title_create_sub_folder">Criar subpasta</string>
-    <string name="title_empty_trash_ask">Excluir todas as mensagens na lixeira permanentemente?</string>
-    <string name="title_empty_spam_ask">Excluir todas as mensagens de spam permanentemente?</string>
-    <string name="title_empty_trash_all_ask">Excluir todas as mensagens na lixeira de todas as contas permanentemente?</string>
-    <string name="title_empty_spam_all_ask">Excluir todas as mensagens de spam de todas as contas permanentemente?</string>
     <string name="title_delete_operation">Excluir operações com uma mensagem de erro?</string>
     <string name="title_delete_contacts">Excluir todos os contatos locais?</string>
     <string name="title_no_operations">Nenhuma operação pendente</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index ff10226fa3..b9c8efa576 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -523,18 +523,12 @@
     <string name="title_synchronize_enabled">Sincronizare</string>
     <string name="title_delete_local">Șterge mesajul local</string>
     <string name="title_delete_browsed">Șterge mesajele răsfoite/căutate</string>
-    <string name="title_empty_trash">Golire coș de gunoi</string>
-    <string name="title_empty_spam">Golire spam</string>
     <string name="title_edit_properties">Editare proprietăți</string>
     <string name="title_edit_rules">Editare reguli</string>
     <string name="title_create_channel">Creare canal de notificare</string>
     <string name="title_edit_channel">Editare canal de notificare</string>
     <string name="title_delete_channel">Șterge canal de notificare</string>
     <string name="title_create_sub_folder">Creează sub-dosar</string>
-    <string name="title_empty_trash_ask">Şterge permanent toate mesajele din coșul de gunoi?</string>
-    <string name="title_empty_spam_ask">Se șterg permanent toate mesajele spam?</string>
-    <string name="title_empty_trash_all_ask">Şterge permanent toate mesajele din coșul de gunoi pentru toate conturile?</string>
-    <string name="title_empty_spam_all_ask">Şterge permanent toate mesajele spam pentru toate conturile?</string>
     <string name="title_delete_operation">Se șterg operațiunile cu mesaj de eroare?</string>
     <string name="title_delete_contacts">Ștergeți toate contactele locale?</string>
     <string name="title_no_operations">Nici o operațiune în așteptare</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 322ac7c6da..d35fd00918 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -184,6 +184,7 @@
     <string name="title_setup_error">Ошибка</string>
     <string name="title_setup_export">Экспорт настроек</string>
     <string name="title_setup_import">Импорт настроек</string>
+    <string name="title_setup_export_do">Привязанные к устройству учётные записи Gmail не могут быть экспортированы</string>
     <string name="title_setup_import_do">Импортированные учётные записи будут добавлены без перезаписи существующих</string>
     <string name="title_setup_password">Пароль</string>
     <string name="title_setup_password_chars">Пароль содержит управляющие символы или пробелы</string>
@@ -386,6 +387,8 @@
     <string name="title_advanced_manage_keys">Управление приватными ключами</string>
     <string name="title_advanced_external_search">Разрешить другим приложениям искать в сообщениях</string>
     <string name="title_advanced_shortcuts">Показывать часто используемые контакты в меню \"Поделиться\" Android</string>
+    <string name="title_advanced_conversation_actions">Предлагать действия</string>
+    <string name="title_advanced_conversation_actions_replies">Предлагать ответы</string>
     <string name="title_advanced_fts">Строить индекс поиска</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d сообщений проиндексировано (%3$s)</string>
     <string name="title_advanced_english">Принудительно использовать английский язык</string>
@@ -541,18 +544,18 @@
     <string name="title_synchronize_enabled">Синхронизировать</string>
     <string name="title_delete_local">Удалить локальные сообщения</string>
     <string name="title_delete_browsed">Удалить просмотренные/найденные сообщения</string>
-    <string name="title_empty_trash">Очистить корзину</string>
-    <string name="title_empty_spam">Очистить \"Спам\"</string>
+    <string name="title_empty_trash">Очистить корзину на устройстве</string>
+    <string name="title_empty_spam">Очистить \"Спам\" на устройстве</string>
     <string name="title_edit_properties">Изменить свойства</string>
     <string name="title_edit_rules">Редактировать правила</string>
     <string name="title_create_channel">Создать канал уведомлений</string>
     <string name="title_edit_channel">Изменить канал уведомлений</string>
     <string name="title_delete_channel">Удалить канал уведомлений</string>
     <string name="title_create_sub_folder">Создать вложенную папку</string>
-    <string name="title_empty_trash_ask">Удалить все сообщения в корзине навсегда?</string>
-    <string name="title_empty_spam_ask">Удалить все сообщения в папке \"Спам\" навсегда?</string>
-    <string name="title_empty_trash_all_ask">Навсегда удалить все сообщения из корзин всех учётных записей?</string>
-    <string name="title_empty_spam_all_ask">Навсегда удалить весь спам из всех учётных записей?</string>
+    <string name="title_empty_trash_ask">Удалить все сообщения в корзине на устройстве навсегда?</string>
+    <string name="title_empty_spam_ask">Удалить все сообщения в папке \"Спам\" на устройстве навсегда?</string>
+    <string name="title_empty_trash_all_ask">Удалить все сообщения из корзин всех учётных записей на устройстве навсегда?</string>
+    <string name="title_empty_spam_all_ask">Удалить все сообщения из папок \"Спам\" всех учётных записей на устройстве навсегда?</string>
     <string name="title_delete_operation">Удалить операции с сообщением об ошибке?</string>
     <string name="title_delete_contacts">Удалить все локальные контакты?</string>
     <string name="title_no_operations">Нет операций в очереди</string>
@@ -1023,6 +1026,8 @@
     <string name="title_loading">Загрузка&#8230;</string>
     <string name="title_set">Применить</string>
     <string name="title_fetching_again">Заново загружаем сообщения с сервера</string>
+    <string name="title_conversation_actions">Действия</string>
+    <string name="title_conversation_action_reply">Ответить на: \'%1$s\'</string>
     <string name="title_icalendar_accept">Принять</string>
     <string name="title_icalendar_decline">Отклонить</string>
     <string name="title_icalendar_maybe">Возможно</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 2a1c110984..ce5db1b8c3 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -420,16 +420,12 @@
     <string name="title_synchronize_enabled">Синхронизуј</string>
     <string name="title_delete_local">Избриши локалне поруке</string>
     <string name="title_delete_browsed">Избриши прегледане/претражене</string>
-    <string name="title_empty_trash">Испразни отпад</string>
-    <string name="title_empty_spam">Испразни нежељене</string>
     <string name="title_edit_properties">Измени својства</string>
     <string name="title_edit_rules">Измени правила</string>
     <string name="title_create_channel">Направи канал за обавештавање</string>
     <string name="title_edit_channel">Измени канал за обавештавање</string>
     <string name="title_delete_channel">Избриши канал за обавештавање</string>
     <string name="title_create_sub_folder">Направи подфасциклу</string>
-    <string name="title_empty_trash_ask">Заувек обрисати све поруке из отпада?</string>
-    <string name="title_empty_spam_ask">Обрисати све нежељене поруке заувек?</string>
     <string name="title_delete_operation">Обриши операције са поруком о грешци?</string>
     <string name="title_delete_contacts">Обриши све локалне контакте?</string>
     <string name="title_no_operations">Нема операција на чекању</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 8d5fbd589e..1b44617b65 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -363,6 +363,8 @@
     <string name="title_advanced_manage_keys">Hantera privata nycklar</string>
     <string name="title_advanced_external_search">Tillåt andra appar att söka i meddelanden</string>
     <string name="title_advanced_shortcuts">Visa ofta använda kontakter i Android dela-menyn</string>
+    <string name="title_advanced_conversation_actions">Föreslå åtgärder</string>
+    <string name="title_advanced_conversation_actions_replies">Föreslå svarstext</string>
     <string name="title_advanced_fts">Bygg sökindex</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d meddelanden indexerade (%3$s)</string>
     <string name="title_advanced_english">Tvinga användning av engelska</string>
@@ -518,18 +520,12 @@
     <string name="title_synchronize_enabled">Synkronisera</string>
     <string name="title_delete_local">Ta bort lokala meddelanden</string>
     <string name="title_delete_browsed">Ta bort bläddrade/sökta meddelanden</string>
-    <string name="title_empty_trash">Töm papperskorgen</string>
-    <string name="title_empty_spam">Töm skräppost</string>
     <string name="title_edit_properties">Redigera egenskaper</string>
     <string name="title_edit_rules">Redigera regler</string>
     <string name="title_create_channel">Skapa aviseringskanal</string>
     <string name="title_edit_channel">Redigera aviseringskanal</string>
     <string name="title_delete_channel">Ta bort aviseringskanal</string>
     <string name="title_create_sub_folder">Skapa undermapp</string>
-    <string name="title_empty_trash_ask">Ta bort alla meddelanden i papperskorgen permanent?</string>
-    <string name="title_empty_spam_ask">Ta bort all skräppost permanent?</string>
-    <string name="title_empty_trash_all_ask">Ta bort alla borttagna meddelanden från alla konton permanent?</string>
-    <string name="title_empty_spam_all_ask">Ta bort all skräppost från alla konton permanent?</string>
     <string name="title_delete_operation">Ta bort åtgärder med ett felmeddelande?</string>
     <string name="title_delete_contacts">Ta bort alla lokala kontakter?</string>
     <string name="title_no_operations">Inga pågående operationer</string>
@@ -1000,6 +996,7 @@
     <string name="title_loading">Läser in &#8230;</string>
     <string name="title_set">Ställ in</string>
     <string name="title_fetching_again">Hämtar meddelande igen från servern</string>
+    <string name="title_conversation_actions">Åtgärder</string>
     <string name="title_icalendar_accept">Godkänn</string>
     <string name="title_icalendar_decline">Avfärda</string>
     <string name="title_icalendar_maybe">Kanske</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 4acf238f56..121a63fd16 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -488,18 +488,12 @@
     <string name="title_synchronize_enabled">Eşzamanlama</string>
     <string name="title_delete_local">Yerel iletileri sil</string>
     <string name="title_delete_browsed">Gözatılmış/aranmış iletileri sil</string>
-    <string name="title_empty_trash">Çöpü boşalt</string>
-    <string name="title_empty_spam">Spam kutusunu boşalt</string>
     <string name="title_edit_properties">Özellikleri düzenle</string>
     <string name="title_edit_rules">Kuralları düzenle</string>
     <string name="title_create_channel">Bildirim kanalı oluştur</string>
     <string name="title_edit_channel">Bildirim kanalını düzenle</string>
     <string name="title_delete_channel">Bildirim kanalını sil</string>
     <string name="title_create_sub_folder">Alt dizin oluştur</string>
-    <string name="title_empty_trash_ask">Çöpe atılmış tüm iletiler kalıcı olarak silinsin mi?</string>
-    <string name="title_empty_spam_ask">Tüm spam mesajlarını kalıcı olarak sil?</string>
-    <string name="title_empty_trash_all_ask">Tüm hesapların çöp kutusuna gönderilen tüm iletileri kalıcı olarak silinsin mi?</string>
-    <string name="title_empty_spam_all_ask">Tüm hesapların tüm spam iletileri kalıcı olarak silinsin mi?</string>
     <string name="title_delete_operation">Hata iletisi olan işlemler silinsin mi?</string>
     <string name="title_delete_contacts">Tüm yerel rehber silinsin mi?</string>
     <string name="title_no_operations">Bekleyen işlem yok</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c274421eb8..145846ed14 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -97,10 +97,10 @@
     <string name="title_edit_folder">编辑文件夹</string>
     <string name="title_setup">设置</string>
     <string name="title_setup_help">帮助</string>
-    <string name="title_setup_welcome">接收和发送消息需要像在其他邮件 app 中一样设置一个帐户和一个身份
-“快速设置”通过询问您的姓名、邮箱地址和密码来创建一个帐户和身份
-如果有需要，也可以手动设置帐户和身份(别名)
-不支持非标准协议，例如 Microsoft Exchange Web Services 和 Microsoft ActiveSync，另请参阅应用程序说明
+    <string name="title_setup_welcome">接收和发送消息需要像在其他邮件 app 中一样设置一个帐户和一个身份；
+        “快速设置”将仅通过询问您的姓名、邮箱地址和密码来创建一个帐户和身份；
+        如果有需要，也可以手动设置帐户和身份(别名)；
+        不支持非标准协议，例如 Microsoft Exchange Web Services 和 Microsoft ActiveSync，另请参阅应用程序说明
     </string>
     <string name="title_setup_quick">快速设置</string>
     <string name="title_setup_quick_remark">为大多数邮件服务提供商快速设置账户和身份</string>
@@ -150,6 +150,7 @@
     <string name="title_setup_error">出错</string>
     <string name="title_setup_export">导出设置</string>
     <string name="title_setup_import">导入设置</string>
+    <string name="title_setup_export_do">与设备上的Google帐户相连接的Gmail帐户无法被导出</string>
     <string name="title_setup_import_do">导入的账户不会覆盖任何现有的帐户</string>
     <string name="title_setup_password">密码</string>
     <string name="title_setup_password_chars">密码包含控制字符或空格字符</string>
@@ -509,18 +510,18 @@
     <string name="title_synchronize_enabled">同步</string>
     <string name="title_delete_local">删除本地消息</string>
     <string name="title_delete_browsed">删除浏览过/搜索过的消息</string>
-    <string name="title_empty_trash">清空回收站</string>
-    <string name="title_empty_spam">清空垃圾邮件</string>
+    <string name="title_empty_trash">清空本地回收站</string>
+    <string name="title_empty_spam">清空本地垃圾邮件</string>
     <string name="title_edit_properties">编辑属性</string>
     <string name="title_edit_rules">编辑规则</string>
     <string name="title_create_channel">创建通知通道</string>
     <string name="title_edit_channel">编辑通知通道</string>
     <string name="title_delete_channel">删除通知通道</string>
     <string name="title_create_sub_folder">创建子文件夹</string>
-    <string name="title_empty_trash_ask">是否永久删除所有垃圾邮件？</string>
-    <string name="title_empty_spam_ask">永久删除所有垃圾邮件？</string>
-    <string name="title_empty_trash_all_ask">永久删除所有账户的所有回收站消息？</string>
-    <string name="title_empty_spam_all_ask">永久删除所有帐户的所有垃圾邮件？</string>
+    <string name="title_empty_trash_ask">永久删除所有本地的已删除邮件吗？</string>
+    <string name="title_empty_spam_ask">永久删除所有本地垃圾邮件吗？</string>
+    <string name="title_empty_trash_all_ask">永久删除所有帐户的所有本地的已删除邮件吗？</string>
+    <string name="title_empty_spam_all_ask">永久删除所有帐户的所有本地垃圾邮件吗？</string>
     <string name="title_delete_operation">是否删除带有错误消息的操作？</string>
     <string name="title_delete_contacts">删除所有本地联系人？</string>
     <string name="title_no_operations">没有待执行操作</string>
@@ -992,7 +993,7 @@
     <string name="title_set">设定</string>
     <string name="title_fetching_again">再次从服务器获取消息</string>
     <string name="title_conversation_actions">操作</string>
-    <string name="title_conversation_action_reply">以 \'%1$s\' 开头进行回复</string>
+    <string name="title_conversation_action_reply">回复：\'%1$s\'</string>
     <string name="title_icalendar_accept">接受</string>
     <string name="title_icalendar_decline">拒绝</string>
     <string name="title_icalendar_maybe">待定</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a67bebabe9..9197bdb53b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1074,8 +1074,8 @@
     <string name="title_legend_enter">Open</string>
     <string name="title_legend_a">Archive</string>
     <string name="title_legend_c">Compose</string>
-    <string name="title_legend_d">Trash</string>
-    <string name="title_legend_m">Menu</string>
+    <string name="title_legend_d">Trash (delete)</string>
+    <string name="title_legend_m">Menu (multiple select)</string>
     <string name="title_legend_n">Next</string>
     <string name="title_legend_p">Previous</string>
     <string name="title_legend_r">Reply</string>