diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index ff4dd03a50..c699d0d8b8 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_limitations">Например, съобщенията винаги ще се преформатират, за да се премахнат опасни елементи и да се подобри четенето, както и връзките за отваряне трябва да бъдат потвърдени за безопасност.</string>
     <string name="app_crash">FairEmail не се поддържа на това устройство поради срив, причинен от грешка в Android</string>
     <string name="app_exit">Натиснете отново \"назад\", за изход</string>
+    <string name="channel_service">Получаване</string>
     <string name="channel_send">Изпращане</string>
     <string name="channel_notification">Известия</string>
     <string name="channel_update">Обновявания</string>
@@ -76,6 +77,7 @@
     <string name="title_notification_idle">Празен</string>
     <string name="title_notification_failed">%1$s се провали</string>
     <string name="title_notification_alert">Сигнал от сървър \'%1$s\'</string>
+    <string name="title_notification_sending_failed">Изпращането до %1$s неуспешно</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -301,7 +303,13 @@
     <string name="title_advanced_preview_lines">Редове на показване</string>
     <string name="title_advanced_addresses">Покажи адреса по подразбиране</string>
     <string name="title_advanced_attachments_alt">Покажи прикачените файлове след текста на съобщението</string>
+    <string name="title_advanced_thumbnails">Показване на миниатюри на изображения след текста на съобщението</string>
     <string name="title_advanced_contrast">Използвай висок контраст за текст на съобщението</string>
+    <string name="title_advanced_monospaced">Използвайте monospaced шрифт за текст на съобщението по подразбиране</string>
+    <string name="title_advanced_text_color">Избери цвят на текста</string>
+    <string name="title_advanced_text_size">Размер на текст</string>
+    <string name="title_advanced_text_font">Използвай шрифтове</string>
+    <string name="title_advanced_text_align">Подравняване на такст</string>
     <string name="title_advanced_collapse_quotes">Свиване на цитирания текст</string>
     <string name="title_advanced_images_inline">Автоматично показване на вградени изображения</string>
     <string name="title_advanced_seekbar">Покажи позицията на разговора с точка</string>
@@ -617,6 +625,7 @@
     <string name="title_duplicate_in">Дублиращо съобщение в %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
+    <string name="title_buttons">Бутони</string>
     <string name="title_seen">Отбелязвам като прочетено</string>
     <string name="title_unseen">Отбелязвам като непрочетено</string>
     <string name="title_hide">Скриване</string>
@@ -655,6 +664,9 @@
     <string name="title_more">Още</string>
     <string name="title_spam">Спам</string>
     <string name="title_move">Премести</string>
+    <string name="title_copy_btn">Копиране</string>
+    <string name="title_unsubscribe">Отписване</string>
+    <string name="title_message_rule">Създай правило</string>
     <string name="title_no_junk">Не е спам</string>
     <string name="title_move_to">Премести в &#8230;</string>
     <string name="title_move_to_folder">Премести в &#8230;</string>
@@ -745,10 +757,17 @@
     <string name="title_send_encryption">Криптиране</string>
     <string name="title_send_priority">Приоритет</string>
     <string name="title_no_server">Няма намерен сървър за \'%1$s\'</string>
+    <string name="title_style">Стил</string>
     <string name="title_style_bold">Удебелен</string>
     <string name="title_style_italic">Наклонен</string>
     <string name="title_style_underline">Подчертан</string>
     <string name="title_style_size">Големина</string>
+    <string name="title_style_size_small">Малък</string>
+    <string name="title_style_size_medium">Среден</string>
+    <string name="title_style_size_large">Голям</string>
+    <string name="title_style_font">Шрифт</string>
+    <string name="title_style_font_default">По подразбиране</string>
+    <string name="title_style_color">Цвят &#8230;</string>
     <string name="title_style_clear">Изчистване на форматирането</string>
     <string name="title_style_link">Вмъкване на връзка</string>
     <string name="title_add_image">Добавяне на изображение</string>
@@ -1014,6 +1033,7 @@
     <string name="title_legend_bold">Удебелен текст</string>
     <string name="title_legend_italic">Наклонен текст</string>
     <string name="title_legend_underline">Подчертан текст</string>
+    <string name="title_legend_text_style">Задаване на стил на текст</string>
     <string name="title_legend_metered">Измервана връзка</string>
     <string name="title_legend_unmetered">Неизмервана връзка</string>
     <string name="title_legend_roaming">Роуминг</string>
@@ -1293,4 +1313,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Курсив</item>
+        <item>Serif</item>
+        <item>Sans-serif</item>
+        <item>Monospace</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5a55f9e3ba..f88a9a1bc8 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -779,6 +779,7 @@
     <string name="title_send_encryption">Šifrování</string>
     <string name="title_send_priority">Priorita</string>
     <string name="title_no_server">Nenalezen žádný server na \'%1$s\'</string>
+    <string name="title_style">Styl</string>
     <string name="title_style_bold">Tučně</string>
     <string name="title_style_italic">Kurzíva</string>
     <string name="title_style_underline">Podtržení</string>
@@ -786,6 +787,9 @@
     <string name="title_style_size_small">Malý</string>
     <string name="title_style_size_medium">Střední</string>
     <string name="title_style_size_large">Velký</string>
+    <string name="title_style_font">Písmo</string>
+    <string name="title_style_font_default">Výchozí</string>
+    <string name="title_style_color">Barva &#8230;</string>
     <string name="title_style_clear">Vymazat formátování</string>
     <string name="title_style_link">Vložit odkaz</string>
     <string name="title_add_image">Přidat obrázek</string>
@@ -1051,6 +1055,7 @@
     <string name="title_legend_bold">Změnit text na tučný</string>
     <string name="title_legend_italic">Změnit text na kurzívu</string>
     <string name="title_legend_underline">Podtrhnout text</string>
+    <string name="title_legend_text_style">Nastavit styl textu</string>
     <string name="title_legend_metered">Současné připojení je účtováno</string>
     <string name="title_legend_unmetered">Současné připojení není účtováno</string>
     <string name="title_legend_roaming">Roaming</string>
@@ -1332,4 +1337,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Kurzíva</item>
+        <item>Patkové</item>
+        <item>Bezpatkové</item>
+        <item>Neproporcionální</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index fea0f78721..453635bfb5 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -303,6 +303,7 @@
     <string name="title_advanced_preview_lines">Antal forhåndsvisningslinier</string>
     <string name="title_advanced_addresses">Vis adresseoplysninger som standard</string>
     <string name="title_advanced_attachments_alt">Vis vedhæftninger efter beskedteksten</string>
+    <string name="title_advanced_thumbnails">Vis billedminiaturer efter beskedteksten</string>
     <string name="title_advanced_contrast">Benyt høj kontrast til beskedtekst</string>
     <string name="title_advanced_monospaced">Benyt som standard monospatieret skrifttype til beskedtekst</string>
     <string name="title_advanced_text_color">Benyt tekstfarver</string>
