diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 85c18c95b4..b50d73293a 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -51,10 +51,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' فشل</string>
     <string name="menu_setup">اعداد</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">عمليات</string>
     <string name="menu_legend">أسطورة</string>
-    <string name="menu_faq">أسئلة وأجوبة/الدعم</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">ميزات النسخة الكاملة</string>
     <string name="menu_privacy">الخصوصية</string>
     <string name="menu_about">حول</string>
@@ -73,7 +73,7 @@
     <string name="title_setup">اعداد</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
@@ -136,6 +136,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -193,6 +194,7 @@
     <string name="title_flag">إضافة نجمة</string>
     <string name="title_unflag">إزالة نجمة</string>
     <string name="title_forward">إعادة توجيه</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">الرد على الكل</string>
     <string name="title_show_headers">عرض العنوان الرأسي</string>
     <string name="title_show_html">إظهار المنشور الأصلي</string>
@@ -214,6 +216,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 85c18c95b4..b50d73293a 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -51,10 +51,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' فشل</string>
     <string name="menu_setup">اعداد</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">عمليات</string>
     <string name="menu_legend">أسطورة</string>
-    <string name="menu_faq">أسئلة وأجوبة/الدعم</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">ميزات النسخة الكاملة</string>
     <string name="menu_privacy">الخصوصية</string>
     <string name="menu_about">حول</string>
@@ -73,7 +73,7 @@
     <string name="title_setup">اعداد</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
@@ -136,6 +136,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -193,6 +194,7 @@
     <string name="title_flag">إضافة نجمة</string>
     <string name="title_unflag">إزالة نجمة</string>
     <string name="title_forward">إعادة توجيه</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">الرد على الكل</string>
     <string name="title_show_headers">عرض العنوان الرأسي</string>
     <string name="title_show_html">إظهار المنشور الأصلي</string>
@@ -214,6 +216,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 85c18c95b4..b50d73293a 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -51,10 +51,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' فشل</string>
     <string name="menu_setup">اعداد</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">عمليات</string>
     <string name="menu_legend">أسطورة</string>
-    <string name="menu_faq">أسئلة وأجوبة/الدعم</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">ميزات النسخة الكاملة</string>
     <string name="menu_privacy">الخصوصية</string>
     <string name="menu_about">حول</string>
@@ -73,7 +73,7 @@
     <string name="title_setup">اعداد</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
@@ -136,6 +136,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -193,6 +194,7 @@
     <string name="title_flag">إضافة نجمة</string>
     <string name="title_unflag">إزالة نجمة</string>
     <string name="title_forward">إعادة توجيه</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">الرد على الكل</string>
     <string name="title_show_headers">عرض العنوان الرأسي</string>
     <string name="title_show_html">إظهار المنشور الأصلي</string>
@@ -214,6 +216,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 85c18c95b4..b50d73293a 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -51,10 +51,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' فشل</string>
     <string name="menu_setup">اعداد</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">عمليات</string>
     <string name="menu_legend">أسطورة</string>
-    <string name="menu_faq">أسئلة وأجوبة/الدعم</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">ميزات النسخة الكاملة</string>
     <string name="menu_privacy">الخصوصية</string>
     <string name="menu_about">حول</string>
@@ -73,7 +73,7 @@
     <string name="title_setup">اعداد</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
@@ -136,6 +136,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -193,6 +194,7 @@
     <string name="title_flag">إضافة نجمة</string>
     <string name="title_unflag">إزالة نجمة</string>
     <string name="title_forward">إعادة توجيه</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">الرد على الكل</string>
     <string name="title_show_headers">عرض العنوان الرأسي</string>
     <string name="title_show_html">إظهار المنشور الأصلي</string>
@@ -214,6 +216,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 85c18c95b4..b50d73293a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -51,10 +51,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' فشل</string>
     <string name="menu_setup">اعداد</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">عمليات</string>
     <string name="menu_legend">أسطورة</string>
-    <string name="menu_faq">أسئلة وأجوبة/الدعم</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">ميزات النسخة الكاملة</string>
     <string name="menu_privacy">الخصوصية</string>
     <string name="menu_about">حول</string>
@@ -73,7 +73,7 @@
     <string name="title_setup">اعداد</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
@@ -136,6 +136,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -193,6 +194,7 @@
     <string name="title_flag">إضافة نجمة</string>
     <string name="title_unflag">إزالة نجمة</string>
     <string name="title_forward">إعادة توجيه</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">الرد على الكل</string>
     <string name="title_show_headers">عرض العنوان الرأسي</string>
     <string name="title_show_html">إظهار المنشور الأصلي</string>
@@ -214,6 +216,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 30381a8e53..2ce2b9503f 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' uğursuz oldu</string>
     <string name="menu_setup">Quraşdırma</string>
-    <string name="menu_answers">Cavab şablonları</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Əməliyyatlar</string>
     <string name="menu_legend">Mənalar</string>
-    <string name="menu_faq">TSS/dəstək</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro xüsusiyyətlər</string>
     <string name="menu_privacy">Gizlilik</string>
     <string name="menu_about">Haqqında</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Quraşdırma</string>
     <string name="title_setup_export">Tənzimləmələri ixrac et</string>
     <string name="title_setup_import">Tənzimləmələri idxal et</string>
