diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 7b4781dac3..545404b456 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_welcome">FairEmail е приложение за електронна поща с отворен код, фокусирано върху поверителността и сигурността. Поради тази причина някои функции могат да работят различно от това с което сте свикнали. Превод на български plimboster.</string>
     <string name="app_limitations">Например, съобщенията винаги ще се преформатират, за да се премахнат опасни елементи и да се подобри четенето, както и връзките за отваряне трябва да бъдат потвърдени за безопасност.</string>
     <string name="app_crash">FairEmail не се поддържа на това устройство поради срив, причинен от грешка в Android</string>
-    <string name="app_exit">Натиснете отново \"назад\", за изход</string>
+    <string name="app_exit">Натиснете отново „назад“, за изход</string>
     <string name="channel_service">Получаване</string>
     <string name="channel_send">Изпращане</string>
     <string name="channel_notification">Известия</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 82f89bf52a..c24694fa88 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_welcome">FairEmail je e-mailový klient s otevřeným zdrojovým kódem zaměřený na soukromí a bezpečnost. Z tohoto důvodu se některé funkce mohou chovat odlišně než jste zvyklí.</string>
     <string name="app_limitations">Například, zprávy budou vždy přeformátovány pro odstranění prvků které nejsou bezpečné a zároveň pro zlepšení čitelnosti, a otevření odkazů je nutné z důvodu bezpečnosti potvrdit.</string>
     <string name="app_crash">FairEmail není na tomto zařízení podporován, protože chyby v Androidu způsobují jeho pády</string>
-    <string name="app_exit">Znovu \"zpět\" pro ukončení</string>
+    <string name="app_exit">Znovu „zpět“ pro ukončení</string>
     <string name="app_cake">Nedostatek místa v úložišti</string>
     <string name="channel_service">Přijmout</string>
     <string name="channel_send">Odesílání</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 9ab2a576ba..7abcfed82d 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -31,7 +31,7 @@
     <string name="shortcut_compose">Skriv</string>
     <string name="shortcut_setup">Indstillinger</string>
     <plurals name="title_notification_synchronizing">
-        <item quantity="one">Monitorere %1$d konto</item>
+        <item quantity="one">Monitorerer %1$d konto</item>
         <item quantity="other">Monitorere %1$d konti</item>
     </plurals>
     <plurals name="title_notification_operations">
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 39b7867491..d7fab1c5a2 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1105,6 +1105,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_hint_eml">Das ist eine Zusammenfassung des Inhalts einer Rohnachrichtendatei. Speichern Sie die Rohnachricht mit dem Speichernsymbol in der Aktionsleiste, um alle Inhalte anzuzeigen.</string>
     <string name="title_open_link">Link öffnen</string>
     <string name="title_different_link">Titel und Link-Ziel sind unterschiedlich</string>
+    <string name="title_tracking_link">Diese Website könnte Sie verfolgen</string>
     <string name="title_link_http">Datenverkehr wird nicht verschlüsselt</string>
     <string name="title_link_https">Datenverkehr wird verschlüsselt</string>
     <string name="title_sanitize_link">Nachverfolgungsparameter entfernen</string>
@@ -1123,6 +1124,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_add">Hinzufügen</string>
     <string name="title_browse">Öffnen mit</string>
     <string name="title_info">Info</string>
+    <string name="title_download">Herunterladen</string>
     <string name="title_report">Bericht</string>
     <string name="title_fix">Problem beheben</string>
     <string name="title_enable">Aktivieren</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 7cb2ff695e..5f5cc68bb9 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -1107,6 +1107,7 @@
     <string name="title_hint_eml">Ceci est l’aperçu d’un fichier contenant un message original. Enregistrez le message original au moyen de l’icône de sauvegarde dans la barre d’action pour afficher tout son contenu.</string>
     <string name="title_open_link">Ouvrir le lien</string>
     <string name="title_different_link">Le titre et l’adresse du lien sont différents</string>
+    <string name="title_tracking_link">Ce site web pourrait vous pister</string>
     <string name="title_link_http">Le trafic ne sera pas chiffré</string>
     <string name="title_link_https">Le trafic sera chiffré</string>
     <string name="title_sanitize_link">Supprimer les paramètres de pistage</string>