@@ -766,10 +767,6 @@
     <string name="title_style_size_medium">Mellem</string>
     <string name="title_style_size_large">Stor</string>
     <string name="title_style_font">Skrifttype</string>
-    <string name="title_style_font_cursive">Kursiv</string>
-    <string name="title_style_font_serif">Serif</string>
-    <string name="title_style_font_sans_serif">Sans-serif</string>
-    <string name="title_style_font_monospace">Monospatieret</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_color">Farve &#8230;</string>
     <string name="title_style_clear">Ryd formatering</string>
@@ -1317,4 +1314,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Kursiv</item>
+        <item>Serif</item>
+        <item>Sans-serif</item>
+        <item>Monospatieret</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 5dc55dfba0..59896f67fb 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -304,6 +304,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_preview_lines">Anzahl der Vorschauzeilen</string>
     <string name="title_advanced_addresses">Adressdetails standardmäßig anzeigen</string>
     <string name="title_advanced_attachments_alt">Anhänge nach (statt vor) dem Nachrichtentext anzeigen</string>
+    <string name="title_advanced_thumbnails">Vorschaubilder nach dem Nachrichtentext anzeigen</string>
     <string name="title_advanced_contrast">Hohen Kontrast für den Nachrichtentext verwenden</string>
     <string name="title_advanced_monospaced">Unproportionale Schriftart standardmäßig für den Nachrichtentext verwenden</string>
     <string name="title_advanced_text_color">Textfarben verwenden</string>
@@ -513,6 +514,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_primary">Hauptkonto</string>
     <string name="title_primary_account">Hauptkonto</string>
     <string name="title_primary_identity">Hauptidentität</string>
+    <string name="title_self_identity">E-Mail-Adresse beim Antworten entfernen</string>
     <string name="title_leave_on_server">Nachrichten auf Server belassen</string>
     <string name="title_leave_deleted">Gelöschte Nachrichten auf Server belassen</string>
     <string name="title_leave_on_device">Nachrichten auf Gerät belassen</string>
@@ -766,10 +768,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_style_size_medium">Mittel</string>
     <string name="title_style_size_large">Groß</string>
     <string name="title_style_font">Schriftart</string>
-    <string name="title_style_font_cursive">Kursiv</string>
-    <string name="title_style_font_serif">Serife</string>
-    <string name="title_style_font_sans_serif">Serifenlos</string>
-    <string name="title_style_font_monospace">Festbreitenschrift</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_color">Farbe &#8230;</string>
     <string name="title_style_clear">Formatierung entfernen</string>
@@ -1023,7 +1021,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_legend_download">Inhalt herunterladen</string>
     <string name="title_legend_external_image">Platzhalter für externe Bilder</string>
     <string name="title_legend_embedded_image">Platzhalter für eingebettete Bilder</string>
-    <string name="title_legend_tracking_pixel">Tracking-Bild</string>
+    <string name="title_legend_tracking_pixel">Nachverfolgungsbild</string>
     <string name="title_legend_broken_image">Defekte Bilddatei</string>
     <string name="title_legend_pick">Kontakt auswählen</string>
     <string name="title_legend_cc">Kopie/Blindkopie anzeigen</string>
@@ -1050,7 +1048,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_legend_edit">Bearbeiten</string>
     <string name="title_legend_default_color">Standardfarbe</string>
     <string name="title_legend_close_hint">Hinweis schließen</string>
-    <string name="title_legend_connection_state">Verbindungsstatus</string>
+    <string name="title_legend_connection_state">Verbindungsart</string>
     <string name="title_legend_sync_state">Synchronisationsstatus</string>
     <string name="title_legend_download_state">Übertragungsstatus</string>
     <string name="title_legend_save">Speichern</string>
@@ -1315,4 +1313,10 @@ Zur Erinnerung daran zeigt FairEmail einen kleinen Hinweis an, dieser verschwind
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Kursiv</item>
+        <item>Serifenbetont</item>
+        <item>Serifenlos</item>
+        <item>Festbreitenschrift</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index c962e44064..7e98ea1681 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -767,11 +767,6 @@
     <string name="title_style_size_medium">Mediano</string>
     <string name="title_style_size_large">Grande</string>
     <string name="title_style_font">Fuente</string>
-    <string name="title_style_font_cursive">Cursiva</string>
-    <string name="title_style_font_serif">Serif</string>
-    <string name="title_style_font_sans_serif">Sans-serif</string>
-    <string name="title_style_font_monospace">Monoespaciado</string>
-    <string name="title_style_font_default">Por defecto</string>
     <string name="title_style_color">Color &#8230;</string>
     <string name="title_style_clear">Quitar formato</string>
     <string name="title_style_link">Insertar enlace</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index d2e2870d93..634afd6010 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_search">جستجوی FairEmail</string>
-    <string name="app_changelog">گذارش دگرگونی</string>
+    <string name="app_changelog">گزارش دگرگونی</string>
     <string name="app_welcome">FairEmail یک برنامه منبع باز بوده که تمرکز آن بر روی امنیت و حفظ حریم خصوصی است. بنابر دلایلی ممکن است برخی ویژگی‌ها بسته به نوع استفاده شما متفاوت باشند.</string>
     <string name="app_limitations">برای مثال پیام‌ها همواره برای حذف عناصر ناامن و بهبود خوانایی متن شکل‌ بندی خواهند شد و باز کردن لینک‌ها نیز برای ایمنی بیشتر نیاز به تایید دارد.</string>
     <string name="app_crash">FairEmail در دستگاه شما پشتیبانی نمی‌شود، چون به دلیل وجود اشکالاتی در اندروید موجب خرابی برنامه می‌شود</string>
     <string name="app_exit">برای خروج دوباره روی \'بازگشت\' کلیک کنید</string>
+    <string name="channel_service">دریافت</string>
     <string name="channel_send">ارسال</string>
     <string name="channel_notification">اعلان‌ها</string>
     <string name="channel_update">به‌روزرسانی‌ها</string>
@@ -76,6 +77,7 @@
     <string name="title_notification_idle">بیکار</string>
     <string name="title_notification_failed">\'%1$s\' انجام نشد</string>
     <string name="title_notification_alert">\'%1$s\' هشدار سرور</string>
+    <string name="title_notification_sending_failed">ارسال به %1$s ناموفق بود</string>
     <string name="title_of">%1$s/%2$s</string>
     <string name="title_name_count">%1$s (%2$s)</string>
     <string name="title_name_plus">%1$s +%2$d</string>
@@ -208,6 +210,7 @@
     <string name="title_advanced_section_encryption">رمزنگاری</string>
     <string name="title_advanced_section_notifications">اعلان‌ها</string>
     <string name="title_advanced_section_misc">متفرقه</string>
+    <string name="title_advanced_receive">دریافت پیام‌ها برای همه حساب‌ها</string>
     <string name="title_advanced_when">وقتی‌که</string>
     <string name="title_advanced_schedule">زمان بندی</string>
     <string name="title_advanced_advanced">پیشرفته</string>