-    <string name="title_setup_export_do">Hesablar və kimliklər şifrəsiz ixrac ediləcək</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">İdxal edilmiş hesablar əlavə ediləcək, üzərinə yazılmayacaq</string>
     <string name="title_setup_exported">Tənzimləmələr ixrac edildi</string>
     <string name="title_setup_imported">Tənzimləmələr idxal edildi</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Hesaba səlahiyyət verilir &#8230;</string>
     <string name="title_setup_advanced">Qabaqcıl</string>
     <string name="title_store_sent">Göndərilən mesajları saxla (normalda ehtiyac yoxdur)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Eyniləşdir (mesajları al)</string>
     <string name="title_synchronize_identity">Eyniləşdir (mesajları göndər)</string>
     <string name="title_primary_account">Üstünlük verilən (ilkin hesab)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Ulduz əlavə et</string>
     <string name="title_unflag">Ulduzu çıxart</string>
     <string name="title_forward">Yönləndir</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Hamısını cavabla</string>
     <string name="title_show_headers">Başlıqları göstər</string>
     <string name="title_show_html">Həqiqisini göstər</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Seçilmiş mesajlar birdəfəlik silinsin?</string>
     <string name="title_ask_delete_answer">Cavab şablonu birdəfəlik silinsin?</string>
     <string name="title_ask_discard">Qaralama silinsin?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Mesajı spam kimi bildirilsin?</string>
     <string name="title_ask_show_html">Orijinal mesajın göstərilməsi, gizlilik həssaslı məlumatları sızdıra bilər</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 38e72a4b3e..16a3dc02eb 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">%1$s ha fallat</string>
     <string name="menu_setup">Configuració</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operacions</string>
     <string name="menu_legend">Llegenda</string>
-    <string name="menu_faq">Preguntes freqüents/suport</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Característiques Pro</string>
     <string name="menu_privacy">Privadesa</string>
     <string name="menu_about">Quant a</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Configuració</string>
     <string name="title_setup_export">Exporta la configuració</string>
     <string name="title_setup_import">Importa una configuració</string>
-    <string name="title_setup_export_do">Els comptes i identitats seran exportats sense contrasenyes</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Els comptes importats no es sobreescriuran</string>
     <string name="title_setup_exported">Configuració exportada</string>
     <string name="title_setup_imported">Configuració importada</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Autoritzant compte &#8230;</string>
     <string name="title_setup_advanced">Avançat</string>
     <string name="title_store_sent">Emmagatzema missatges enviats (normalment no és necessari)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Sincronitza (rebre missatges)</string>
     <string name="title_synchronize_identity">Sincronitza (envia missatges)</string>
     <string name="title_primary_account">Primària (compte per defecte)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Afegeix a destacats</string>
     <string name="title_unflag">Treure de destacats</string>
     <string name="title_forward">Següent</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Respon a tots</string>
     <string name="title_show_headers">Mostra les capçaleres</string>
     <string name="title_show_html">Veure l\'original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Voleu rebutjar l\'esborrany?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Qualificar el missatge com correu brossa?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 01ad587a43..8dd83cec6c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -41,10 +41,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -63,7 +63,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -126,6 +126,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -183,6 +184,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -204,6 +206,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 55ea8363d3..03905e522a 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' mislykkedes</string>
     <string name="menu_setup">Opsætning</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Aktiviteter</string>
     <string name="menu_legend">Forklaring</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro funktioner</string>
     <string name="menu_privacy">Privatliv</string>
     <string name="menu_about">Om</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Opsætning</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synkronisér (modtag meddelelser)</string>
     <string name="title_synchronize_identity">Synkronisér (send meddelelser)</string>
     <string name="title_primary_account">Primær (standard konto)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Videresend</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Svar alle</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Rapportér meddelelse som spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 465ca35034..e62245c630 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' fehlgeschlagen</string>
     <string name="menu_setup">Einstellungen</string>
-    <string name="menu_answers">Antwortvorlagen</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Vorgänge</string>
     <string name="menu_legend">Legende</string>
-    <string name="menu_faq">FAQ/Hilfe</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro-Funktionen</string>
     <string name="menu_privacy">Datenschutz</string>
     <string name="menu_about">Über</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Einstellungen</string>
     <string name="title_setup_export">Einstellungen exportieren</string>
     <string name="title_setup_import">Einstellungen importieren</string>
-    <string name="title_setup_export_do">Konten und Identitäten werden ohne Kennwörter exportiert</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Importierte Konten werden hinzugefügt, nicht überschrieben</string>
     <string name="title_setup_exported">Einstellungen exportiert</string>
     <string name="title_setup_imported">Einstellungen importiert</string>