@@ -1125,6 +1126,7 @@
     <string name="title_add">Ajouter</string>
     <string name="title_browse">Ouvrir avec</string>
     <string name="title_info">Infos</string>
+    <string name="title_download">Télécharger</string>
     <string name="title_report">Signaler</string>
     <string name="title_fix">Corriger</string>
     <string name="title_enable">Activer</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index aa424ead87..cc12936838 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1107,6 +1107,7 @@
     <string name="title_hint_eml">Ceci est l’aperçu du contenu d’un fichier de message original. Enregistrez le message original au moyen de l’icône de sauvegarde dans la barre d’action pour afficher tout son contenu.</string>
     <string name="title_open_link">Ouvrir le lien</string>
     <string name="title_different_link">Le titre et l\'adresse du lien sont différents</string>
+    <string name="title_tracking_link">Ce site web pourrait vous pister</string>
     <string name="title_link_http">Le trafic ne sera pas chiffré</string>
     <string name="title_link_https">Le trafic sera chiffré</string>
     <string name="title_sanitize_link">Supprimer les paramètres de pistage</string>
@@ -1125,6 +1126,7 @@
     <string name="title_add">Ajouter</string>
     <string name="title_browse">Ouvrir avec</string>
     <string name="title_info">Info</string>
+    <string name="title_download">Télécharger</string>
     <string name="title_report">Signaler</string>
     <string name="title_fix">Corriger</string>
     <string name="title_enable">Activer</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index b3cf276bbe..3304cedb42 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_limitations">Berjochten wurde bygelyks altyd herformateare om ûnfeilige eleminten te ferwiderjen en lêsberens te ferbetterjen, en iepeningslinks moatte wurde befestige foar feiligens.</string>
     <string name="app_crash">FailEmail wurdt net stipe op dit apparaat om\'t bugs yn Android crashes feroarsaakje</string>
     <string name="app_exit">Gean \'werom\' opnij om út te gean</string>
+    <string name="channel_service">Ûntfangen</string>
     <string name="channel_send">Stjoere</string>
     <string name="channel_notification">Notifikaasjes</string>
     <string name="channel_update">Bywurken</string>
@@ -126,10 +127,12 @@
     <string name="title_setup_permissions">Subsydzje tagongsrjochten</string>
     <string name="title_setup_doze_battery">Hege batterij gebrûk?</string>
     <string name="title_setup_doze_stopped">Syngronisaasje stoppe?</string>
+    <string name="title_setup_advanced_options">Avansearre opsjes sjen litte</string>
     <string name="title_setup_inbox">Gean nei berjochten</string>
     <string name="title_setup_go">Gean</string>
     <string name="title_setup_to_do">Dwaan</string>
     <string name="title_setup_done">Dien</string>
+    <string name="title_setup_still">Noch te dwaan</string>
     <string name="title_setup_error">Fersin</string>
     <string name="title_setup_export">Ynstellings eksportearje</string>
     <string name="title_setup_import">Ynstellings ymportearje</string>
@@ -217,6 +220,7 @@
     <string name="title_advanced_notify_action_snooze">Snooze</string>
     <string name="title_advanced_confirm_images">Befêstigje werjaan fan ôfbyldings</string>
     <string name="title_advanced_pin">PIN</string>
+    <string name="title_advanced_openpgp">OpenPGP-provider</string>
     <string name="title_advanced_shortcuts">Lit faak brûkte kontakten sjen yn Android-dielmenu</string>
     <string name="title_advanced_conversation_actions">Hannelje aksjes foar</string>
     <string name="title_advanced_debug">Debug mode</string>
@@ -255,7 +259,10 @@
     <string name="title_review">Resinsje</string>
     <string name="title_synchronize_now">Syngronisearje no</string>
     <string name="title_synchronize_enabled">Syngronisearje</string>
+    <string name="title_empty_trash">Lege jiskefet</string>
+    <string name="title_empty_spam">Spam leech</string>
     <string name="title_edit_rules">Bewurkje regel</string>