@@ -287,6 +290,7 @@
     <string name="title_advanced_double_back">برای خروج دوبار \'بازگشت\' را بزنید</string>
     <string name="title_advanced_pull_refresh">برای بروزرسانی به پایین بکشید</string>
     <string name="title_advanced_swipenav">کشیدن به چپ/راست برای رفتن به مکالمه بعدی/قبلی</string>
+    <string name="title_advanced_volumenav">بالا/پایین بردن صدا برای رفتن به گفتگوی بعدی/قبلی</string>
     <string name="title_advanced_autoexpand">بسط دادن خودکار پیام‌ها</string>
     <string name="title_advanced_autoclose">بستن خودکار مکالمات</string>
     <string name="title_advanced_onclose">هنگام بستن یک گفتگو</string>
@@ -297,6 +301,7 @@
     <string name="title_advanced_notifications_default">کانال پیشفرض</string>
     <string name="title_advanced_notifications_service">کانال سرویس</string>
     <string name="title_advanced_notifications_background">استفاده از سرویس پس‌زمینه برای همگام‌سازی پیام‌ها</string>
+    <string name="title_advanced_notifications_background_hint">یک سرویس پس‌زمینه می‌تواند هر هنگام توسط اندروید متوقف شود، ولی نیاز به اعلان نوار وضعیت ندارد</string>
     <string name="title_advanced_badge">نمایش عدد پیام‌های جدید با آیکون راه‌انداز</string>
     <string name="title_advanced_notify_known">اعلان‌ها را تنها برای مخاطبین نمایش بده</string>
     <string name="title_advanced_notify_summary">تنها چکیده اعلان را نمایش بده</string>
@@ -620,10 +625,17 @@
     <string name="title_send_encryption">رمزنگاری</string>
     <string name="title_send_priority">اولويت</string>
     <string name="title_no_server">هیچ سروری در \'%1$s\' یافت نشد</string>
+    <string name="title_style">سبک</string>
     <string name="title_style_bold">درشت</string>
     <string name="title_style_italic">مورب</string>
     <string name="title_style_underline">خط زیر</string>
     <string name="title_style_size">اندازه</string>
+    <string name="title_style_size_small">کوچک</string>
+    <string name="title_style_size_medium">متوسط</string>
+    <string name="title_style_size_large">بزرگ</string>
+    <string name="title_style_font">فونت</string>
+    <string name="title_style_font_default">پیش‌فرض</string>
+    <string name="title_style_color">رنگ &#8230;</string>
     <string name="title_style_clear">پاک کردن شکل‌بندی</string>
     <string name="title_style_link">درج لینک</string>
     <string name="title_add_image">افزودن تصویر</string>
@@ -672,7 +684,7 @@
     <string name="title_resync">همگام‌سازی دوباره</string>
     <string name="title_no_openpgp">OpenKeychain یافت نشد</string>
     <string name="title_user_interaction">در حال انتقال به OpenKeychain</string>
-    <string name="title_not_encrypted">پیام امضا یا رمزنگاری نشده</string>
+    <string name="title_not_encrypted">پیام امضا یا رمزگذاری نشده است</string>
     <string name="title_no_sign_key">کلید امضائی انتخاب نشده</string>
     <string name="title_reset_sign_key">بازنشانی کلید امضا</string>
     <string name="title_signature_none">پیام امضا نشده</string>
@@ -703,7 +715,7 @@
     <string name="title_search_with_unseen">خوانده نشده</string>
     <string name="title_search_with_flagged">ستاره‌دار</string>
     <string name="title_search_with_hidden">پنهان (فقط روی دستگاه)</string>
-    <string name="title_search_with_encrypted">رمزنگاری‌شده(فقط روی دستگاه)</string>
+    <string name="title_search_with_encrypted">رمزگذاری شده(فقط روی دستگاه)</string>
     <string name="title_search_with_attachments">همراه پیوست‌ها (فقط روی دستگاه)</string>
     <string name="title_search_with_size">اندازه پیام بزرگ‌تر از</string>
     <string name="title_search_with_before">قبل از</string>
@@ -711,7 +723,7 @@
     <string name="title_search_flag_unseen">خوانده نشده</string>
     <string name="title_search_flag_flagged">ستاره دار</string>
     <string name="title_search_flag_hidden">پنهان</string>
-    <string name="title_search_flag_encrypted">رمزنگاری شده</string>
+    <string name="title_search_flag_encrypted">رمزگذاری شده</string>
     <string name="title_search_flag_attachments">پیوست‎ها</string>
     <string name="title_search_flag_invite">دعوت</string>
     <string name="title_search_flag_size">اندازه &gt; %1$s</string>
@@ -840,7 +852,7 @@
     <string name="title_legend_importance">مهم</string>
     <string name="title_legend_importance_low">مهم نیست</string>
     <string name="title_legend_signed">امضا شده</string>
-    <string name="title_legend_encrypted">رمزنگاری شده</string>
+    <string name="title_legend_encrypted">رمزگذاری شده است</string>
     <string name="title_legend_auth">تأیید اعتبار ناموفق بود</string>
     <string name="title_legend_found">یافت شد</string>
     <string name="title_legend_snoozed">موقتا در حالت تعلیق است</string>
@@ -906,8 +918,8 @@
     <string name="title_hint_sync">دریافت پیامها می تواند زمانی بسته به سرعت سرویس دهنده، اتصال به اینترنت، دستگاه و تعداد پیام‌ها طول بکشد. هنگام دریافت پیامها ممکن است عملکرد برنامه کند شود.</string>
     <string name="title_hint_contact_actions">لمس طولانی برای گزینه‌ها</string>
     <string name="title_open_link">بازکردن لینک</string>
-    <string name="title_link_http">ترافیک رمزنگاری شده نخواهد بود</string>
-    <string name="title_link_https">ترافیک رمزنگاری شده خواهد بود</string>
+    <string name="title_link_http">ترافیک رمزگذاری نخواهد شد</string>
+    <string name="title_link_https">ترافیک رمزگذاری خواهد شد</string>
     <string name="title_sanitize_link">حذف پارامترهای ردیاب</string>
     <string name="title_insecure_link">این پیوند نا‌امن می‌باشد</string>
     <string name="title_check_owner">بررسی مالک</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 3172c39b02..e05634b437 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -303,6 +303,7 @@
     <string name="title_advanced_preview_lines">Nombre de lignes d’aperçu</string>
     <string name="title_advanced_addresses">Afficher les détails de l’adresse par défaut</string>
     <string name="title_advanced_attachments_alt">Afficher les pièces jointes après le texte du message</string>
+    <string name="title_advanced_thumbnails">Afficher les vignettes des images après le texte du message</string>
     <string name="title_advanced_contrast">Utiliser un contraste élevé pour le texte du message</string>
     <string name="title_advanced_monospaced">Utiliser une police à espacement fixe pour le texte du message</string>
     <string name="title_advanced_text_color">Afficher les couleurs du texte</string>
