diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 2676ebb739..4d13c775ff 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -147,7 +147,6 @@
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
     <string name="title_no_password">كلمة المرور مفقودة</string>
-    <string name="title_no_drafts">لا يوجد مجلد المسودات مختارة</string>
     <string name="title_no_primary_drafts">لا يوجد حساب أساسي أو لا مجلد المسودات</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 2676ebb739..4d13c775ff 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -147,7 +147,6 @@
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
     <string name="title_no_password">كلمة المرور مفقودة</string>
-    <string name="title_no_drafts">لا يوجد مجلد المسودات مختارة</string>
     <string name="title_no_primary_drafts">لا يوجد حساب أساسي أو لا مجلد المسودات</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 2676ebb739..4d13c775ff 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -147,7 +147,6 @@
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
     <string name="title_no_password">كلمة المرور مفقودة</string>
-    <string name="title_no_drafts">لا يوجد مجلد المسودات مختارة</string>
     <string name="title_no_primary_drafts">لا يوجد حساب أساسي أو لا مجلد المسودات</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 2676ebb739..4d13c775ff 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -147,7 +147,6 @@
     <string name="title_no_host">اسم المضيف مفقود</string>
     <string name="title_no_user">اسم المستخدم مفقود</string>
     <string name="title_no_password">كلمة المرور مفقودة</string>
-    <string name="title_no_drafts">لا يوجد مجلد المسودات مختارة</string>
     <string name="title_no_primary_drafts">لا يوجد حساب أساسي أو لا مجلد المسودات</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 139ebedbdd..afdc00eb49 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -154,7 +154,6 @@
     <string name="title_no_host">Host adı əskikdir</string>
     <string name="title_no_user">İstifadəçi adı əskikdir</string>
     <string name="title_no_password">Şifrə əskikdir</string>
-    <string name="title_no_drafts">Heç bir qaralama qovluğu seçilmədi</string>
     <string name="title_no_primary_drafts">Üstünlük verilən hesab və ya qaralama qovluğu yoxdur</string>
     <string name="title_no_idle">Bu təchizatçı ani mesajları dəstəkləmir. Bu, yeni mesajların alınmasını gecikdirəcək və batareyanın istifadəsini artıracaq.</string>
     <string name="title_account_delete">Bu hesab birdəfəlik silinsin?</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 7058546c7a..6430f84972 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -196,7 +196,6 @@
     <string name="title_no_user">Benutzername fehlt</string>
     <string name="title_no_password">Passwort fehlt</string>
     <string name="title_no_inbox">Posteingang nicht gefunden</string>
-    <string name="title_no_drafts">Kein Entwürfe-Ordner ausgewählt</string>
     <string name="title_no_primary_drafts">Kein Hauptkonto oder kein Entwürfe-Ordner</string>
     <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_sync">Synchronisationsfehler seit %1$s</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 66aed72483..876f0255b0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -196,7 +196,6 @@
     <string name="title_no_user">Falta nombre de usuario</string>
     <string name="title_no_password">Falta contraseña</string>
     <string name="title_no_inbox">Bandeja de entrada no encontrada</string>
-    <string name="title_no_drafts">No se seleccionó la carpeta de borradores</string>
     <string name="title_no_primary_drafts">No hay cuenta primaria o no hay carpeta de borradores</string>
     <string name="title_no_idle">Este proveedor no soporta mensajes PUSH. Esto retrasará la recepción de nuevos mensajes y aumentará el uso de batería.</string>
     <string name="title_no_sync">Errores de sincronización desde %1$s</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 46f39158a0..f500a660bf 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -196,7 +196,6 @@
     <string name="title_no_user">Nom d\'utilisateur manquant</string>
     <string name="title_no_password">Mot de passe manquant</string>
     <string name="title_no_inbox">Boîte de réception introuvable</string>
-    <string name="title_no_drafts">Aucun dossier Brouillons sélectionné</string>
     <string name="title_no_primary_drafts">Pas de compte principal ou pas de dossier Brouillons</string>
     <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_sync">Erreurs de synchronisation depuis %1$s</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 46835dd9fb..2e57459f3f 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -195,7 +195,7 @@
     <string name="title_no_host">Nome dell\'host mancante</string>
     <string name="title_no_user">Nome utente mancante</string>
     <string name="title_no_password">Password mancante</string>