+    <string name="title_insert_contact">Kontakt tafoegje</string>
     <string name="title_folder_name">Map namme</string>
     <string name="title_display_name">Display namme</string>
     <string name="title_show_folders">Sjoch ferburgen mappen</string>
@@ -263,6 +270,8 @@
     <string name="title_hide_folder">Map ferbergje</string>
     <string name="title_unified_folder">Lit sjen yn unifoarme postfak</string>
     <string name="title_navigation_folder">Lit sjen yn navigaasjemenu</string>
+    <string name="title_months">Moanne</string>
+    <string name="title_months_all">Alle</string>
     <string name="title_folder_unified">Unifieare postfak</string>
     <string name="title_folder_inbox">Postfek YN</string>
     <string name="title_folder_outbox">Utfak</string>
@@ -292,6 +301,7 @@
     <string name="title_new_message">Nij berjocht</string>
     <string name="title_editasnew">Bewurkje as nij</string>
     <string name="title_share">Diele</string>
+    <string name="title_event">Tafoegje oan aginda</string>
     <string name="title_pin">Fluchkeppeling tafoegje</string>
     <string name="title_print">Ôfdrukke</string>
     <string name="title_show_headers">Sjoch kopteksten</string>
@@ -301,12 +311,15 @@
     <string name="title_save_all">Alles opslaan</string>
     <string name="title_trash">Jiskefet</string>
     <string name="title_copy">Kopy &#8230;</string>
+    <string name="title_copy_to">Kopy &#8230;</string>
     <string name="title_subscribe">Ynskriuwe</string>
     <string name="title_delete">Ferwiderje</string>
     <string name="title_more">Mear</string>
     <string name="title_spam">Spam</string>
     <string name="title_move">Ferpleatse</string>
+    <string name="title_copy_btn">Kopiearje</string>
     <string name="title_no_junk">Net spam</string>
+    <string name="title_report_spam">Behannelje as spam</string>
     <string name="title_archive">Argyf</string>
     <string name="title_reply">Antwurdzje</string>
     <string name="title_open_with">Iepenje mei</string>
@@ -334,10 +347,16 @@
     <string name="title_send_via">Stjoer fia</string>
     <string name="title_send_encryption">Fersifering</string>
     <string name="title_send_priority">Prioriteit</string>
+    <string name="title_style">Styl</string>
     <string name="title_style_bold">Dryst</string>
     <string name="title_style_italic">Kursyf</string>
     <string name="title_style_underline">Ûnderstreekje</string>
     <string name="title_style_size">Grutte</string>
+    <string name="title_style_size_small">Lyts</string>
+    <string name="title_style_size_medium">Medium</string>
+    <string name="title_style_size_large">Grutte</string>
+    <string name="title_style_font">Lettertypen</string>
+    <string name="title_style_font_default">Standert</string>
     <string name="title_style_link">Link ynfoegje</string>
     <string name="title_attachment_file">Heakje bestân ta</string>
     <string name="title_attachment_photo">Nim foto</string>
@@ -354,6 +373,12 @@
     <string name="title_signature_validity">Jildigens</string>
     <string name="title_signature_store">Bewarje</string>
     <string name="title_search">Sykje</string>
+    <string name="title_search_with_unseen">Net lêzen</string>
+    <string name="title_search_with_flagged">Stjer</string>
+    <string name="title_search_flag_unseen">net lêzen</string>
+    <string name="title_search_flag_flagged">stjer</string>
+    <string name="title_search_flag_hidden">ferburgen</string>
+    <string name="title_search_flag_encrypted">fersifere</string>
     <string name="title_search_in">Sykje yn</string>
     <string name="title_sort_on">Sortearje op</string>
     <string name="title_sort_on_time">Tiid</string>
@@ -376,6 +401,7 @@
     <string name="title_select_all">Alles selektearje</string>
     <string name="title_select_found">Selektearje fûn</string>
     <string name="title_force_sync">Krêft syngronisearje</string>
+    <string name="title_language_all">Alle</string>
     <string name="title_previous">Foarige</string>
     <string name="title_next">Folgjende</string>
     <string name="title_answer_favorite">Favoryt</string>