@@ -512,6 +513,7 @@
     <string name="title_primary">Principal</string>
     <string name="title_primary_account">Principal (compte par défaut)</string>
     <string name="title_primary_identity">Principal (identité par défaut)</string>
+    <string name="title_self_identity">Supprimer l\'adresse e-mail lors de la réponse</string>
     <string name="title_leave_on_server">Laisser les messages sur le serveur</string>
     <string name="title_leave_deleted">Laisser les messages supprimés sur le serveur</string>
     <string name="title_leave_on_device">Laisser les messages sur l’appareil</string>
@@ -766,10 +768,6 @@
     <string name="title_style_size_medium">Moyen</string>
     <string name="title_style_size_large">Grand</string>
     <string name="title_style_font">Police de caractères</string>
-    <string name="title_style_font_cursive">Cursive</string>
-    <string name="title_style_font_serif">Avec empattement</string>
-    <string name="title_style_font_sans_serif">Sans empattement</string>
-    <string name="title_style_font_monospace">À espacement fixe</string>
     <string name="title_style_font_default">Par défaut</string>
     <string name="title_style_color">Couleur&#8230;</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
@@ -1317,4 +1315,10 @@
         <item>20 Mo</item>
         <item>50 Mo</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Cursive</item>
+        <item>Avec empattement</item>
+        <item>Sans empattement</item>
+        <item>À espacement fixe</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 7803a2025e..3bfd115b5a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -303,6 +303,7 @@
     <string name="title_advanced_preview_lines">Nombre de lignes d\'aperçu</string>
     <string name="title_advanced_addresses">Déplier les détails de l’adresse par défaut</string>
     <string name="title_advanced_attachments_alt">Afficher les pièces jointes après le texte du message</string>
+    <string name="title_advanced_thumbnails">Afficher les vignettes des images après le texte du message</string>
     <string name="title_advanced_contrast">Utiliser un contraste élevé pour le texte du message</string>
     <string name="title_advanced_monospaced">Utiliser une police à espacement fixe pour le texte du message</string>
     <string name="title_advanced_text_color">Afficher les couleurs du texte</string>
@@ -512,6 +513,7 @@
     <string name="title_primary">Principal</string>
     <string name="title_primary_account">Principal (compte par défaut)</string>
     <string name="title_primary_identity">Principal (identité par défaut)</string>
+    <string name="title_self_identity">Supprimer l\'adresse e-mail lors de la réponse</string>
     <string name="title_leave_on_server">Laisser les messages sur le serveur</string>
     <string name="title_leave_deleted">Laisser les messages supprimés sur le serveur</string>
     <string name="title_leave_on_device">Laisser les messages sur l\'appareil</string>
@@ -766,10 +768,6 @@
     <string name="title_style_size_medium">Moyen</string>
     <string name="title_style_size_large">Grand</string>
     <string name="title_style_font">Police de caractères</string>
-    <string name="title_style_font_cursive">Cursive</string>
-    <string name="title_style_font_serif">Avec empattement</string>
-    <string name="title_style_font_sans_serif">Sans empattement</string>
-    <string name="title_style_font_monospace">À espacement fixe</string>
     <string name="title_style_font_default">Par défaut</string>
     <string name="title_style_color">Couleur&#8230;</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
@@ -1317,4 +1315,10 @@
         <item>20 Mo</item>
         <item>50 Mo</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Cursive</item>
+        <item>Avec empattement</item>
+        <item>Sans empattement</item>
+        <item>À espacement fixe</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index d16de5f571..705ad3a950 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -303,6 +303,7 @@
     <string name="title_advanced_preview_lines">Numero di linee di anteprima</string>
     <string name="title_advanced_addresses">Mostra i dettagli dell\'indirizzo per impostazione predefinita</string>
     <string name="title_advanced_attachments_alt">Mostra allegati dopo il testo del messaggio</string>
+    <string name="title_advanced_thumbnails">Mostra le miniature dell\'immagine dopo il testo del messaggio</string>
     <string name="title_advanced_contrast">Usa il contrasto elevato per il testo del messaggio</string>
     <string name="title_advanced_monospaced">Usa caratteri monospaziati per il testo del messaggio standard</string>
     <string name="title_advanced_text_color">Usa colori testo</string>
@@ -765,10 +766,6 @@
     <string name="title_style_size_medium">Medio</string>
     <string name="title_style_size_large">Grande</string>
     <string name="title_style_font">Tipo di carattere</string>
-    <string name="title_style_font_cursive">Corsivo</string>
-    <string name="title_style_font_serif">Caratteri con grazie</string>
-    <string name="title_style_font_sans_serif">Caratteri senza grazie</string>
-    <string name="title_style_font_monospace">Monospaziato</string>
     <string name="title_style_font_default">Predefinito</string>
     <string name="title_style_color">Colore &#8230;</string>
     <string name="title_style_clear">Cancella formattazione</string>
@@ -1316,4 +1313,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Corsivo</item>
+        <item>Caratteri con grazie</item>
+        <item>Caratteri senza grazie</item>
+        <item>Monospaziato</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 f25ca4c566..254488a008 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -302,6 +302,7 @@
     <string name="title_advanced_preview_lines">Aantal lijnen voorbeeld</string>
     <string name="title_advanced_addresses">Adresgegevens standaard weergeven</string>
     <string name="title_advanced_attachments_alt">Bijlagen weergeven na de berichttekst</string>
+    <string name="title_advanced_thumbnails">Afbeeldingsminiaturen weergeven na de berichttekst</string>
     <string name="title_advanced_contrast">Gebruik hoge contrast voor berichttekst</string>
     <string name="title_advanced_monospaced">Gebruik standaard vaste breedte lettertype voor berichttekst</string>
     <string name="title_advanced_text_color">Gebruik tekstkleuren</string>
@@ -511,6 +512,7 @@
     <string name="title_primary">Primair</string>
     <string name="title_primary_account">Primair account (standaard account)</string>
     <string name="title_primary_identity">Primaire identiteit (standaard identiteit)</string>
+    <string name="title_self_identity">Verwijder e-mailadres bij antwoorden</string>
     <string name="title_leave_on_server">Laat berichten achter op de server</string>
     <string name="title_leave_deleted">Laat verwijderde berichten achter op de server</string>
     <string name="title_leave_on_device">Laat berichten achter op apparaat</string>
@@ -765,10 +767,6 @@
     <string name="title_style_size_medium">Middelgroot</string>
     <string name="title_style_size_large">Groot</string>
     <string name="title_style_font">Lettertype</string>
-    <string name="title_style_font_cursive">Schrijfletter</string>
-    <string name="title_style_font_serif">Met schreef</string>
-    <string name="title_style_font_sans_serif">Schreefloos</string>
-    <string name="title_style_font_monospace">Vaste breedte</string>
     <string name="title_style_font_default">Standaard</string>
     <string name="title_style_color">Kleur &#8230;</string>
     <string name="title_style_clear">Opmaak wissen</string>