@@ -83,7 +83,7 @@
     <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_swipe">Wischgesten</string>
     <string name="title_advanced_nav">Vorherige/nächste E-Mail Navigation</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">Aktionen bestätigen, die datenschutzrelevante Information preisgeben können</string>
     <string name="title_advanced_sender">Bearbeitung der Absenderadresse erlauben</string>
     <string name="title_advanced_sender_hint">Die meisten Anbieter erlauben keine veränderten Absenderadressen</string>
     <string name="title_advanced_download">Automatisches Herunterladen von E-Mails und Anhängen auf getakteten Verbindungen bis zu einer Größe von</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Autorisieren Konto &#8230;</string>
     <string name="title_setup_advanced">Erweitert</string>
     <string name="title_store_sent">Gesendete E-Mails speichern (normalerweise nicht nötig)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronisiere (empfange E-Mails)</string>
     <string name="title_synchronize_identity">Synchronisiere (sende E-Mails)</string>
     <string name="title_primary_account">Primäres Konto</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Als Favorit markieren</string>
     <string name="title_unflag">Von Favoriten entfernen</string>
     <string name="title_forward">Weiterleiten</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Antworten an alle</string>
     <string name="title_show_headers">Kopfzeile anzeigen</string>
     <string name="title_show_html">Original anzeigen</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Ausgewählte E-Mail(s) unwiderruflich löschen?</string>
     <string name="title_ask_delete_answer">Antwortvorlage unwiderruflich löschen?</string>
     <string name="title_ask_discard">Entwurf löschen?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Nachricht als Spam melden?</string>
     <string name="title_ask_show_html">Das Anzeigen der originalen Nachricht kann datenschutzrelevante Informationen preisgeben</string>
     <string name="title_ask_show_image">Das Anzeigen von Bildern kann datenschutzrelevante Informationen preisgeben</string>
@@ -266,7 +269,7 @@
     <string name="title_legend_downloading">Lade herunter</string>
     <string name="title_legend_closing">Schließen</string>
     <string name="title_hint_folder_actions">Gedrückt halten für weitere Optionen</string>
-    <string name="title_hint_support">Wenn Sie eine Frage oder ein Problem haben, verwenden Sie bitte FAQ/Support-Menü, um Hilfe zu erhalten</string>
+    <string name="title_hint_support">Wenn Sie eine Frage oder ein Problem haben, verwenden Sie bitte das FAQ/Hilfe-Menü, um Hilfe zu erhalten</string>
     <string name="title_hint_message_actions">Nach links wischen um zu Löschen; nach rechts wischen um zu Archivieren (falls vorhanden)</string>
     <string name="title_hint_message_selection">Lange auf eine Nachricht drücken, um mehrere Nachrichten auszuwählen</string>
     <string name="title_hint_sync">Das Herunterladen von E-Mails kann einige Zeit in Anspruch nehmen, abhängig von der Geschwindigkeit des Providers, der Internetverbindung, des Gerätes und von der Anzahl der E-Mails. Beim Herunterladen der E-Mails kann die App träge reagieren.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 45ef455b91..e795613be0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' falló</string>
     <string name="menu_setup">Configuración</string>
-    <string name="menu_answers">Plantillas de respuesta</string>
+    <string name="menu_answers">Plantillas</string>
     <string name="menu_operations">Operaciones</string>
     <string name="menu_legend">Referencia</string>
-    <string name="menu_faq">Preguntas Frecuentes</string>
+    <string name="menu_faq">Soporte</string>
     <string name="menu_pro">Características Pro</string>
     <string name="menu_privacy">Privacidad</string>
     <string name="menu_about">Acerca de</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Configuración</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 e Identidades serán exportados sin contraseñas</string>
+    <string name="title_setup_export_do">El archivo de exportación contendrá sus contraseñas, téngalo a resguardo</string>
     <string name="title_setup_import_do">Las Cuentas importadas serán agregadas, no sobreescritas</string>
     <string name="title_setup_exported">Ajustes exportados</string>
     <string name="title_setup_imported">Ajustes importados</string>
@@ -83,7 +83,7 @@
     <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
     <string name="title_advanced_swipe">Acciones al deslizar</string>
     <string name="title_advanced_nav">Navegación anterior/siguiente</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">Confirmar acciones que podrían filtrar información privada sensible</string>
     <string name="title_advanced_sender">Permitir editar dirección del remitente</string>
     <string name="title_advanced_sender_hint">La mayoría de los proveedores no permiten direcciones de remitente modificadas</string>
     <string name="title_advanced_download">Descargar automáticamente mensajes y adjuntos usando conexión de datos hasta</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Autorizando cuenta &#8230;</string>
     <string name="title_setup_advanced">Avanzado</string>
     <string name="title_store_sent">Almacenar mensajes enviados (nomalmente no necesario)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Sincronizar (recibir mensajes)</string>
     <string name="title_synchronize_identity">Sincronizar (enviar mensajes)</string>
     <string name="title_primary_account">Primaria (cuenta por defecto)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Marcar como favorito</string>
     <string name="title_unflag">Desmarcar como favorito</string>
     <string name="title_forward">Reenviar</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Responder a todos</string>
     <string name="title_show_headers">Mostrar encabezados</string>
     <string name="title_show_html">Mostrar original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">¿Eliminar los mensajes seleccionados permanentemente?</string>
     <string name="title_ask_delete_answer">¿Eliminar plantilla de respuesta permanentemente?</string>
     <string name="title_ask_discard">¿Descartar el borrador?</string>
+    <string name="title_ask_save">¿Guardar cambios?</string>
     <string name="title_ask_spam">¿Reportar mensaje como spam?</string>
     <string name="title_ask_show_html">Mostrar el mensaje original puede filtrar información privada sensible</string>
     <string name="title_ask_show_image">Mostrar imágenes puede filtrar información privada sensible</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 1f8cd1ffd1..3cbaf9dcd7 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">تنظیمات</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">عملیات ها</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">پرسش و پاسخ / پشتیبانی</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">ویژگی‌ نسخه‌ی حرفه‌ای</string>
     <string name="menu_privacy">حریم خصوصی</string>
     <string name="menu_about">درباره</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">تنظیمات</string>
     <string name="title_setup_export">ذخیره تنظیمات</string>
     <string name="title_setup_import">وارد کردن تنظیمات</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e588d8d701..a329112954 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' a échoué</string>
     <string name="menu_setup">Configuration</string>