@@ -403,10 +429,14 @@
     <string name="title_rule_identity">Identiteit</string>
     <string name="title_rule_execute">No útfiere</string>
     <string name="title_rule_check">Kontrolearje</string>
+    <string name="title_rule_tts_from">Fan</string>
+    <string name="title_rule_tts_subject">Ûnderwerp</string>
+    <string name="title_rule_tts_content">Tekst</string>
     <string name="title_legend_section_synchronize">Syngronisearje</string>
     <string name="title_legend_section_folders">Mappen</string>
     <string name="title_legend_section_messages">Berjochten</string>
     <string name="title_legend_section_compose">Gearstalle</string>
+    <string name="title_legend_section_keyboard">Toetseboerd</string>
     <string name="title_legend_primary_connected">Akkount ferbûn</string>
     <string name="title_legend_primary_disconnected">Akkount net ferbûn</string>
     <string name="title_legend_disconnected">Verbroken ferbine</string>
@@ -454,6 +484,12 @@
     <string name="title_legend_delete">Ferwiderje</string>
     <string name="title_legend_count">Telle</string>
     <string name="title_legend_folder_type">Map type</string>
+    <string name="title_legend_enter">Iepenje</string>
+    <string name="title_legend_a">Argyf</string>
+    <string name="title_legend_c">Gearstalle</string>
+    <string name="title_legend_n">Folgjende</string>
+    <string name="title_legend_p">Foarige</string>
+    <string name="title_legend_r">Antwurdzje</string>
     <string name="title_hint_important">Belangryk</string>
     <string name="title_open_link">Open link</string>
     <string name="title_check_owner">Kontrolearje eigner</string>
@@ -466,6 +502,7 @@
     <string name="title_add">Tafoegje</string>
     <string name="title_browse">Iepenje mei</string>
     <string name="title_info">Ynfo</string>
+    <string name="title_download">Download</string>
     <string name="title_report">Melde</string>
     <string name="title_fix">Meitsje</string>
     <string name="title_enable">Ynskeakele</string>
@@ -483,6 +520,7 @@
     <string name="title_minutes">Minuten</string>
     <string name="title_dismiss">Wegerje</string>
     <string name="title_snooze_now">Snooze</string>
+    <string name="title_conversation_actions">Aksje</string>
     <string name="title_conversation_action_copy">Kopiearje: %1$s</string>
     <string name="title_icalendar_accept">Akseptearje</string>
     <string name="title_icalendar_decline">Efterútgong</string>
@@ -499,6 +537,8 @@
     <string name="title_widget_account">Akkount</string>
     <string name="title_widget_account_all">Alle</string>
     <string name="title_widget_folder">Map</string>
+    <string name="title_widget_font_size">Tekstgrutte</string>
+    <string name="title_widget_background">Eftergrûnkleur</string>
     <string name="title_accessibility_collapsed">Ynsakje</string>
     <string name="title_accessibility_expanded">Utwreidzje</string>
     <string name="title_accessibility_seen">Lêze</string>
@@ -508,6 +548,10 @@
         <item quantity="other">%1$d berjochten</item>
     </plurals>
     <!-- Thunderbird -->
+    <string name="title_keyword_label1">Belangryk</string>
+    <string name="title_keyword_label2">Wurk</string>
+    <string name="title_keyword_label4">Dwaan</string>
+    <string name="title_keyword_label5">Letter</string>
     <string name="title_accessibility_flagged">Stjer</string>
     <string name="title_accessibility_unflagged">Unstjerre</string>
     <string name="title_accessibility_collapse">Ynsakje</string>
@@ -628,4 +672,17 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2.5 s</item>
+        <item>5 s</item>
+        <item>7.5 s</item>
+        <item>10 s</item>
+    </string-array>
+    <string-array name="fontNameNames">
+        <item>Cursive</item>
+        <item>Serif</item>
+        <item>Sans-serif</item>
+        <item>Monospace</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index ed4e766170..b0ca9034ed 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1106,6 +1106,7 @@
     <string name="title_hint_eml">Dit is een samenvatting van de inhoud van een ruw berichtbestand. Sla het ruwe bericht op met het \'bewaar\' icoon in de actiebalk om alle inhoud te bekijken.</string>
     <string name="title_open_link">Koppeling openen</string>
     <string name="title_different_link">De titel en het link-adres zijn verschillend</string>