@@ -1315,4 +1313,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Schrijfletter</item>
+        <item>Met schreef</item>
+        <item>Schreefloos</item>
+        <item>Vaste breedte</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 8459270168..28fbcd05ea 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -324,6 +324,7 @@
     <string name="title_advanced_preview_lines">Liczba linii podglądu</string>
     <string name="title_advanced_addresses">Domyślnie pokazuj szczegóły adresu</string>
     <string name="title_advanced_attachments_alt">Pokaż załączniki za treścią wiadomości</string>
+    <string name="title_advanced_thumbnails">Pokaż miniatury obrazów po tekście wiadomości</string>
     <string name="title_advanced_contrast">Użyj wysokiego kontrastu dla tekstu wiadomości</string>
     <string name="title_advanced_monospaced">Użyj czcionki o stałej szerokości dla tekstu wiadomości</string>
     <string name="title_advanced_text_color">Użyj kolorów tekstu</string>
@@ -787,11 +788,7 @@
     <string name="title_style_size_medium">Średni</string>
     <string name="title_style_size_large">Duży</string>
     <string name="title_style_font">Czcionka</string>
-    <string name="title_style_font_cursive">Kursywa</string>
-    <string name="title_style_font_serif">Szeryfowa</string>
-    <string name="title_style_font_sans_serif">Bezszeryfowa</string>
-    <string name="title_style_font_monospace">O stałej szerokości znaków</string>
-    <string name="title_style_font_default">Domyślna</string>
+    <string name="title_style_font_default">Domyślny</string>
     <string name="title_style_color">Kolor &#8230;</string>
     <string name="title_style_clear">Wyczyść formatowanie</string>
     <string name="title_style_link">Wstaw link</string>
@@ -1339,4 +1336,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Kursywa</item>
+        <item>Szeryfowa</item>
+        <item>Bezszeryfowa</item>
+        <item>Stała szerokość</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5c9d094c48..b0134c9238 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -313,7 +313,13 @@
     <string name="title_advanced_preview_lines">Numărul de linii de previzualizat</string>
     <string name="title_advanced_addresses">Implicit arată detaliile adreselor</string>
     <string name="title_advanced_attachments_alt">Arată atașamentele după textul mesajului</string>
+    <string name="title_advanced_thumbnails">Arată miniaturile imaginilor după textul mesajului</string>
     <string name="title_advanced_contrast">Folosește contrast ridicat pentru text</string>
+    <string name="title_advanced_monospaced">Folosește implicit fontul proporțional pentru textul mesajului</string>
+    <string name="title_advanced_text_color">Folosește culori text</string>
+    <string name="title_advanced_text_size">Folosește mărimi text</string>
+    <string name="title_advanced_text_font">Folosește fonturi</string>
+    <string name="title_advanced_text_align">Folosește alinierea textului</string>
     <string name="title_advanced_collapse_quotes">Restrânge textul citat</string>
     <string name="title_advanced_images_inline">Arată automat imaginile integrate</string>
     <string name="title_advanced_seekbar">Arată poziția relativă în conversație cu un punct</string>
@@ -669,6 +675,9 @@
     <string name="title_more">Mai mult</string>
     <string name="title_spam">Spam</string>
     <string name="title_move">Mută</string>
+    <string name="title_copy_btn">Copiere</string>
+    <string name="title_unsubscribe">Dezabonare</string>
+    <string name="title_message_rule">Creare regulă</string>
     <string name="title_no_junk">Nu este spam</string>
     <string name="title_move_to">Mută în &#8230;</string>
     <string name="title_move_to_folder">Mută în &#8230;</string>
@@ -759,10 +768,16 @@
     <string name="title_send_encryption">Criptare</string>
     <string name="title_send_priority">Prioritate</string>
     <string name="title_no_server">Nu există un server la \'%1$s\'</string>
+    <string name="title_style">Stil</string>
     <string name="title_style_bold">Îngroșat</string>
     <string name="title_style_italic">Cursiv</string>
     <string name="title_style_underline">Subliniere</string>
     <string name="title_style_size">Mărime</string>
+    <string name="title_style_size_small">Mic</string>
+    <string name="title_style_size_medium">Mediu</string>
+    <string name="title_style_size_large">Mare</string>
+    <string name="title_style_font">Font</string>
+    <string name="title_style_color">Culoare &#8230;</string>
     <string name="title_style_clear">Elimină toate formatările</string>
     <string name="title_style_link">Inserare legătură</string>
     <string name="title_add_image">Adăugare imagine</string>
@@ -1028,6 +1043,7 @@
     <string name="title_legend_bold">Face textul aldin</string>
     <string name="title_legend_italic">Face textul cursiv</string>
     <string name="title_legend_underline">Subliniere text</string>
+    <string name="title_legend_text_style">Setare stil text</string>
     <string name="title_legend_metered">Conexiunea este contorizată</string>
     <string name="title_legend_unmetered">Conexiunea este necontorizată</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 54e3d18a3a..751adc84a4 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -325,6 +325,7 @@
     <string name="title_advanced_preview_lines">Количество строк предпросмотра</string>
     <string name="title_advanced_addresses">По умолчанию показывать подробную информацию об адресах</string>
     <string name="title_advanced_attachments_alt">Показывать вложения после текста сообщения</string>
+    <string name="title_advanced_thumbnails">Показывать миниатюры изображений после текста сообщения</string>
     <string name="title_advanced_contrast">Использовать высокий контраст для текста сообщений</string>
     <string name="title_advanced_monospaced">По умолчанию использовать моношированный шрифт для текста сообщения</string>
     <string name="title_advanced_text_color">Использовать цвета текста</string>
@@ -534,6 +535,7 @@
     <string name="title_primary">Основная</string>
     <string name="title_primary_account">Основная (учётная запись по умолчанию)</string>
     <string name="title_primary_identity">Основной (идентификатор по умолчанию)</string>
+    <string name="title_self_identity">Удалять адрес электронной почты при ответе</string>
     <string name="title_leave_on_server">Оставлять сообщения на сервере</string>
     <string name="title_leave_deleted">Оставлять удалённые сообщения на сервере</string>
     <string name="title_leave_on_device">Оставлять сообщения на устройстве</string>
@@ -788,12 +790,8 @@
     <string name="title_style_size_medium">Средний</string>
     <string name="title_style_size_large">Большой</string>
     <string name="title_style_font">Шрифт</string>
-    <string name="title_style_font_cursive">Курсив</string>
-    <string name="title_style_font_serif">С засечками</string>
-    <string name="title_style_font_sans_serif">Без засечек</string>
-    <string name="title_style_font_monospace">Моноширинный</string>
     <string name="title_style_font_default">По умолчанию</string>