-    <string name="menu_answers">Modèles de réponse</string>
+    <string name="menu_answers">Modèles</string>
     <string name="menu_operations">Opérations</string>
     <string name="menu_legend">Légende</string>
-    <string name="menu_faq">FAQ / Aide</string>
+    <string name="menu_faq">Assistance</string>
     <string name="menu_pro">Fonctionnalités Pro</string>
     <string name="menu_privacy">Confidentialité</string>
     <string name="menu_about">À propos</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Configuration</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 et identités seront exportés sans les mots de passe</string>
+    <string name="title_setup_export_do">Le fichier d’exportation contiendra vos mots de passe, donc gardez-le en lieu sûr</string>
     <string name="title_setup_import_do">Les comptes importés seront ajoutés, pas remplacés</string>
     <string name="title_setup_exported">Paramètres exportés</string>
     <string name="title_setup_imported">Paramètres importés</string>
@@ -83,7 +83,7 @@
     <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
     <string name="title_advanced_swipe">Gestes de balayage</string>
     <string name="title_advanced_nav">Navigation précédente/suivante</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">Confirmer les actions qui peuvent entraîner une fuite d\'informations sensibles privées</string>
     <string name="title_advanced_sender">Autoriser la modification de l’adresse de l’expéditeur</string>
     <string name="title_advanced_sender_hint">La plupart des fournisseurs n’autorisent pas les adresses d’expéditeur modifiées</string>
     <string name="title_advanced_download">Télécharger automatiquement les messages et les pièces jointes avec une connexion limitée jusqu’à</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Autorisation du compte en cours &#8230;</string>
     <string name="title_setup_advanced">Avancé</string>
     <string name="title_store_sent">Stocker les messages envoyés (normalement pas nécessaire)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchroniser (recevoir des messages)</string>
     <string name="title_synchronize_identity">Synchroniser (envoyer des messages)</string>
     <string name="title_primary_account">Principal (compte par défaut)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Marquer comme suivi</string>
     <string name="title_unflag">Marquer comme non suivi</string>
     <string name="title_forward">Transférer</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Répondre à tous</string>
     <string name="title_show_headers">Afficher les en-têtes</string>
     <string name="title_show_html">Afficher l\'original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Supprimer définitivement les messages sélectionnés ?</string>
     <string name="title_ask_delete_answer">Supprimer définitivement le modèle de réponse ?</string>
     <string name="title_ask_discard">Supprimer le brouillon ?</string>
+    <string name="title_ask_save">Enregistrer les modifications ?</string>
     <string name="title_ask_spam">Signaler le message comme spam ?</string>
     <string name="title_ask_show_html">Afficher le message original peut divulguer des informations sensibles privées</string>
     <string name="title_ask_show_image">Afficher les images peut divulguer des informations sensibles privées</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index c34401ad0b..8c0b364400 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -41,10 +41,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -63,7 +63,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -126,6 +126,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -183,6 +184,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -204,6 +206,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0c490966ae..ddfa5c868f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' sikertelen</string>
     <string name="menu_setup">Beállítás</string>
-    <string name="menu_answers">Válaszsablonok</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Műveletek</string>
     <string name="menu_legend">Jelmagyarázat</string>
-    <string name="menu_faq">GyIK/támogatás</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro funkciók</string>
     <string name="menu_privacy">Adatvédelem</string>
     <string name="menu_about">Névjegy</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Beállítás</string>
     <string name="title_setup_export">Beállítások exportálása</string>
     <string name="title_setup_import">Beállítások importálása</string>
-    <string name="title_setup_export_do">A fiókok és azonosítók jelszó nélkül exportálva lesznek</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Az importált fiókok felülírás nélkül lesznek hozzáadva</string>
     <string name="title_setup_exported">Beállítások exportálva</string>
     <string name="title_setup_imported">Beállítások importálva</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e31a5b9de4..fcabe915f3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' fallito</string>
     <string name="menu_setup">Configurazione</string>
-    <string name="menu_answers">Modelli di risposta</string>
+    <string name="menu_answers">Modelli</string>
     <string name="menu_operations">Operazioni</string>
     <string name="menu_legend">Legenda</string>
-    <string name="menu_faq">FAQ/supporto</string>
+    <string name="menu_faq">Supporto</string>
     <string name="menu_pro">Funzionalità a pagamento</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">Al riguardo</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Configurazione</string>
     <string name="title_setup_export">Esporta impostazioni</string>
     <string name="title_setup_import">Importa impostazioni</string>
-    <string name="title_setup_export_do">Verranno esportati account e identità senza le password</string>
+    <string name="title_setup_export_do">Il file di esportazione conterrà le tue password, quindi tienilo al sicuro</string>
     <string name="title_setup_import_do">Gli account importati saranno aggiunti, non sovrascritti</string>
     <string name="title_setup_exported">Impostazioni esportate</string>
     <string name="title_setup_imported">Impostazioni importate</string>