+    <string name="title_tracking_link">Deze website kan je volgen</string>
     <string name="title_link_http">Verkeer wordt niet versleuteld</string>
     <string name="title_link_https">Verkeer wordt versleuteld</string>
     <string name="title_sanitize_link">Verwijder tracking parameters</string>
@@ -1124,6 +1125,7 @@
     <string name="title_add">Toevoegen</string>
     <string name="title_browse">Open met</string>
     <string name="title_info">Info</string>
+    <string name="title_download">Downloaden</string>
     <string name="title_report">Rapporteer</string>
     <string name="title_fix">Oplossen</string>
     <string name="title_enable">Inschakelen</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index d9f1c906bc..2864134da1 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1128,6 +1128,7 @@
     <string name="title_hint_eml">To jest podsumowanie zawartości nieprzetworzonego pliku wiadomości. Zapisz nieprzetworzoną wiadomość używając ikony zapisu na pasku akcji, aby wyświetlić całą zawartość.</string>
     <string name="title_open_link">Otwórz link</string>
     <string name="title_different_link">Tytuł i adres linku są różne</string>
+    <string name="title_tracking_link">Ta strona może Cię śledzić</string>
     <string name="title_link_http">Ruch nie będzie szyfrowany</string>
     <string name="title_link_https">Ruch będzie szyfrowany</string>
     <string name="title_sanitize_link">Usuń parametry śledzenia</string>
@@ -1146,6 +1147,7 @@
     <string name="title_add">Dodaj</string>
     <string name="title_browse">Otwórz za pomocą</string>
     <string name="title_info">Info</string>
+    <string name="title_download">Pobierz</string>
     <string name="title_report">Zgłoś błąd</string>
     <string name="title_fix">Popraw</string>
     <string name="title_enable">Włącz</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index c118ccb6c3..a85290f01a 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1129,6 +1129,7 @@
     <string name="title_hint_eml">Это обзор содержимого файла оригинального сообщения. Сохраните его с помощью значка \"Сохранить\" на панели действий, чтобы просмотреть содержимое полностью.</string>
     <string name="title_open_link">Открыть ссылку</string>
     <string name="title_different_link">Заголовок и адрес ссылки отличаются</string>
+    <string name="title_tracking_link">Этот сайт может отслеживать вас</string>
     <string name="title_link_http">Не шифровать трафик</string>
     <string name="title_link_https">Трафик будет зашифрован</string>
     <string name="title_sanitize_link">Удалить параметры отслеживания</string>
@@ -1147,6 +1148,7 @@
     <string name="title_add">Добавить</string>
     <string name="title_browse">В браузере</string>
     <string name="title_info">Информация</string>
+    <string name="title_download">Загрузить</string>
     <string name="title_report">Отчёт</string>
     <string name="title_fix">Исправить</string>
     <string name="title_enable">Включить</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8aa85ebd30..f42fbeb10b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1095,6 +1095,7 @@
     <string name="title_hint_eml">这是一个原始消息文件内容的摘要。用操作栏中的保存图标保存原始消息以查看所有内容。</string>
     <string name="title_open_link">打开链接</string>
     <string name="title_different_link">标题和链接地址不同</string>
+    <string name="title_tracking_link">此网站可能会跟踪你</string>
     <string name="title_link_http">流量不会被加密</string>
     <string name="title_link_https">流量将被加密</string>
     <string name="title_sanitize_link">删除跟踪参数</string>
@@ -1113,6 +1114,7 @@
     <string name="title_add">添加</string>
     <string name="title_browse">打开方式</string>
     <string name="title_info">信息</string>
+    <string name="title_download">下载</string>
     <string name="title_report">报告</string>
     <string name="title_fix">修复</string>
     <string name="title_enable">启用</string>