-    <string name="title_no_drafts">Nessuna cartella bozze selezionata</string>
+    <string name="title_no_inbox">Posta in arrivo non trovata</string>
     <string name="title_no_primary_drafts">Nessun account principale o nessuna cartella bozze</string>
     <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_sync">Errori di sincronizzazione da %1$s</string>
@@ -359,6 +359,7 @@
     <string name="title_rule_regex">Regex</string>
     <string name="title_rule_and">E</string>
     <string name="title_rule_action">Azione</string>
+    <string name="title_rule_action_remark">Questa azione verrà applicata ai nuovi messaggi in arrivo nella cartella %1$s</string>
     <string name="title_rule_folder">Cartella</string>
     <string name="title_rule_identity">Identità</string>
     <string name="title_rule_answer">Modello di risposta</string>
@@ -376,21 +377,38 @@
     <string name="title_legend_primary_disconnected">Account disconnesso</string>
     <string name="title_legend_primary_connected">Account connesso</string>
     <string name="title_legend_thread">Conversazione</string>
+    <string name="title_legend_zoom">Cambia dimensione testo</string>
+    <string name="title_legend_draft">Ha bozza</string>
+    <string name="title_legend_snoozed">È posticipato</string>
+    <string name="title_legend_browsed">È browser o ricercato</string>
+    <string name="title_legend_answered">Ha ricevuto risposta</string>
+    <string name="title_legend_attachment">Ha allegato</string>
+    <string name="title_legend_flagged">È preferito</string>
+    <string name="title_legend_contacts">Gestisci contatti</string>
     <string name="title_legend_view">Mostra il contenuto</string>
     <string name="title_legend_download">Scarica il contenuto</string>
     <string name="title_legend_external_image">Segnaposto immagine esterna</string>
     <string name="title_legend_embedded_image">Segnaposto immagine incorporata</string>
     <string name="title_legend_broken_image">Immagine spezzata</string>
+    <string name="title_legend_cc">Mostra CC/CCN</string>
+    <string name="title_legend_pick">Scegli contatto</string>
+    <string name="title_legend_bold">Rendi il testo grassetto</string>
+    <string name="title_legend_italic">Rendi il testo corsivo</string>
+    <string name="title_legend_link">Inserisci collegamento</string>
+    <string name="title_legend_picture">Inserisci immagine</string>
+    <string name="title_legend_file">Allega file</string>
     <string name="title_legend_download_off">Scarica il contenuto del messaggio su richiesta </string>
     <string name="title_legend_download_on">Scarica il contenuto del messaggio automaticamente</string>
     <string name="title_legend_synchronize_on">Sincronizzazione ON</string>
     <string name="title_legend_synchronize_off">Sincronizzazione OFF</string>
+    <string name="title_legend_primary">Principale</string>
     <string name="title_legend_disconnected">Disconnesso</string>
     <string name="title_legend_connecting">Connessione in corso</string>
     <string name="title_legend_connected">Connesso</string>
     <string name="title_legend_synchronizing">Sincronizzazione</string>
     <string name="title_legend_downloading">Scaricamento</string>
     <string name="title_legend_closing">Chiusura</string>
+    <string name="title_legend_waiting">In attesa della prossima sincronizzazione</string>
     <string name="title_legend_stop">Interrompi le regole di elaborazione</string>
     <string name="title_legend_sync_keep">Numero di giorni da sincronizzare / di cui mantenere i messaggi</string>
     <string name="title_legend_download_fetch">Numero di corpi messaggio scaricati / intestazioni recuperate</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index fd209bba9a..4f4404caa7 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -196,10 +196,10 @@
     <string name="title_no_user">Gebruikersnaam ontbreekt</string>
     <string name="title_no_password">Wachtwoord ontbreekt</string>
     <string name="title_no_inbox">Postvak in niet gevonden</string>