-    <string name="title_style_color">Цвет &#8230;</string>
+    <string name="title_style_color">Цвет&#8230;</string>
     <string name="title_style_clear">Очистить форматирование</string>
     <string name="title_style_link">Вставить ссылку</string>
     <string name="title_add_image">Добавить изображение</string>
@@ -1341,4 +1339,10 @@
         <item>20 МБ</item>
         <item>50 МБ</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Курсив</item>
+        <item>С засечками</item>
+        <item>Без засечек</item>
+        <item>Моноширинный</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index cfc6bf0741..55a148da00 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -128,7 +128,183 @@
     <string name="title_version">Verzia %1$s</string>
     <string name="title_list_accounts">Účty</string>
     <string name="title_list_identities">Identity</string>
+    <string name="title_edit_account">Upraviť účet</string>
+    <string name="title_edit_identity">Upraviť identitu</string>
+    <string name="title_edit_folder">Upraviť priečinok</string>
+    <string name="title_setup">Nastavenia</string>
+    <string name="title_setup_help">Pomoc</string>
+    <string name="title_setup_welcome">Prijímanie a posielanie správ vyžaduje nastavenie účtu a totožnosti ako v akejkoľvek inej e-mailovej aplikácii.
+        Rýchle nastavenie vytvorí obe, účet a totožnosť, pokiaľ zadáte Vaše meno, e-mailovú adresu a heslo.
+        Účet a totožnosť (alias) je možno nastaviť aj manuálne pokiaľ to je vyžadované.
+        Neštandardné protokoly, ako Microsoft Exchange Web Services a Microsoft ActiveSync, nie sú podporované, viac informácií v popise aplikácie.    </string>
+    <string name="title_setup_quick">Rýchle nastavenie</string>
+    <string name="title_setup_quick_remark">Pre rýchle nastavenie účtu a totožnosti pre väčšinu poskytovateľov</string>
+    <string name="title_setup_quick_hint">Rýchle nastavenie načíta informácie konfigurácie z autoconfig.thunderbird.net</string>
+    <string name="title_setup_quick_imap">IMAP server pre prijímanie správ</string>
+    <string name="title_setup_quick_smtp">IMAP server pre prijímanie správ</string>
+    <string name="title_setup_wizard">Sprievodca</string>
+    <string name="title_setup_wizard_multiple">Sprievodca inštaláciou môže byť použitý viacnásobne pre nastavenie viacerých účtov</string>
+    <string name="title_setup_wizard_remark">Vrátiť sa \'späť\' do inbox</string>
+    <string name="title_setup_other">Iný poskytovateľ</string>
+    <string name="title_setup_gmail_support">Autorizovanie účtu Google bude fungovať iba v oficiálnych verziách z dôvodu kontroly podpisu aplikácie zo strany Androidu</string>
+    <string name="title_setup_gmail_rationale">Prosím o udelenie povolenia pre vybratie účtu a načítanie Vášho mena</string>
+    <string name="title_setup_gmail_permissions">Google sa opýta na povolenia pre čítanie, písanie, odosielanie a trvalé vymazanie všetkých vašich e-mailov. FairEmail nikdy nevymaže vaše správy bez vášho vysloveného súhlasu.</string>
+    <string name="title_setup_gmail_drafts">Ak nie je priečinok s konceptmi dostupný cez IMAP, môže to byť napravené v nastaveniach štítkov v Gmaile</string>
+    <string name="title_setup_office_auth">Chyba \"OVERENIE zlyhalo\" môže byť zapríčinená zakázanými IMAP/SMTP správcom systému</string>
+    <string name="title_setup_oauth_rationale">Autorizovať prístup do vášho %1$s účtu</string>
+    <string name="title_setup_oauth_authorize">Autorizovať</string>
+    <string name="title_setup_select_account">Vybrať účet</string>
+    <string name="title_setup_instructions">Pokyny pre nastavenie</string>
+    <string name="title_setup_no_settings">Neboli nájdené žiadne nastavenia pre doménu \"%1$s\"</string>
+    <string name="title_setup_no_settings_hint">Vyskúšajte nastavenie účtu a identity v krokoch 1 a 2 nastavení použitím nastavení poskytovaných vaším e-mailovým poskytovateľom</string>
+    <string name="title_setup_no_auth_hint">Dvakrát skontrolujte vašu e-mailovú adresu a heslo a uistite sa, že u vášho účtu je povolený externý prístup IMAP/SMTP</string>
+    <string name="title_setup_app_password_hint">Tento poskytovateľ požaduje heslo aplikácie namiesto hesla účtu, skontrolujte pokyny vášho poskytovateľa</string>
+    <string name="title_setup_no_system_folders">Priečinok s doručenou poštu alebo s konceptmi nebol nájdený</string>
+    <string name="title_setup_quick_success">Účet a identita boli úspešne pridané</string>
+    <string name="title_setup_quick_failed">Môžete vyskúšať nastaviť účet a identitu nižšie</string>
+    <string name="title_setup_manage">Spravovať</string>
+    <string name="title_setup_grant">Udeliť</string>
+    <string name="title_setup_grant_again">Udeliť požadované oprávnenia</string>
+    <string name="title_setup_account">Nastaviť účty</string>
+    <string name="title_setup_account_remark">Prijímať e-mail</string>
+    <string name="title_setup_account_hint">Zmena farby, potiahnutie priečinka doľava/doprava, atď.</string>
+    <string name="title_setup_identity">Nastaviť identity</string>
+    <string name="title_setup_identity_remark">Odosielať e-mail</string>
+    <string name="title_setup_identity_hint">Zmena mena, farby, podpisu, atď.</string>
+    <string name="title_setup_permissions">Udeliť oprávnenia</string>
+    <string name="title_setup_permissions_remark">Prístup k informáciám kontaktov (voliteľné)</string>
+    <string name="title_setup_doze">Optimalizácia batérie</string>
+    <string name="title_setup_doze_remark">Neustále prijímanie e-mailov (voliteľné)</string>
+    <string name="title_setup_doze_instructions">V nasledujúcom dialógovom okne zvoľte \"Všetky aplikácie\" navrchu, vyberte túto aplikáciu a potvrďte \"Neoptimalizovať\"</string>
+    <string name="title_setup_doze_battery">Vysoká spotreba batérie?</string>
+    <string name="title_setup_doze_stopped">Zastavila sa synchronizácia?</string>
+    <string name="title_setup_data">Šetrič batérie je zapnutý</string>
+    <string name="title_setup_advanced_options">Zobraziť rozšírené možnosti</string>
+    <string name="title_setup_inbox">Prejsť ku správam</string>
+    <string name="title_setup_go">Spustiť</string>
+    <string name="title_setup_to_do">Dokončiť</string>
+    <string name="title_setup_done">Hotovo</string>
+    <string name="title_setup_still">Zostáva dokončiť</string>
+    <string name="title_setup_error">Chyba</string>
+    <string name="title_setup_export">Exportovať nastavenia</string>
+    <string name="title_setup_import">Importovať nastavenia</string>
+    <string name="title_setup_export_do">Gmailové účty prepojené s Google účtami na tomto zariadení nemôžu byť exportované</string>
+    <string name="title_setup_import_do">Importované účty budú pridané bez prepísania existujúcich účtov</string>
+    <string name="title_setup_password">Heslo</string>
+    <string name="title_setup_password_chars">Heslo obsahuje ovládacie alebo prázdne znaky</string>
+    <string name="title_setup_password_repeat">Zopakujte heslo</string>
+    <string name="title_setup_password_missing">Chýbajúce heslo</string>
+    <string name="title_setup_password_different">Heslá sa nezhodujú</string>
+    <string name="title_setup_password_invalid">Heslo je nesprávne</string>
+    <string name="title_setup_exported">Nastavenia boli exportované</string>
+    <string name="title_setup_imported">Nastavenia boli importované</string>
+    <string name="title_advanced_check_mx">Kontrolovať e-mailové adresy odosielateľov pri synchronizácii správ</string>
+    <string name="title_advanced_check_reply">Kontrolovať odpovede e-mailových adries pri synchronizácii správ</string>
+    <string name="title_advanced_tune_keep_alive">Automaticky upravovať interval udržania nažive</string>
+    <string name="title_advanced_keyboard">Predvolene zobrazovať klávesnicu</string>
+    <string name="title_advanced_suggest_local">Navrhovať miestne kontakty</string>
+    <string name="title_advanced_suggest_sent">Navrhovať adresy nájdené v odoslaných správach</string>
+    <string name="title_advanced_suggest_received">Navrhovať adresy nájdené v prijatých správach</string>
+    <string name="title_advanced_suggest_frequently">Radiť navrhované správy podľa počtu použití</string>
+    <string name="title_advanced_auto_list">Automaticky vytvárať zoznamy</string>
+    <string name="title_advanced_prefix_once">Pri odpovedaní alebo preposielaní pridať do predmetu len jednu predponu</string>
+    <string name="title_advanced_extended_reply">Používať rozšírenú hlavičku odpovede/preposlania</string>
+    <string name="title_advanced_quote_reply">Citovať text odpovede</string>
+    <string name="title_advanced_resize_reply">Upraviť veľkosť obrázkov v texte odpovede</string>
+    <string name="title_advanced_signature_location">Umiestnenie podpisu</string>
+    <string name="title_advanced_signature_reply">Používať podpis pri odpovedi</string>
+    <string name="title_advanced_signature_forward">Používať podpis pri preposielaní</string>
+    <string name="title_advanced_plain_only">Predvolene odosielať jednoduchý text</string>
+    <string name="title_advanced_flow">\"format flowed\" pre jednoduchý text</string>
+    <string name="title_advanced_receipt">Pri požadovaní potvrdenia</string>
+    <string name="title_advanced_usenet_signature">Používať konvenciu Usenet pre podpisy</string>
+    <string name="title_advanced_remove_signatures">Odstraňovať rozpoznané podpisy</string>
+    <string name="title_advanced_send_reminders">Zobrazovať pripomienky</string>
+    <string name="title_advanced_lookup_mx">Pred odoslaním skontrolovať e-mailové adresy príjemcov</string>
+    <string name="title_advanced_send_delayed">Zdržať odosielané správy</string>
+    <string name="title_advanced_metered">Používať účtované pripojenia</string>
+    <string name="title_advanced_download">Automaticky sťahovať správy a prílohy na účtovanom pripojení do veľkosti</string>
+    <string name="title_advanced_roaming">Sťahovať správy a prílohy behom roamingu</string>
+    <string name="title_advanced_rlah">Roaming ako doma</string>
+    <string name="title_advanced_timeout">Časový limit pripojenia (sekundy)</string>
+    <string name="title_advanced_ssl_harden">Obrniť SSL pripojenia</string>
+    <string name="title_advanced_manage_connectivity">Spravovať pripojenie</string>
+    <string name="title_advanced_caption_general">Všeobecné</string>
+    <string name="title_advanced_caption_list">Zoznam</string>
+    <string name="title_advanced_caption_conversation">Konverzácia</string>
+    <string name="title_advanced_caption_message">Správa</string>
+    <string name="title_advanced_caption_message_header">Hlavička správy</string>
+    <string name="title_advanced_caption_message_body">Obsah správy</string>
+    <string name="title_advanced_landscape">Používať dva stĺpce v režime na šírku</string>
+    <string name="title_advanced_landscape3">Predvolene zobrazovať navigačné menu v režime na šírku</string>
+    <string name="title_advanced_startup">Zobraziť na úvodnej obrazovke</string>
+    <string name="title_advanced_cards">Použiť štýl kariet namiesto tabuľkového štýlu</string>
+    <string name="title_advanced_date_header">Zoradiť podľa dátumu</string>
+    <string name="title_advanced_threading">Vlákna konverzácií</string>
+    <string name="title_advanced_threading_unread">Zobrazovať počet neprečítaných správ v konverzáciách</string>
+    <string name="title_advanced_indentation">Ľavé/pravé odsadenie prijatých/odoslaných správ v konverzáciách</string>
+    <string name="title_advanced_highlight_unread">Zvýrazniť neprečítané správy</string>
+    <string name="title_advanced_highlight_subject">Zvýrazniť predmet</string>
+    <string name="title_advanced_color_stripe">Zobraziť farebný prúžok</string>
+    <string name="title_advanced_avatars">Zobraziť fotografie kontaktov</string>
+    <string name="title_advanced_gravatars">Zobraziť Gravatary</string>
+    <string name="title_advanced_generated_icons">Zobraziť generované ikonky</string>
+    <string name="title_advanced_identicons">Zobrazovať identikony</string>
+    <string name="title_advanced_circular">Zobraziť okrúhle ikonky</string>
+    <string name="title_advanced_color_saturation">Saturácia</string>
+    <string name="title_advanced_color_value">Jas</string>
+    <string name="title_advanced_color_threshold">Prahová hodnota farby písma</string>
+    <string name="title_advanced_name_email">Zobraziť mená a e-mailové adresy</string>
+    <string name="title_advanced_show_recipients">Zobraziť príjemcov v hlavičke správy</string>
+    <string name="title_advanced_subject_top">Zobraziť predmet nad odosielateľom</string>
+    <string name="title_advanced_subject_italic">Zobraziť predmety v kurzíve</string>
+    <string name="title_advanced_keywords">Zobraziť kľúčové slová v hlavičke správy</string>
+    <string name="title_advanced_labels">Zobraziť štítky Gmailu v hlavičke správy</string>
+    <string name="title_advanced_flags">Zobraziť hviezdičky</string>
+    <string name="title_advanced_flags_background">Zobraziť farebné pozadie namiesto farebných hviezdičiek</string>
+    <string name="title_advanced_preview">Zobraziť náhľad správy</string>
+    <string name="title_advanced_preview_italic">Zobraziť náhľad správy v kurzíve</string>
+    <string name="title_advanced_attachments_alt">Zobraziť prílohy za textom správy</string>
+    <string name="title_advanced_thumbnails">Zobraziť miniatúry obrázkov za textom správy</string>
+    <string name="title_advanced_images_inline">Automaticky zobrazovať vložené obrázky</string>
+    <string name="title_advanced_seekbar">Zobraziť relatívnu pozíciu v konverzácii bodkou</string>
+    <string name="title_advanced_actionbar">Zobraziť akčný panel konverzácie</string>
+    <string name="title_advanced_navbar_colorize">Zafarbiť navigačný panel Androidu</string>
+    <string name="title_advanced_authentication">Zobraziť varovanie, ak prijímajúci server nemohol overiť správu</string>
+    <string name="title_advanced_reversed">Obrátiť smer navigácie</string>
+    <string name="title_advanced_quick_filter">Zobraziť neobťažujúce ikonky pre rýchle filtrovanie</string>
+    <string name="title_advanced_quick_scroll">Zobraziť neobťažujúce ikonky pre rýchly posun nahor/nadol</string>
+    <string name="title_advanced_badge">Zobraziť počet nových správ na ikonke aplikácie</string>
+    <string name="title_advanced_notify_known">Zobraziť oznámenia iba pre kontakty</string>
+    <string name="title_advanced_notify_summary">Zobraziť iba súhrnné oznámenie</string>
+    <string name="title_advanced_notify_preview">Zobraziť náhľad správy v oznámení</string>
+    <string name="title_advanced_biometrics_notify">Zobraziť obsah správy pri použití biometrického overenia</string>
+    <string name="title_advanced_confirm_images">Potvrdzovať zobrazenie obrázkov</string>
+    <string name="title_advanced_confirm_html">Predvolene zobraziť preformátované správy</string>
+    <string name="title_advanced_shortcuts">Zobraziť často používané kontakty v menu zdieľania Androidu</string>
+    <string name="title_advanced_send_reminders_hint">Zobraziť varovanie, ak je text správy alebo predmet prázdny alebo môže chýbať príloha</string>
+    <string name="title_advanced_name_email_hint">Pri vypnutí sa zobrazia iba dostupné mená</string>
+    <string name="title_advanced_bcc_hint">Adresy nebudú zobrazené, budú však pridané pri posielaní</string>
+    <string name="title_advanced_notify_action_hint">Budú zobrazené najviac tri činnosti</string>
+    <string name="title_advanced_notify_preview_all_hint">Pre nositeľné zariadenia, ktoré dokážu zobraziť celý text (do 5000 znakov)</string>
+    <string name="title_show_folders">Zobraziť skryté priečinky</string>
+    <string name="title_show_flagged">Zobraziť počet správ s hviezdičkou</string>
+    <string name="title_navigation_folder">Zobrazovať v navigačnom menu</string>
+    <string name="title_show_headers">Zobraziť hlavičky</string>
+    <string name="title_show_inline">Zobraziť vložené prílohy</string>
+    <string name="title_show_full">Zobraziť celú správu</string>
+    <string name="title_ask_show_html">Zobrazením pôvodnej správy môže dojsť k úniku citlivých informácií</string>
+    <string name="title_ask_show_html_images">Vždy zobraziť obrázky pri zobrazení pôvodných správ</string>
+    <string name="title_ask_show_image">Zobrazením obrázkov môže dojsť k úniku citlivých informácií</string>
+    <string name="title_ask_show_image_hint">Obrázky rozpoznané ako sledovacie nebudú zobrazené</string>
+    <string name="title_show_addresses">Zobraziť CC/BCC</string>
+    <string name="title_legend_show_images">Zobraziť obrázky</string>
+    <string name="title_legend_show_full">Zobraziť pôvodnú správu</string>
+    <string name="title_hint_folder_actions">Podržaním priečinka zobrazíte možnosti, napríklad pridanie priečinka do navigačného menu pre rýchly prístup</string>
     <!-- Thunderbird -->