@@ -83,7 +83,7 @@
     <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
     <string name="title_advanced_swipe">Azioni swipe</string>
     <string name="title_advanced_nav">Navigazione precedente/successivo</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">Conferma le azioni che potrebbero rivelare informazioni personali sensibili</string>
     <string name="title_advanced_sender">Consenti la modifica dell\'indirizzo mittente</string>
     <string name="title_advanced_sender_hint">La maggior parte dei fornitori non consente indirizzi mittente modificati</string>
     <string name="title_advanced_download">Scarica automaticamente i messaggi e gli allegati con una connessione a consumo fino a</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Autorizzazione account &#8230;</string>
     <string name="title_setup_advanced">Avanzate</string>
     <string name="title_store_sent">Memorizza i messaggi inviati (normalmente non necessario)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Sincronizza (ricevi messaggi)</string>
     <string name="title_synchronize_identity">Sincronizza (invia messaggi)</string>
     <string name="title_primary_account">Principale (account predefinito)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Aggiungi stella</string>
     <string name="title_unflag">Rimuovi stella</string>
     <string name="title_forward">Inoltra</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Rispondi a tutti</string>
     <string name="title_show_headers">Visualizza header</string>
     <string name="title_show_html">Visualizza originale</string>
@@ -194,9 +196,10 @@
     <string name="title_ask_delete_selected">Eliminare definitivamente i messaggi selezionati?</string>
     <string name="title_ask_delete_answer">Elimina definitivamente il modello di risposta?</string>
     <string name="title_ask_discard">Eliminare la bozza?</string>
+    <string name="title_ask_save">Salvare le modifiche?</string>
     <string name="title_ask_spam">Segnalare il messaggio come posta indesiderata?</string>
     <string name="title_ask_show_html">Mostrare il messaggio originale rende possibile una fuga di informazioni personali sensibili</string>
-    <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
+    <string name="title_ask_show_image">Mostrare le immagini rende possibile una fuga di informazioni personali sensibili</string>
     <string name="title_fix">Correggi</string>
     <string name="title_compose">Scrivi</string>
     <string name="title_from">Da:</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index c34401ad0b..8c0b364400 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -41,10 +41,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -63,7 +63,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -126,6 +126,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -183,6 +184,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -204,6 +206,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 544a04bc20..0caa105f31 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -26,10 +26,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -48,7 +48,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -111,6 +111,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -168,6 +169,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -189,6 +191,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 544a04bc20..0caa105f31 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -26,10 +26,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -48,7 +48,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -111,6 +111,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -168,6 +169,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -189,6 +191,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index fb3947f08e..ccf5cea9ec 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' is mislukt</string>
     <string name="menu_setup">Installatie</string>
-    <string name="menu_answers">Antwoord sjablonen</string>
+    <string name="menu_answers">Sjablonen</string>
     <string name="menu_operations">Acties</string>
     <string name="menu_legend">Legenda</string>
-    <string name="menu_faq">FAQ/ondersteuning</string>
+    <string name="menu_faq">Ondersteuning</string>
     <string name="menu_pro">Pro functies</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">Over</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Installatie</string>
     <string name="title_setup_export">Exporteer instellingen</string>
     <string name="title_setup_import">Importeer instellingen</string>
-    <string name="title_setup_export_do">Accounts en identiteiten worden geëxporteerd zonder wachtwoorden</string>
+    <string name="title_setup_export_do">Het exportbestand zal uw wachtwoorden bevatten, dus bewaar het veilig</string>
     <string name="title_setup_import_do">Geïmporteerde accounts zullen worden toegevoegd, niet overschreven</string>
     <string name="title_setup_exported">Instellingen geëxporteerd</string>
     <string name="title_setup_imported">Instellingen geïmporteerd</string>
@@ -83,7 +83,7 @@
     <string name="title_advanced_browse">Blader door berichten op de server</string>
     <string name="title_advanced_swipe">Veegacties</string>
     <string name="title_advanced_nav">Vorige/volgende navigatie</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">Bevestigen van acties die privacy gevoelige informatie kunnen lekken</string>
     <string name="title_advanced_sender">Bewerken verzendadres toestaan</string>
     <string name="title_advanced_sender_hint">De meeste providers staan gemodificeerde verzendadressen niet toe</string>
     <string name="title_advanced_download">Automatisch downloaden van berichten en bijlagen op een gemeten verbinding tot</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Account autoriseren &#8230;</string>
     <string name="title_setup_advanced">Geavanceerd</string>
     <string name="title_store_sent">Bewaar verzonden berichten (normaliter niet nodig)</string>