-    <string name="title_no_drafts">Geen concepten map geslecteerd</string>
     <string name="title_no_primary_drafts">Geen primair account of geen map voor concepten</string>
     <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_sync">Synchronisatiefouten sinds %1$s</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>
     <string name="title_identity_delete">Verwijder deze identiteit permanent?</string>
     <string name="title_pop">POP wordt niet ondersteund</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 517c1fb980..ac85172d60 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -185,7 +185,6 @@
     <string name="title_no_host">Brak nazwy hosta</string>
     <string name="title_no_user">Brak nazwy użytkownika</string>
     <string name="title_no_password">Brak hasła</string>
-    <string name="title_no_drafts">Nie wybrano folderu szkiców</string>
     <string name="title_no_primary_drafts">Brak konta podstawowego lub brak folderu szkiców</string>
     <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_sync">Błędy synchornizacji od %1$s</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0e3e771f8e..6237436941 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -118,7 +118,6 @@
     <string name="title_no_host">Nome do servidor faltante</string>
     <string name="title_no_user">Nome do usuário faltante</string>
     <string name="title_no_password">Senha faltante</string>
-    <string name="title_no_drafts">Nenhuma pasta de rascunhos selecionada</string>
     <string name="title_no_primary_drafts">Nenhuma conta primária ou pasta de rascunhos</string>
     <string name="title_account_delete">Excluir esta conta permanentemente?</string>
     <string name="title_identity_delete">Excluir esta identidade 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 14439ba8b8..019d551d3b 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -203,7 +203,6 @@
     <string name="title_no_host">Lipsește numele serverului</string>
     <string name="title_no_user">Lipsește numele de utilizator</string>
     <string name="title_no_password">Lipsește parola</string>
-    <string name="title_no_drafts">Nici un folder selectat pentru ciorne</string>
     <string name="title_no_primary_drafts">Nici un cont principal sau nici un dosar pentru ciorne</string>
     <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_sync">Erori de sincronizare începând cu %1$s</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index e6b057549a..d85b1d6fdc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -212,7 +212,6 @@
     <string name="title_no_user">Отсутствует имя пользователя</string>
     <string name="title_no_password">Пароль отсутствует</string>
     <string name="title_no_inbox">Папка \"Входящие\" не найдена</string>
-    <string name="title_no_drafts">Папка черновиков не выбрана</string>
     <string name="title_no_primary_drafts">Нет основной учетной записи или папки с черновиками</string>
     <string name="title_no_idle">Этот провайдер не поддерживает push-сообщения. Это задержит прием новых сообщений и увеличит расход батареи.</string>
     <string name="title_no_sync">Ошибки синхронизации после %1$s</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 28d9da2041..c6f4da11e1 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -192,7 +192,6 @@
     <string name="title_no_host">Värdnamn saknas</string>
     <string name="title_no_user">Användarnamn saknas</string>
     <string name="title_no_password">Lösenord saknas</string>
-    <string name="title_no_drafts">Ingen utkastmapp vald</string>
     <string name="title_no_primary_drafts">Inget primärt konto eller ingen utkastmapp</string>
     <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_sync">Synkroniseringsfel sedan %1$s</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index a48aa752c3..1af26a7dda 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -191,7 +191,6 @@
     <string name="title_no_user">Kullanıcı adı eksik</string>
     <string name="title_no_password">Parola Eksik</string>
     <string name="title_no_inbox">Gelen kutusu bulunamadı</string>
-    <string name="title_no_drafts">Taslaklar klasörü seçilmedi</string>
     <string name="title_no_primary_drafts">Birincil hesap veya taslak klasörü yok</string>
     <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_sync">%1$s\'den beri eşzamanlama hataları</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e4cb71a774..d3074fe0d7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -148,7 +148,6 @@
     <string name="title_no_host">缺少主机名称</string>
     <string name="title_no_user">缺少用户名</string>
     <string name="title_no_password">缺少密码</string>
-    <string name="title_no_drafts">未选择草稿文件夹</string>
     <string name="title_no_primary_drafts">没有主帐户或草稿文件夹</string>
     <string name="title_no_idle">该提供商不支持消息推送，这将延迟新消息的接收并增加电池用量</string>
     <string name="title_account_delete">确定永久删除这个账户吗？</string>