+    <string name="title_accessibility_show_authentication_result">Zobraziť výsledok overovania</string>
+    <string name="title_accessibility_show_snooze_time">Zobraziť čas odloženia</string>
+    <string name="title_accessibility_show_addresses">Zobraziť adresy</string>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 3ec4c2e211..d1c81a9937 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -302,6 +302,7 @@
     <string name="title_advanced_preview_lines">Antal förhandsgranskningsrader</string>
     <string name="title_advanced_addresses">Visa adressuppgifter som standard</string>
     <string name="title_advanced_attachments_alt">Visa bilagor efter meddelandetexten</string>
+    <string name="title_advanced_thumbnails">Visa miniatyrbilder efter meddelandetexten</string>
     <string name="title_advanced_contrast">Använd hög kontrast för meddelandetext</string>
     <string name="title_advanced_monospaced">Använd monospaced typsnitt för meddelandetext som standard</string>
     <string name="title_advanced_text_color">Använd textfärger</string>
@@ -765,10 +766,6 @@
     <string name="title_style_size_medium">Medel</string>
     <string name="title_style_size_large">Stor</string>
     <string name="title_style_font">Typsnitt</string>
-    <string name="title_style_font_cursive">Kursivt</string>
-    <string name="title_style_font_serif">Serif</string>
-    <string name="title_style_font_sans_serif">Sans-serif</string>
-    <string name="title_style_font_monospace">Monospace</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_color">Färg &#8230;</string>
     <string name="title_style_clear">Rensa formatering</string>