+    <string name="title_store_copy">Sla een kopie van verzonden berichten op in:</string>
     <string name="title_synchronize_account">Synchroniseren (ontvang berichten)</string>
     <string name="title_synchronize_identity">Synchroniseren (stuur berichten)</string>
     <string name="title_primary_account">Primair account (standaard account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Ster toevoegen</string>
     <string name="title_unflag">Ster verwijderen</string>
     <string name="title_forward">Doorsturen</string>
+    <string name="title_forward_raw">Ruw doorsturen</string>
     <string name="title_reply_all">Allen beantwoorden</string>
     <string name="title_show_headers">Toon koppen</string>
     <string name="title_show_html">Toon origineel</string>
@@ -194,11 +196,12 @@
     <string name="title_ask_delete_selected">Verwijder geselecteerde berichten permanent?</string>
     <string name="title_ask_delete_answer">Verwijder antwoordsjabloon permanent?</string>
     <string name="title_ask_discard">Concept weggooien?</string>
+    <string name="title_ask_save">Wijzigingen opslaan?</string>
     <string name="title_ask_spam">Rapporteren als spam?</string>
     <string name="title_ask_show_html">Het originele bericht tonen kan privacy gevoelige informatie lekken</string>
-    <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
+    <string name="title_ask_show_image">Afbeeldingen tonen kan privacy gevoelige informatie lekken</string>
     <string name="title_fix">Oplossen</string>
-    <string name="title_compose">Compose</string>
+    <string name="title_compose">Opstellen</string>
     <string name="title_from">Van:</string>
     <string name="title_to">Aan:</string>
     <string name="title_reply_to">Antwoord op:</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6d14d734e0..bda8c61a36 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -8,7 +8,7 @@
     <string name="tile_synchronize">Synchronizuj</string>
     <string name="tile_unseen">Nowe wiadomości</string>
     <string name="shortcut_compose">Napisz</string>
-    <string name="shortcut_setup">Setup</string>
+    <string name="shortcut_setup">Ustawienia</string>
     <plurals name="title_notification_synchronizing">
         <item quantity="one">Synchronizuję %1$d konto</item>
         <item quantity="few">Synchronizuję %1$d kont</item>
@@ -41,10 +41,10 @@
     </plurals>
     <string name="title_notification_failed">%1$s nie powiodło się</string>
     <string name="menu_setup">Ustawienia</string>
-    <string name="menu_answers">Szablony odpowiedzi</string>
+    <string name="menu_answers">Szablony</string>
     <string name="menu_operations">Operacje</string>
     <string name="menu_legend">Legenda</string>
-    <string name="menu_faq">FAQ/Wsparcie</string>
+    <string name="menu_faq">Wsparcie</string>
     <string name="menu_pro">Funkcje pro</string>
     <string name="menu_privacy">Prywatność</string>
     <string name="menu_about">O programie</string>
@@ -63,7 +63,7 @@
     <string name="title_setup">Ustawienia</string>
     <string name="title_setup_export">Eksport ustawień</string>
     <string name="title_setup_import">Import ustawień</string>
-    <string name="title_setup_export_do">Konta i tożsamości zostaną wyeksportowane bez haseł</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Zaimportowane konta zostaną dodane, nie nadpisane</string>
     <string name="title_setup_exported">Ustawienia wyeksportowane</string>
     <string name="title_setup_imported">Ustawienia zaimportowane</string>
@@ -97,7 +97,7 @@
     <string name="title_advanced_sender">Allow editing sender address</string>
     <string name="title_advanced_sender_hint">Most providers do not allow modified sender addresses</string>
     <string name="title_advanced_download">Automatycznie pobieraj wiadomości i załączniki przy połączeniach taryfowych do</string>
-    <string name="title_advanced_updates">Check for updates</string>
+    <string name="title_advanced_updates">Sprawdź aktualizacje</string>
     <string name="title_advanced_debug">Debuguj</string>
     <string name="title_select">Wybierz &#8230;</string>
     <string name="title_identity_name">Twoja nazwa</string>
@@ -126,6 +126,7 @@
     <string name="title_authorizing">Autoryzowanie konta &#8230;</string>
     <string name="title_setup_advanced">Zaawansowane</string>
     <string name="title_store_sent">Zachowuj wysłane wiadomości (normalnie nie potrzebne)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronizuj (odbierz wiadomości)</string>
     <string name="title_synchronize_identity">Synchronizuj (wyślij wiadomości)</string>
     <string name="title_primary_account">Podstawowe (domyślne konto)</string>
@@ -183,6 +184,7 @@
     <string name="title_flag">Dodaj gwiazdkę</string>
     <string name="title_unflag">Usuń gwiazdkę</string>
     <string name="title_forward">Prześlij dalej</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Odpowiedz wszystkim</string>
     <string name="title_show_headers">Pokaż nagłówki</string>
     <string name="title_show_html">Pokaż oryginał</string>
@@ -201,9 +203,10 @@
     <string name="title_attachment_saved">Załącznik zapisany</string>
     <string name="title_attachment_unavailable">Niektóre załączniki nie są pobrane i nie zostaną przekazane, kontynuować?</string>
     <string name="title_ask_delete">Usunąć wiadomość bezpowrotnie?</string>
-    <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
-    <string name="title_ask_delete_answer">Delete reply template permanently?</string>
+    <string name="title_ask_delete_selected">Trwale usunąć wybrane wiadomości?</string>
+    <string name="title_ask_delete_answer">Trwale usunąć szablon odpowiedzi?</string>
     <string name="title_ask_discard">Odrzucić szkic?</string>
+    <string name="title_ask_save">Zapisać zmiany?</string>
     <string name="title_ask_spam">Zgłosić wiadomość jako spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
@@ -279,7 +282,7 @@
     <string name="title_hint_support">Jeśli masz pytanie lub problem, użyj menu Pomoc, aby uzyskać pomoc</string>
     <string name="title_hint_message_actions">Przesuń w lewo do kosza; przesuń w prawo do archiwum (jeśli dostępne)</string>
     <string name="title_hint_message_selection">Przytrzymaj wiadomość, aby zacząć zaznaczanie wielu wiadomości</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
+    <string name="title_hint_sync">Pobieranie wiadomości może trochę potrwać, zależnie od prędkości dostawcy, połączenie internetowego i urządzenia oraz liczby wiadomości. Podczas pobierania wiadomości aplikacja może odpowiadać wolniej.</string>
     <string name="title_open_link">Otwórz link</string>
     <string name="title_updated">Jest dostępna aktualizacja do wersji %1$s</string>
     <string name="title_issue">Masz pytanie lub problem?</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e5b9c90feb..1a9101a0ea 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' falhou</string>
     <string name="menu_setup">Configurar</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">Sobre</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Configurar</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Sincronizar (receber mensagens)</string>
     <string name="title_synchronize_identity">Sincronizar (enviar mensagens)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Encaminhar</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Responder a todos</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Reportar mensagem com spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 576bcc67d1..24a1c6303c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 90630d69b2..068008ffa0 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -36,10 +36,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' a eșuat</string>
     <string name="menu_setup">Setări</string>
-    <string name="menu_answers">Șabloane răspunsuri</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operaţii</string>
     <string name="menu_legend">Legendă</string>
-    <string name="menu_faq">Întrebări/suport</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Caracteristici versiune Pro</string>
     <string name="menu_privacy">Confidențialitate</string>
     <string name="menu_about">Despre</string>
@@ -58,7 +58,7 @@
     <string name="title_setup">Setări</string>
     <string name="title_setup_export">Exportă setări</string>
     <string name="title_setup_import">Importă setări</string>
-    <string name="title_setup_export_do">Conturile şi identităţile vor fi exportate fără parole</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Conturile importate vor fi adăugate, nu suprascrise</string>
     <string name="title_setup_exported">Setări exportate</string>
     <string name="title_setup_imported">Setări importate</string>
@@ -121,6 +121,7 @@
     <string name="title_authorizing">Autorizare cont &#8230;</string>
     <string name="title_setup_advanced">Setări avansate</string>
     <string name="title_store_sent">Stochează mesajele trimise (în mod normal nu este necesar)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Sincronizare (primire mesaje)</string>
     <string name="title_synchronize_identity">Sincronizare (trimitere mesaje)</string>
     <string name="title_primary_account">Primară (identitatea implicită)</string>
@@ -178,6 +179,7 @@
     <string name="title_flag">Marcare</string>
     <string name="title_unflag">Anulare marcare</string>
     <string name="title_forward">Redirecționează</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Răspunde tuturor</string>
     <string name="title_show_headers">Arată antetul</string>
     <string name="title_show_html">Arată original</string>
@@ -199,6 +201,7 @@
     <string name="title_ask_delete_selected">Se șterg permanent toate mesajele selectate?</string>
     <string name="title_ask_delete_answer">Se șterge permanent șablonul de răspuns?</string>
     <string name="title_ask_discard">Renunțați la ciornă?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Raportați mesajul drept spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 01ad587a43..8dd83cec6c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,10 +41,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -63,7 +63,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -126,6 +126,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -183,6 +184,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -204,6 +206,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 0300b5b146..e91dbd70c5 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -36,10 +36,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -58,7 +58,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -121,6 +121,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -178,6 +179,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -199,6 +201,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 308b3be796..7465d66e11 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' misslyckades</string>
     <string name="menu_setup">Ställ in</string>
-    <string name="menu_answers">Svarsmallar</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Aktiviteter</string>
     <string name="menu_legend">Förklaring</string>
-    <string name="menu_faq">Vanliga frågor/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro-funktioner</string>
     <string name="menu_privacy">Integritet</string>
     <string name="menu_about">Om</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Ställ in</string>
     <string name="title_setup_export">Exportera inställningar</string>
     <string name="title_setup_import">Importera inställningar</string>
-    <string name="title_setup_export_do">Konton och identiteter kommer att exporteras utan lösenord</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Importerade konton kommer att läggas till, inte skrivas över</string>
     <string name="title_setup_exported">Inställningar exporterade</string>
     <string name="title_setup_imported">Inställningar importerade</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Auktoriserar konto &#8230;</string>
     <string name="title_setup_advanced">Avancerat</string>
     <string name="title_store_sent">Butik skickade meddelanden (behövs normalt inte)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synkronisera (hämta meddelanden)</string>
     <string name="title_synchronize_identity">Synkronisera (skicka meddelanden)</string>
     <string name="title_primary_account">Primär (standardkonto)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Lägg till stjärna</string>
     <string name="title_unflag">Ta bort stjärna</string>
     <string name="title_forward">Vidarebefordra</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Svara till alla</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Visa originalet</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Släng utkastet?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Rapportera meddelandet som skräppost?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index efd84f1011..6981cd91d4 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' başarısız oldu</string>
     <string name="menu_setup">Kurulum</string>
-    <string name="menu_answers">Yanıt şablonları</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">İşlemler</string>
     <string name="menu_legend">Açıklamalar</string>
-    <string name="menu_faq">SSS/destek</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro özellikleri</string>
     <string name="menu_privacy">Gizlilik</string>
     <string name="menu_about">Hakkında</string>
@@ -53,7 +53,7 @@
     <string name="title_setup">Kurulum</string>
     <string name="title_setup_export">Ayarları dışa aktar</string>
     <string name="title_setup_import">Ayarları içe aktar</string>
-    <string name="title_setup_export_do">Hesaplar ve kimlikler şifreler olmadan dışa aktarılır</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">İçe aktarılan hesaplar eklenecek, üzerine yazılmayacak</string>
     <string name="title_setup_exported">Ayarları dışa aktarıldı</string>
     <string name="title_setup_imported">Ayarlar içe aktarıldı</string>
@@ -116,6 +116,7 @@
     <string name="title_authorizing">Hesap yetkilendiriliyor &#8230;</string>
     <string name="title_setup_advanced">Gelişmiş</string>
     <string name="title_store_sent">Gönderilen mesajları sakla (normalde gerekmez)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Senkronize et (iletileri al)</string>
     <string name="title_synchronize_identity">Senkronize et (iletileri gönder)</string>
     <string name="title_primary_account">Birincil (varsayılan hesap)</string>
@@ -173,6 +174,7 @@
     <string name="title_flag">Yıldız Ekle</string>
     <string name="title_unflag">Yıldızı Kaldır</string>
     <string name="title_forward">İlet</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Tümünü yanıtla</string>
     <string name="title_show_headers">Başlıkları Göster</string>
     <string name="title_show_html">Orjinali göster</string>
@@ -194,6 +196,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Taslağı sil?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">İletiyi spam olarak raporla?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 01ad587a43..8dd83cec6c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -41,10 +41,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -63,7 +63,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -126,6 +126,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -183,6 +184,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -204,6 +206,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 544a04bc20..0caa105f31 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -26,10 +26,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -48,7 +48,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -111,6 +111,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -168,6 +169,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -189,6 +191,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 07408f49b3..51e040f078 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -26,10 +26,10 @@
     </plurals>
     <string name="title_notification_failed">“%1$s”失败</string>
     <string name="menu_setup">设置</string>
-    <string name="menu_answers">回复模板</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">操作</string>
     <string name="menu_legend">图例</string>
-    <string name="menu_faq">常见问题/支持</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">专业版功能</string>
     <string name="menu_privacy">隐私</string>
     <string name="menu_about">关于</string>
@@ -48,7 +48,7 @@
     <string name="title_setup">设置</string>
     <string name="title_setup_export">导出设置</string>
     <string name="title_setup_import">导入设置</string>
-    <string name="title_setup_export_do">账户跟身份将会在没有密码的情况下导出</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">导入的账号将被添加，但不会覆写</string>
     <string name="title_setup_exported">设置已导出！</string>
     <string name="title_setup_imported">设置已导入！</string>
@@ -78,7 +78,7 @@
     <string name="title_advanced_browse">浏览服务器上的消息</string>
     <string name="title_advanced_swipe">滑动操作</string>
     <string name="title_advanced_nav">上/下一则导航</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">确认执行可能泄露隐私敏感信息的操作</string>
     <string name="title_advanced_sender">允许编辑发件人地址</string>
     <string name="title_advanced_sender_hint">大多数提供商不允许修改发件人地址</string>
     <string name="title_advanced_download">在计量的连接下自动下载邮件和附件, 最高可达</string>
@@ -111,6 +111,7 @@
     <string name="title_authorizing">授权帐户 &#8230;</string>
     <string name="title_setup_advanced">高级选项</string>
     <string name="title_store_sent">保存已发送的消息(通常不需要)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">同步（接收）</string>
     <string name="title_synchronize_identity">同步（发送）</string>
     <string name="title_primary_account">默认账户</string>
@@ -168,6 +169,7 @@
     <string name="title_flag">加注星标</string>
     <string name="title_unflag">移除星标</string>
     <string name="title_forward">转发</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">回复全部</string>
     <string name="title_show_headers">显示标题</string>
     <string name="title_show_html">显示原件</string>
@@ -189,9 +191,10 @@
     <string name="title_ask_delete_selected">是否永久性删除选定的邮件？</string>
     <string name="title_ask_delete_answer">是否永久性删除回复模板？</string>
     <string name="title_ask_discard">丢弃草稿？</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">确定将邮件标为垃圾邮件吗？</string>
     <string name="title_ask_show_html">显示原件可能会泄露隐私敏感信息</string>
-    <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
+    <string name="title_ask_show_image">显示图像可能会泄露隐私敏感信息</string>
     <string name="title_fix">修复</string>
     <string name="title_compose">撰写</string>
     <string name="title_from">发件人：</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 544a04bc20..0caa105f31 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -26,10 +26,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' failed</string>
     <string name="menu_setup">Setup</string>
-    <string name="menu_answers">Reply templates</string>
+    <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_legend">Legend</string>
-    <string name="menu_faq">FAQ/support</string>
+    <string name="menu_faq">Support</string>
     <string name="menu_pro">Pro features</string>
     <string name="menu_privacy">Privacy</string>
     <string name="menu_about">About</string>
@@ -48,7 +48,7 @@
     <string name="title_setup">Setup</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
-    <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
+    <string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -111,6 +111,7 @@
     <string name="title_authorizing">Authorizing account &#8230;</string>
     <string name="title_setup_advanced">Advanced</string>
     <string name="title_store_sent">Store sent messages (normally not needed)</string>
+    <string name="title_store_copy">Store a copy of sent messages in:</string>
     <string name="title_synchronize_account">Synchronize (receive messages)</string>
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
@@ -168,6 +169,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
@@ -189,6 +191,7 @@
     <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
+    <string name="title_ask_save">Save changes?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>