@@ -1316,4 +1313,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>Kursivt</item>
+        <item>Serif</item>
+        <item>Sans-serif</item>
+        <item>Monospace</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 285263976a..585cbee41f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -291,6 +291,7 @@
     <string name="title_advanced_preview_lines">预览行数</string>
     <string name="title_advanced_addresses">默认显示地址详情</string>
     <string name="title_advanced_attachments_alt">在消息文本后显示附件</string>
+    <string name="title_advanced_thumbnails">在消息文本后显示图像缩略图</string>
     <string name="title_advanced_contrast">对消息文本使用高对比度颜色</string>
     <string name="title_advanced_monospaced">默认对消息文本使用等宽字体</string>
     <string name="title_advanced_text_color">使用文本颜色</string>
@@ -754,10 +755,6 @@
     <string name="title_style_size_medium">中等</string>
     <string name="title_style_size_large">大</string>
     <string name="title_style_font">字体</string>
-    <string name="title_style_font_cursive">草体</string>
-    <string name="title_style_font_serif">衬线体</string>
-    <string name="title_style_font_sans_serif">无衬线体</string>
-    <string name="title_style_font_monospace">等宽字体</string>
     <string name="title_style_font_default">默认</string>
     <string name="title_style_color">颜色 &#8230;</string>
     <string name="title_style_clear">清除格式</string>
@@ -1303,4 +1300,10 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="fontNameNames">
+        <item>草书</item>
+        <item>衬线体</item>
+        <item>无衬线体</item>
+        <item>等宽字体</item>
+    </string-array>
 </resources>