diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index f13052400f..9f6e53e34d 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -438,8 +438,8 @@
     <string name="title_advanced_vpn_only">Yalnız VPN vasitəsilə bağlantı qurun</string>
     <string name="title_advanced_timeout">Bağlantı bitmə vaxtı (saniyə)</string>
     <string name="title_advanced_prefer_ip4">IPv6 əvəzinə IPv4 tərcih et</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Tərcih edilən DNS server ünvanları (vergüllə ayrılmış)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Özəl DNS həlledici istifadə et</string>
+    <string name="title_advanced_dns">Tərcih edilən DNS server ünvanları (vergüllə ayrılmış)</string>
+    <string name="title_advanced_dns_custom">Özəl DNS həlledici istifadə et</string>
     <string name="title_advanced_ssl_update">Güncəl SSL provayderini istifadə et</string>
     <string name="title_advanced_ssl_harden">SSL bağlantılarını sağlam et</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 tələb et</string>
@@ -597,7 +597,7 @@
     <string name="title_advanced_expand_all">Bütün oxunan mesajları avtomatik genişləndir</string>
     <string name="title_advanced_expand_one">Bir dəfəyə yalnız bir mesajı genişləndir</string>
     <string name="title_advanced_collapse_multiple">Bir neçə mesajlı danışıqlardakı mesajları \"geri\" seçimində yığcamlaşdır</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Mesajların avtomatik oxundu olaraq işarələnməsi üzrə gecikmə</string>
+    <string name="title_advanced_seen_delay">Mesajların avtomatik oxundu olaraq işarələnməsi üzrə gecikmə</string>
     <string name="title_advanced_autoclose">Söhbətləri avtomatik bağla</string>
     <string name="title_advanced_autoclose_send">Mesajları göndərdikdən sonra danışıqları avtomatik bağla</string>
     <string name="title_advanced_onclose">Bir danışığı bağlayanda</string>
@@ -933,15 +933,15 @@
     <string name="title_aliases">Ləqəblər</string>
     <string name="title_provider">Provayder</string>
     <string name="title_custom">Xüsusi</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Məcbur et: DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Yalnız məhdud sayda DNS serveri DNSSEC-i dəstəkləyir</string>
+    <string name="title_dnssec">Məcbur et: DNSSEC</string>
+    <string name="title_dnssec_remark">Yalnız məhdud sayda DNS serveri DNSSEC-i dəstəkləyir</string>
     <string name="title_host">Host adı</string>
     <string name="title_encryption">Şifrələmə</string>
     <string name="title_encryption_none">Heç biri (güvənsiz)</string>
     <string name="title_allow_insecure">Güvənli olmayan bağlantılara icazə ver</string>
     <string name="title_insecure_remark">Güvənli olmayan bağlantılara, yalnız güvənli şəbəkələrdə icazə verilməli və heç vaxt ictimai şəbəkələrdə icazə verilməməlidir</string>
     <string name="title_dane">Məcbur et: DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Yalnız bəzi e-poçt provayderləri DANE-ni dəstəkləyir</string>
+    <string name="title_dane_remark">Yalnız bəzi e-poçt provayderləri DANE-ni dəstəkləyir</string>
     <string name="title_notify_remark">Bunu, hesaba özəl bildirişlər üçün fəallaşdıra bilərsiniz</string>
     <string name="title_port">Port nömrəsi</string>
     <string name="title_user">İstifadəçi adı</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 07d90c6c08..4928c67a1f 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">Трябва ми друг адрес на е-поща</string>
     <string name="title_setup_manual">Ръчна настройка и възможности на акаунта</string>
     <string name="title_setup_classic">Класическо конфигуриране</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Вълшебникът за бърза настройка за \"Друг доставчик\" горе обикновено също работи, а и е по-лесно от ръчно въвеждане на всички данни на сървъра.</string>
     <string name="title_setup_documentation">Прегледайте документацията на имейл доставчика си за правилна настройки на сървъра</string>
     <string name="title_setup_account_remark">Получаване на е-писмо</string>
     <string name="title_setup_identity_remark">Изпращане на е-писмо</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Влизане с помощта на Google</string>
     <string name="title_setup_other">Друг доставчик</string>
     <string name="title_setup_inbound">Само входящ имейл (не може да се изпращат е-писма!)</string>
+    <string name="title_setup_imap">Акаунт на IMAP</string>
     <string name="title_setup_pop3">Акаунт на POP3</string>
     <string name="title_setup_oauth_permission">Доставчикът на имейл одобрил OAuth само за версии на Play Store и GitHub</string>
     <string name="title_setup_gmail_support">Упълномощаването на акаунти в Google ще работи само във версии на Play Store и GitHub, защото Android проверява цифровия подпис на приложението</string>
@@ -437,6 +439,8 @@
     <string name="title_advanced_vpn_only">Свързване само чрез VPN</string>
     <string name="title_advanced_timeout">Време на изчакване на връзката (секунди)</string>
     <string name="title_advanced_prefer_ip4">Предпочитане на IPv4 пред IPv6</string>
+    <string name="title_advanced_dns">Предпочитани адреси на сървъри на DNS (разделени със запетая)</string>
+    <string name="title_advanced_dns_custom">Употреба на потребителски DNS преобразувател</string>
     <string name="title_advanced_ssl_update">Употреба на обновения доставчик SSL</string>
     <string name="title_advanced_ssl_harden">Твърди SSL връзки</string>
     <string name="title_advanced_ssl_harden_strict">Изисква се TLS 1.3</string>
@@ -567,6 +571,7 @@
     <string name="title_advanced_narrow_fonts">Употреба на тесни шрифтове</string>
     <string name="title_advanced_parse_classes">Листове за избор на стилове</string>
     <string name="title_advanced_authentication">Показване на предупрежденията за удостоверяване</string>
+    <string name="title_advanced_authentication_hint">Основните проверки може да се конфигурират в настройките за получаване</string>
     <string name="title_advanced_authentication_indicator">Показване на показателя за състоянието на удостоверяване</string>
     <string name="title_advanced_authentication_none">Няма удостоверяване</string>
     <string name="title_advanced_authentication_some">Частично удостоверяване</string>
@@ -574,6 +579,8 @@
     <string name="title_advanced_restore_on_launch">Възстановяване на състоянието на приложението при старт</string>
     <string name="title_advanced_sync_on_launch">Синхронизиране при пускане</string>
     <string name="title_advanced_double_back">Двойно назад за изход</string>
+    <string name="title_advanced_conversation_actions">Предлагане на действия (Android 10+)</string>
+    <string name="title_advanced_conversation_actions_replies">Предлагане на текстове за отговор (Android 10+)</string>
     <string name="title_advanced_language_detection">Разпознаване езика на текста на съобщението</string>
     <string name="title_advanced_photo_picker">Употреба на подбирача за снимки на Android</string>
     <string name="title_advanced_pull_refresh">Плъзни надолу за опресняване</string>
@@ -591,6 +598,7 @@
     <string name="title_advanced_expand_all">Автоматично разгъване на всички прочетени съобщения</string>
     <string name="title_advanced_expand_one">Разгъване само на едно съобщение на момента</string>
     <string name="title_advanced_collapse_multiple">Свиване на съобщенията от разговор с много съобщения при натискане \"назад\"</string>
+    <string name="title_advanced_seen_delay">Отлагане на автоматично означаване на съобщенията като прочетени</string>
     <string name="title_advanced_autoclose">Автоматично затваряне на разговори</string>
     <string name="title_advanced_autoclose_send">Автоматично затваряне на разговорите след изпращане на съобщенията</string>
     <string name="title_advanced_onclose">При затваряне на разговор</string>
@@ -727,6 +735,7 @@
     <string name="title_advanced_class_min_chance">Минимум вероятност на класа: %1$s %%</string>
     <string name="title_advanced_class_min_difference">Минимум разлика на класа: %1$s %%</string>
     <string name="title_advanced_show_filtered">Иконата на филтъра на показ при приложени правила</string>
+    <string name="title_advanced_haptic_feedback">Тактилна обратна връзка при важни действия</string>
     <string name="title_advanced_language">Език</string>
     <string name="title_advanced_language_system">Система</string>
     <string name="title_advanced_lt">Интегриране с LanguageTool</string>
@@ -925,12 +934,15 @@
     <string name="title_aliases">Псевдоним</string>
     <string name="title_provider">Доставчик</string>
     <string name="title_custom">Персонализиране</string>
+    <string name="title_dnssec">Налагане на употребата на DNSSEC</string>
+    <string name="title_dnssec_remark">Само ограничен брой сървъри на DNS поддържат DNSSEC</string>
     <string name="title_host">Име на хост</string>
     <string name="title_encryption">Криптиране</string>
     <string name="title_encryption_none">Няма (несигурно)</string>
     <string name="title_allow_insecure">Разрешаване на несигурни връзки</string>
     <string name="title_insecure_remark">Несигурните връзки трябва да се разрешават само в доверени мрежи и никога в обществени мрежи</string>
     <string name="title_dane">Налагане на употребата на DANE</string>
+    <string name="title_dane_remark">Само някои доставчици на е-поща поддържат DANE</string>
     <string name="title_notify_remark">Може да включите това за известия на конкретен акаунт</string>
     <string name="title_port">Номер на порт</string>
     <string name="title_user">Потребителско име</string>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index c7ffe3e5f6..9694b86c07 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -185,6 +185,7 @@
     <string name="title_setup_wizard_new">Potrebna je nova e-mail adresa</string>
     <string name="title_setup_manual">Ručno podešavanje i opcije za račun</string>
     <string name="title_setup_classic">Klasično podešavanje</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Obično radi i gore navedeni čarobnjak za brze postavke za \"druge provajdere\", te je jednostavnije od unosa svih serverskih podataka.</string>
     <string name="title_setup_documentation">Molimo da provjerite dokumente od vašeg e-mail provajdera (poslužitelja) za tačno podešavanje e-mail servera</string>
     <string name="title_setup_account_remark">Prijem e-pošte</string>
     <string name="title_setup_identity_remark">Pošalji e-poštu</string>
@@ -194,6 +195,7 @@
     <string name="title_setup_google_sign_in">Prijavite se preko Google-a</string>
     <string name="title_setup_other">Drugi provajder</string>
     <string name="title_setup_inbound">Samo dolazna pošta (e-pošta se ne može poslati!)</string>
+    <string name="title_setup_imap">IMAP račun</string>
     <string name="title_setup_pop3">POP3 račun</string>
     <string name="title_setup_oauth_permission">E-mail provajder je odobrio OAuth provjeru saamo za verziju iz Play trgovine i GitHub-a</string>
     <string name="title_setup_gmail_support">Autorizacija Google računa radit će samo u verzijama Play trgovine i GitHub-a, jer Android provjerava digitalne potpise aplikacija</string>
@@ -452,6 +454,8 @@
     <string name="title_advanced_vpn_only">Poveži se samo putem VPN-a</string>
     <string name="title_advanced_timeout">Konekcija na isteku (sekunde)</string>
     <string name="title_advanced_prefer_ip4">Preferiraj IPv4 preko IPv6</string>
+    <string name="title_advanced_dns">Adrese preferiranog DNS servera (odvojene zarezom)</string>
+    <string name="title_advanced_dns_custom">Koristi prilagođeni DNS resolver</string>
     <string name="title_advanced_ssl_update">Koristi ažurirani SSL provajder</string>
     <string name="title_advanced_ssl_harden">Ojačaj SSL konekcije</string>
     <string name="title_advanced_ssl_harden_strict">Zahtjevaj TLS 1.3</string>
@@ -609,6 +613,7 @@
     <string name="title_advanced_expand_all">Automatski raširi sve pročitane poruke</string>
     <string name="title_advanced_expand_one">Raširi samo jednu poruku u datom trenutku</string>
     <string name="title_advanced_collapse_multiple">Suzi poruke u konverzacijama sa višestrukim porukama u pozadini</string>
+    <string name="title_advanced_seen_delay">Odgodi automatsko označavanje poruka kao pročitanih</string>
     <string name="title_advanced_autoclose">Automatski zatvori konverzacije</string>
     <string name="title_advanced_autoclose_send">Automatski zatvoriti konverzacije nakon slanja poruka</string>
     <string name="title_advanced_onclose">Pri zatvaranju konverzacija</string>
@@ -944,11 +949,15 @@
     <string name="title_aliases">Pseudonimi</string>
     <string name="title_provider">Provajder</string>
     <string name="title_custom">Prilagođen</string>
+    <string name="title_dnssec">Forsiraj DNSSEC</string>
+    <string name="title_dnssec_remark">Samo ograničen broj DNS servera podržava DNSSEC</string>
     <string name="title_host">Naziv hosta</string>
     <string name="title_encryption">Šifriranje</string>
     <string name="title_encryption_none">Nema (nesigurno)</string>
     <string name="title_allow_insecure">Dopusti nesigurne konekcije</string>
     <string name="title_insecure_remark">Nesigurne konekcije trebaju biti dopuštene samo na pouzdanim mrežama i nikada na javnim mrežama</string>
+    <string name="title_dane">Forsiraj DANE</string>
+    <string name="title_dane_remark">Samo neki e-mail provajderi podržavaju DANE</string>
     <string name="title_notify_remark">Možete omogućiti ovo za obavještenja specifična za račune</string>
     <string name="title_port">Broj porta</string>
     <string name="title_user">Korisničko ime</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 8b5d80cf83..71c181f5a4 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -199,6 +199,7 @@
     <string name="title_setup_wizard_new">Potřebuji novou e-mailovou adresu</string>
     <string name="title_setup_manual">Ruční nastavení a možnosti účtu</string>
     <string name="title_setup_classic">Klasická konfigurace</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Průvodce rychlým nastavením výše uvedeného \"Ostatní poskytovatele\" obvykle funguje a je snazší, než vkládat všechna data serveru.</string>
     <string name="title_setup_documentation">Pro správné nastavení e-mailového serveru si prosím přečtěte dokumentaci svého poskytovatele e-mailu</string>
     <string name="title_setup_account_remark">Příjem e-mailů</string>
     <string name="title_setup_identity_remark">Odesílání e-mailů</string>
@@ -208,6 +209,7 @@
     <string name="title_setup_google_sign_in">Přihlásit se pomocí Googlu</string>
     <string name="title_setup_other">Jiný poskytovatel</string>
     <string name="title_setup_inbound">Pouze příchozí e-maily (e-mail nelze odeslat)</string>
+    <string name="title_setup_imap">IMAP účet</string>
     <string name="title_setup_pop3">POP3 účet</string>
     <string name="title_setup_oauth_permission">Poskytovatel e-mailu schválil OAuth pouze pro Google Play a GitHub verzi</string>
     <string name="title_setup_gmail_support">Autorizace účtů Google bude fungovat pouze v Google Play a GitHub verzi, protože Android kontroluje digitální podpis aplikace</string>
@@ -466,6 +468,8 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_advanced_vpn_only">Připojit pouze pomocí VPN</string>
     <string name="title_advanced_timeout">Časový limit připojení (sekundy)</string>
     <string name="title_advanced_prefer_ip4">Upřednostňovat IPv4 před IPv6</string>
+    <string name="title_advanced_dns">Adresy preferovaných DNS serverů (oddělených čárkami)</string>
+    <string name="title_advanced_dns_custom">Použít vlastní DNS resolver</string>
     <string name="title_advanced_ssl_update">Použít aktualizovaného poskytovatele SSL</string>
     <string name="title_advanced_ssl_harden">Obrnit SSL připojení</string>
     <string name="title_advanced_ssl_harden_strict">Vyžadovat TLS 1.3</string>
@@ -623,6 +627,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_advanced_expand_all">Rozbalovat všechny přečtené zprávy automaticky</string>
     <string name="title_advanced_expand_one">Rozbalit vždy pouze jednu zprávu</string>
     <string name="title_advanced_collapse_multiple">Při pohybu \"zpět\" sbalit zprávy v konverzaci s vícero zprávami</string>
+    <string name="title_advanced_seen_delay">Zpoždění automatického označování zpráv jako přečtených</string>
     <string name="title_advanced_autoclose">Zavírat konverzace automaticky</string>
     <string name="title_advanced_autoclose_send">Automaticky zavřít konverzace po odeslání zpráv</string>
     <string name="title_advanced_onclose">Při zavření konverzace</string>
@@ -958,12 +963,15 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_aliases">Aliasy</string>
     <string name="title_provider">Poskytovatel</string>
     <string name="title_custom">Vlastní</string>
+    <string name="title_dnssec">Vynutit DNSSEC</string>
+    <string name="title_dnssec_remark">DNSSEC podporuje pouze omezený počet DNS serverů</string>
     <string name="title_host">Název hostitele</string>
     <string name="title_encryption">Šifrování</string>
     <string name="title_encryption_none">Žádné (nezabezpečené)</string>
     <string name="title_allow_insecure">Povolit nezabezpečené připojení</string>
     <string name="title_insecure_remark">Nezabezpečená připojení by měla být povolena pouze v důvěryhodných, a nikdy na veřejných sítích</string>
     <string name="title_dane">Vynutit DANE</string>
+    <string name="title_dane_remark">DANE podporují pouze někteří poskytovatelé e-mailu</string>
     <string name="title_notify_remark">Toto můžete povolit pro specifická upozornění účtu</string>
     <string name="title_port">Číslo portu</string>
     <string name="title_user">Uživatelské jméno</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index b648e05291..7ec9254ad1 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">Jeg behøver en ny e-mailadresse</string>
     <string name="title_setup_manual">Manuel opsætning og kontoindstillinger</string>
     <string name="title_setup_classic">Klassisk opsætning</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Guiden til hurtig opsætning af \"Anden udbyder\" ovenfor virker normalt også og er nemmere end at angive alle serverdata.</string>
     <string name="title_setup_documentation">Tjek e-mailudbyderdokumentationen mht. korrekt e-mailserveropsætning</string>
     <string name="title_setup_account_remark">Modtag e-mail</string>
     <string name="title_setup_identity_remark">Send e-mail</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Log ind med Google</string>
     <string name="title_setup_other">Anden udbyder</string>
     <string name="title_setup_inbound">Kun indgående e-mail (e-mail kan ikke sendes!)</string>
+    <string name="title_setup_imap">IMAP-konto</string>
     <string name="title_setup_pop3">POP3-konto</string>
     <string name="title_setup_oauth_permission">E-mailudbyderen har kun godkendt OAuth til Play Store- og GitHub-versioner</string>
     <string name="title_setup_gmail_support">Godkendelse af Google-konti fungerer kun i Play Store-versioner, da Android tjekker den digitale app-signatur</string>
@@ -438,8 +440,8 @@
     <string name="title_advanced_vpn_only">Tilslut kun vha. VPN</string>
     <string name="title_advanced_timeout">Forbindelses-timeout (sekunder)</string>
     <string name="title_advanced_prefer_ip4">Foretræk IPv4 frem for IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Foretrukne DNS-serveradresser (kommasepareret)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Brug tilpasset DNS-opløser</string>
+    <string name="title_advanced_dns">Foretrukne DNS-serveradresser (kommasepareret)</string>
+    <string name="title_advanced_dns_custom">Brug tilpasset DNS-opløser</string>
     <string name="title_advanced_ssl_update">Benyt opdateret SSL-udbyder</string>
     <string name="title_advanced_ssl_harden">Hærd SSL-forbindelser</string>
     <string name="title_advanced_ssl_harden_strict">Kræv TLS 1.3</string>
@@ -597,7 +599,7 @@
     <string name="title_advanced_expand_all">Auto-udvid alle læste beskeder</string>
     <string name="title_advanced_expand_one">Udvid kun én besked ad gangen</string>
     <string name="title_advanced_collapse_multiple">Sammenfold beskeder i en samtale med flere beskeder ved tryk på \'Tilbage\'</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Forsink automatisk markering af beskeder som læst</string>
+    <string name="title_advanced_seen_delay">Forsink automatisk markering af beskeder som læst</string>
     <string name="title_advanced_autoclose">Auto-luk samtaler</string>
     <string name="title_advanced_autoclose_send">Luk automatisk samtaler efter beskedafsendelse</string>
     <string name="title_advanced_onclose">Ved lukning af i en samtale</string>
@@ -934,15 +936,15 @@
     <string name="title_aliases">Aliaser</string>
     <string name="title_provider">Udbyder</string>
     <string name="title_custom">Tilpasset</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Håndhæv DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Kun et begrænset antal DNS-servere understøtter DNSSEC</string>
+    <string name="title_dnssec">Håndhæv DNSSEC</string>
+    <string name="title_dnssec_remark">Kun et begrænset antal DNS-servere understøtter DNSSEC</string>
     <string name="title_host">Værtsnavn</string>
     <string name="title_encryption">Kryptering</string>
     <string name="title_encryption_none">Ingen (usikker)</string>
     <string name="title_allow_insecure">Tillad usikre forbindelser</string>
     <string name="title_insecure_remark">Usikre forbindelser bør kun tillades på betroede netværk og aldrig på offentlige netværk</string>
     <string name="title_dane">Håndhæv DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">DANE understøttes ikke af alle e-mailudbydere</string>
+    <string name="title_dane_remark">DANE understøttes ikke af alle e-mailudbydere</string>
     <string name="title_notify_remark">Dette kan aktivere for kontospecifikke notifikationer</string>
     <string name="title_port">Portnummer</string>
     <string name="title_user">Brugernavn</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 9a0506fab3..f9ac11e169 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -172,6 +172,7 @@
     <string name="title_setup_wizard_new">Ich benötige eine neue E-Mail-Adresse</string>
     <string name="title_setup_manual">Manuelle Einrichtung und Kontooptionen</string>
     <string name="title_setup_classic">Klassische Konfiguration</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Der obige Schnelleinrichtungsassistent für »Anderer Anbieter« funktioniert in der Regel auch und ist einfacher als die Eingabe aller Serverdaten.</string>
     <string name="title_setup_documentation">Bitte lesen Sie die Dokumentation Ihres E-Mail-Anbieters für die korrekte Konfiguration des E-Mail-Servers</string>
     <string name="title_setup_account_remark">E-Mail empfangen</string>
     <string name="title_setup_identity_remark">E-Mail senden</string>
@@ -181,6 +182,7 @@
     <string name="title_setup_google_sign_in">Mit Google anmelden</string>
     <string name="title_setup_other">Anderer Anbieter</string>
     <string name="title_setup_inbound">Nur eingehende Nachrichten (E-Mails können nicht gesendet werden!)</string>
+    <string name="title_setup_imap">IMAP-Konto</string>
     <string name="title_setup_pop3">POP3-Konto</string>
     <string name="title_setup_oauth_permission">Der E-Mail-Anbieter hat OAuth nur für die Play-Store- und GitHub-Version freigegeben</string>
     <string name="title_setup_gmail_support">Das Autorisieren von Google-Konten funktioniert nur in der Play-Store- und in der GitHub-Version, weil Android die digitale App-Signatur überprüft</string>
@@ -439,8 +441,8 @@
     <string name="title_advanced_vpn_only">Nur über ein VPN verbinden</string>
     <string name="title_advanced_timeout">Zeitüberschreitung der Verbindung (Sekunden)</string>
     <string name="title_advanced_prefer_ip4">IPv4 gegenüber IPv6 bevorzugen</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Bevorzugte DNS-Server-Adressen (Komma-getrennt)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Benutzerdefinierten DNS-Resolver verwenden</string>
+    <string name="title_advanced_dns">Bevorzugte DNS-Server-Adressen (Komma-getrennt)</string>
+    <string name="title_advanced_dns_custom">Benutzerdefinierten DNS-Resolver verwenden</string>
     <string name="title_advanced_ssl_update">Aktualisierten SSL-Anbieter verwenden</string>
     <string name="title_advanced_ssl_harden">SSL-Verbindungen stärken</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 voraussetzen</string>
@@ -598,7 +600,7 @@
     <string name="title_advanced_expand_all">Alle gelesenen Nachrichten automatisch ausklappen</string>
     <string name="title_advanced_expand_one">Jeweils nur eine Nachricht ausklappen</string>
     <string name="title_advanced_collapse_multiple">Nachrichten in einer Unterhaltung mit mehreren Nachrichten bei »Zurück« zusammenklappen</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Verzögerung der automatischen Markierung von Nachrichten als gelesen</string>
+    <string name="title_advanced_seen_delay">Verzögerung der automatischen Markierung von Nachrichten als gelesen</string>
     <string name="title_advanced_autoclose">Unterhaltungen automatisch schließen</string>
     <string name="title_advanced_autoclose_send">Unterhaltungen nach dem Senden von Nachrichten automatisch schließen</string>
     <string name="title_advanced_onclose">Beim Schließen einer Unterhaltung</string>
@@ -935,15 +937,15 @@
     <string name="title_aliases">Aliasse</string>
     <string name="title_provider">Anbieter</string>
     <string name="title_custom">Benutzerdefiniert</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC erzwingen</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Nur eine begrenzte Anzahl von DNS-Servern unterstützt DNSSEC</string>
+    <string name="title_dnssec">DNSSEC erzwingen</string>
+    <string name="title_dnssec_remark">Nur eine begrenzte Anzahl von DNS-Servern unterstützt DNSSEC</string>
     <string name="title_host">Hostname</string>
     <string name="title_encryption">Verschlüsselung</string>
     <string name="title_encryption_none">Keine (unsicher)</string>
     <string name="title_allow_insecure">Unsichere Verbindungen zulassen</string>
     <string name="title_insecure_remark">Unsichere Verbindungen sollten nur in vertrauenswürdigen Netzwerken und niemals in öffentlichen Netzwerken erlaubt werden</string>
     <string name="title_dane">DANE erzwingen</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Nur einige E-Mail-Anbieter unterstützen DANE</string>
+    <string name="title_dane_remark">Nur einige E-Mail-Anbieter unterstützen DANE</string>
     <string name="title_notify_remark">Sie können das für kontenspezifische Benachrichtigungen aktivieren</string>
     <string name="title_port">Portnummer</string>
     <string name="title_user">Benutzername</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 91009fdcb2..ae9eaa8219 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -437,6 +437,7 @@
     <string name="title_advanced_vpn_only">Σύνδεση μόνο μέσω VPN</string>
     <string name="title_advanced_timeout">Χρονικό όριο σύνδεσης (δευτερόλεπτα)</string>
     <string name="title_advanced_prefer_ip4">Να προτιμάται IPv4 παρά IPv6</string>
+    <string name="title_advanced_dns">Διευθύνσεις προτιμώμενων διακομιστών DNS (χωρισμένες με κόμμα)</string>
     <string name="title_advanced_ssl_update">Χρήση ενημερωμένου παρόχου SSL</string>
     <string name="title_advanced_ssl_harden">Θωράκιση συνδέσεων SSL</string>
     <string name="title_advanced_ssl_harden_strict">Απαιτείται TLS 1.3</string>
@@ -594,6 +595,7 @@
     <string name="title_advanced_expand_all">Αυτόματη ανάπτυξη όλων των αναγνωσμένων μηνυμάτων</string>
     <string name="title_advanced_expand_one">Ανάπτυξη μόνο ενός μηνύματος κάθε φορά</string>
     <string name="title_advanced_collapse_multiple">Σύμπτυξη των μηνυμάτων σε μια συζήτηση με πολλαπλά μηνύματα, πατώντας \"πίσω\"</string>
+    <string name="title_advanced_seen_delay">Καθυστέρηση κατά τη σήμανση μηνυμάτων ως αναγνωσμένων</string>
     <string name="title_advanced_autoclose">Αυτόματη κλείσιμο των συζητήσεων</string>
     <string name="title_advanced_autoclose_send">Αυτόματο κλείσιμο συζητήσεων μετά την αποστολή μηνυμάτων</string>
     <string name="title_advanced_onclose">Κατά το κλείσιμο μιας συζήτησης</string>
@@ -927,12 +929,15 @@
     <string name="title_aliases">Ψευδώνυμα</string>
     <string name="title_provider">Πάροχος</string>
     <string name="title_custom">Προσαρμοσμένο</string>
+    <string name="title_dnssec">Επιβολή DNSSEC</string>
+    <string name="title_dnssec_remark">Μόνον ένας περιορισμένος αριθμός διακομιστών DNS υποστηρίζει DNSSEC</string>
     <string name="title_host">Όνομα εξυπηρετητή</string>
     <string name="title_encryption">Κρυπτογράφηση</string>
     <string name="title_encryption_none">Καμία (μη ασφαλής)</string>
     <string name="title_allow_insecure">Να επιτρέπονται μη ασφαλείς συνδέσεις</string>
     <string name="title_insecure_remark">Μη ασφαλείς συνδέσεις θα πρέπει να επιτρέπονται μόνο σε έμπιστα δίκτυα και ουδέποτε σε δημόσια δίκτυα</string>
     <string name="title_dane">Επιβολή DANE</string>
+    <string name="title_dane_remark">Μόνο μερικοί πάροχοι ηλ. ταχυδρομείου υποστηρίζουν DANE</string>
     <string name="title_notify_remark">Μπορείτε να το ενεργοποιήσετε για να λαμβάνετε ειδοποιήσεις που αφορούν ειδικά σε έναν λογαριασμό</string>
     <string name="title_port">Αριθμός θύρας</string>
     <string name="title_user">Όνομα χρήστη</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 0c389137ca..b5dd4dd02f 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_setup_google_sign_in">ورود با گوگل</string>
     <string name="title_setup_other">فراهم کننده دیگر</string>
     <string name="title_setup_inbound">فقط ایمیل دریافتی (نمی‌توان ایمیل فرستاد!)</string>
+    <string name="title_setup_imap">حساب IMAP</string>
     <string name="title_setup_pop3">حساب POP3</string>
     <string name="title_setup_oauth_permission">سرویس دهنده ی ایمیل OAuth را فقط برای نسخه پلی استور و گیت هاب تایید کرده</string>
     <string name="title_setup_gmail_support">حساب های گوگل فقط در نسخه‌های پلی استور و گیت هاب مجاز می‌شوند چون اندروید امضای برنامه را بررسی می‌کند</string>
@@ -384,8 +385,8 @@
     <string name="title_advanced_vpn_only">اتصال تنها به وسیله وی‌پی‌ان</string>
     <string name="title_advanced_timeout">اتصال برقرار نشد (ثانیه)</string>
     <string name="title_advanced_prefer_ip4">ترجیح IPv4 به IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">آدرس سرورهای DNS ترجیحی (جدا شده با ویرگول)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">استفاده از DNS resolver انتخابی</string>
+    <string name="title_advanced_dns">آدرس سرورهای DNS ترجیحی (جدا شده با ویرگول)</string>
+    <string name="title_advanced_dns_custom">استفاده از DNS resolver انتخابی</string>
     <string name="title_advanced_ssl_update">استفاده از ارائه‌دهنده اس‌اس‌ال به روز</string>
     <string name="title_advanced_ssl_harden">اتصالات SSL را محکم کن</string>
     <string name="title_advanced_cert_transparency">شفافیت گواهینامه</string>
@@ -505,7 +506,7 @@
     <string name="title_advanced_up_down">استفاده از کلیدهای بالا و پایین برای رفتن به مکالمات بعدی و قبلی</string>
     <string name="title_advanced_autoexpand">بسط دادن خودکار پیام‌ها</string>
     <string name="title_advanced_expand_all">همه پیام‌ها را خودکار گسترش بده</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">علامت‌گذاری خودکار پیام‌ها به عنوان خوانده شده را به تاخیر بیانداز</string>
+    <string name="title_advanced_seen_delay">علامت‌گذاری خودکار پیام‌ها به عنوان خوانده شده را به تاخیر بیانداز</string>
     <string name="title_advanced_autoclose">بستن خودکار مکالمات</string>
     <string name="title_advanced_onclose">هنگام بستن یک گفتگو</string>
     <string name="title_advanced_autoread">به طور خودکار پیام‌های انتقال یافته به عنوان خوانده شده علامت گذاری شود</string>
@@ -653,13 +654,13 @@
     <string name="title_aliases">نام‌های مستعار</string>
     <string name="title_provider">فراهم کننده</string>
     <string name="title_custom">سفارشی</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">اجبار به استفاده از DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">تنها تعداد کمی از سرورهای DNS از DNSSEC پشتیبانی می‌کنند</string>
+    <string name="title_dnssec">اجبار به استفاده از DNSSEC</string>
+    <string name="title_dnssec_remark">تنها تعداد کمی از سرورهای DNS از DNSSEC پشتیبانی می‌کنند</string>
     <string name="title_host">نام میزبان</string>
     <string name="title_encryption">رمزنگاری</string>
     <string name="title_allow_insecure">اجازه اتصال ناامن</string>
     <string name="title_dane">اعمال کردن DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">تنها تعدادی از ارائه‌دهنده‌های ایمیل از DANE پشتیبانی می‌کنند</string>
+    <string name="title_dane_remark">تنها تعدادی از ارائه‌دهنده‌های ایمیل از DANE پشتیبانی می‌کنند</string>
     <string name="title_notify_remark">می‌توانید این را برای نوتیفیکیشن‌های خاص حساب فعال کنید</string>
     <string name="title_port">شماره پورت</string>
     <string name="title_user">نام کاربری</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 15d0076c95..d24da69186 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">J\'ai besoin d\'une nouvelle adresse courriel</string>
     <string name="title_setup_manual">Configuration manuelle et options des comptes</string>
     <string name="title_setup_classic">Configuration classique</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">L\'assistant de configuration rapide pour un \"Autre fournisseur\" ci-dessus fonctionne également et est plus facile à utiliser que saisir toutes les données du serveur.</string>
     <string name="title_setup_documentation">Veuillez consulter la documentation de votre fournisseur de messagerie pour la configuration correcte du serveur de messagerie</string>
     <string name="title_setup_account_remark">Recevoir des courriels</string>
     <string name="title_setup_identity_remark">Envoyer des courriels</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Se connecter avec Google</string>
     <string name="title_setup_other">Autre fournisseur</string>
     <string name="title_setup_inbound">Courrier entrant seulement (le courriel ne peut pas être envoyé!)</string>
+    <string name="title_setup_imap">Compte IMAP</string>
     <string name="title_setup_pop3">Compte POP3</string>
     <string name="title_setup_oauth_permission">Le fournisseur de messagerie a approuvé OAuth uniquement pour les versions Play Store et GitHub</string>
     <string name="title_setup_gmail_support">L\'autorisation des comptes Google fonctionnera uniquement avec les versions Play Store et GitHub parce qu\'Android vérifie la signature numérique de l\'application</string>
@@ -438,8 +440,8 @@
     <string name="title_advanced_vpn_only">Se connecter uniquement via un RPV</string>
     <string name="title_advanced_timeout">Délai d’expiration de la connexion (secondes)</string>
     <string name="title_advanced_prefer_ip4">Préférer IPv4 à IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Adresses de serveurs DNS favoris (séparées par des virgules)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Utiliser un résolveur DNS personnalisé</string>
+    <string name="title_advanced_dns">Adresses de serveurs DNS favoris (séparées par des virgules)</string>
+    <string name="title_advanced_dns_custom">Utiliser un résolveur DNS personnalisé</string>
     <string name="title_advanced_ssl_update">Utiliser le fournisseur SSL mis à jour</string>
     <string name="title_advanced_ssl_harden">Renforcer les connexions SSL</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 requis</string>
@@ -597,7 +599,7 @@
     <string name="title_advanced_expand_all">Déplier automatiquement tous les messages lus</string>
     <string name="title_advanced_expand_one">Ne déplier qu’un seul message à la fois</string>
     <string name="title_advanced_collapse_multiple">Replier les multiples messages d’une conversation en faisant « Retour »</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Retarder le marquage automatique des messages comme lus</string>
+    <string name="title_advanced_seen_delay">Retarder le marquage automatique des messages comme lus</string>
     <string name="title_advanced_autoclose">Fermer automatiquement les conversations</string>
     <string name="title_advanced_autoclose_send">Fermer automatiquement les conversations après l\'envoi de messages</string>
     <string name="title_advanced_onclose">Lors de la fermeture d’une conversation</string>
@@ -934,15 +936,15 @@
     <string name="title_aliases">Alias</string>
     <string name="title_provider">Fournisseur</string>
     <string name="title_custom">Personnalisé</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Renforcer DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Seul un nombre limité de serveurs DNS prennent en charge DNSSEC</string>
+    <string name="title_dnssec">Renforcer DNSSEC</string>
+    <string name="title_dnssec_remark">Seul un nombre limité de serveurs DNS prennent en charge DNSSEC</string>
     <string name="title_host">Nom d’hôte</string>
     <string name="title_encryption">Chiffrement</string>
     <string name="title_encryption_none">Aucun (non sécurisé)</string>
     <string name="title_allow_insecure">Autoriser les connexions non sécurisées</string>
     <string name="title_insecure_remark">Les connexions non sécurisées ne doivent être autorisées que sur des réseaux de confiance et jamais sur des réseaux publics</string>
     <string name="title_dane">Renforcer DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Seuls certains fournisseurs de messagerie supportent DANE</string>
+    <string name="title_dane_remark">Seuls certains fournisseurs de messagerie supportent DANE</string>
     <string name="title_notify_remark">Vous pouvez activer ceci pour avoir des notifications spécifiques par compte</string>
     <string name="title_port">Numéro de port</string>
     <string name="title_user">Nom d’utilisateur</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index b208353867..28c91e9327 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">J\'ai besoin d\'une nouvelle adresse e-mail</string>
     <string name="title_setup_manual">Configuration manuelle et options des comptes</string>
     <string name="title_setup_classic">Configuration classique</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">L\'assistant de configuration rapide pour un \"Autre fournisseur\" ci-dessus fonctionne également et est plus facile à utiliser que saisir toutes les données du serveur.</string>
     <string name="title_setup_documentation">Veuillez consulter la documentation de votre fournisseur de messagerie pour la configuration correcte du serveur de messagerie</string>
     <string name="title_setup_account_remark">Recevoir des e-mails</string>
     <string name="title_setup_identity_remark">Envoyer des e-mails</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Se connecter avec Google</string>
     <string name="title_setup_other">Autre fournisseur</string>
     <string name="title_setup_inbound">Courrier entrant seulement (l\'e-mail ne peut pas être envoyé !)</string>
+    <string name="title_setup_imap">Compte IMAP</string>
     <string name="title_setup_pop3">Compte POP3</string>
     <string name="title_setup_oauth_permission">Le fournisseur de messagerie a approuvé OAuth uniquement pour les versions Play Store et GitHub</string>
     <string name="title_setup_gmail_support">L\'autorisation des comptes Google fonctionnera uniquement avec les versions Play Store et GitHub parce qu\'Android vérifie la signature numérique de l\'application</string>
@@ -438,8 +440,8 @@
     <string name="title_advanced_vpn_only">Se connecter uniquement via un VPN</string>
     <string name="title_advanced_timeout">Délai d’expiration de la connexion (secondes)</string>
     <string name="title_advanced_prefer_ip4">Préférer IPv4 à IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Adresses de serveurs DNS favoris (séparées par des virgules)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Utiliser un résolveur DNS personnalisé</string>
+    <string name="title_advanced_dns">Adresses de serveurs DNS favoris (séparées par des virgules)</string>
+    <string name="title_advanced_dns_custom">Utiliser un résolveur DNS personnalisé</string>
     <string name="title_advanced_ssl_update">Utiliser le fournisseur SSL mis à jour</string>
     <string name="title_advanced_ssl_harden">Renforcer les connexions SSL</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 requis</string>
@@ -597,7 +599,7 @@
     <string name="title_advanced_expand_all">Déplier automatiquement tous les messages lus</string>
     <string name="title_advanced_expand_one">Ne déplier qu’un seul message à la fois</string>
     <string name="title_advanced_collapse_multiple">Replier les multiples messages d’une conversation en faisant « Retour »</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Retarder le marquage automatique des messages comme lus</string>
+    <string name="title_advanced_seen_delay">Retarder le marquage automatique des messages comme lus</string>
     <string name="title_advanced_autoclose">Fermer automatiquement les conversations</string>
     <string name="title_advanced_autoclose_send">Fermer automatiquement les conversations après l\'envoi de messages</string>
     <string name="title_advanced_onclose">Lors de la fermeture d\'une conversation</string>
@@ -934,15 +936,15 @@
     <string name="title_aliases">Alias</string>
     <string name="title_provider">Fournisseur</string>
     <string name="title_custom">Personnalisé</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Renforcer DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Seul un nombre limité de serveurs DNS prennent en charge DNSSEC</string>
+    <string name="title_dnssec">Renforcer DNSSEC</string>
+    <string name="title_dnssec_remark">Seul un nombre limité de serveurs DNS prennent en charge DNSSEC</string>
     <string name="title_host">Nom d’hôte</string>
     <string name="title_encryption">Chiffrement</string>
     <string name="title_encryption_none">Aucun (non sécurisé)</string>
     <string name="title_allow_insecure">Autoriser les connexions non sécurisées</string>
     <string name="title_insecure_remark">Les connexions non sécurisées ne doivent être autorisées que sur des réseaux de confiance et jamais sur des réseaux publics</string>
     <string name="title_dane">Renforcer DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Seuls certains fournisseurs de messagerie supportent DANE</string>
+    <string name="title_dane_remark">Seuls certains fournisseurs de messagerie supportent DANE</string>
     <string name="title_notify_remark">Vous pouvez activer ceci pour avoir des notifications spécifiques par compte</string>
     <string name="title_port">Numéro de port</string>
     <string name="title_user">Nom d’utilisateur</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 20c844d5c4..be76693fbe 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -169,6 +169,7 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_setup_wizard_new">Ik haw in nij e-mailadres nedich</string>
     <string name="title_setup_manual">Hânmjittich ynstelle en accountopsjes</string>
     <string name="title_setup_classic">Klassike konfiguraasje</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">De flugge ynstallaasjewizard foar ‘Oare provider’ hjirboppe wurket meastentiids ek en is makliker as it ynfieren fan alle servergegevens.</string>
     <string name="title_setup_documentation">Besjoch de dokumintaasje fan jo e-mailprovider foar de krekte e-mailserverkonfiguraasje.</string>
     <string name="title_setup_account_remark">E-mailberjochten ûntfange</string>
     <string name="title_setup_identity_remark">E-mailberjochten ferstjoere</string>
@@ -178,6 +179,7 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_setup_google_sign_in">Oanmelde mei Google</string>
     <string name="title_setup_other">Oare provider</string>
     <string name="title_setup_inbound">Allinnich ynkommende e-mail (e-mailberjochten kinne net ferstjoerd wurde!)</string>
+    <string name="title_setup_imap">IMAP-account</string>
     <string name="title_setup_pop3">POP3-account</string>
     <string name="title_setup_oauth_permission">De e-mailprovider hat OAuth allinnich goedkard foar de Play Store- en GitHub-ferzje</string>
     <string name="title_setup_gmail_support">Autorisearjen fan Google-accounts sil allinnich yn offisjele ferzjes wurkje omdat Android de app-hantekening kontrolearret</string>
@@ -436,6 +438,8 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_advanced_vpn_only">Allinnich fia in VPN ferbine</string>
     <string name="title_advanced_timeout">Timeout foar ferbining (sekonden)</string>
     <string name="title_advanced_prefer_ip4">Foarkar IPv4 boppe IPv6</string>
+    <string name="title_advanced_dns">Foarkar DNS-serveradressen (kommaskieden)</string>
+    <string name="title_advanced_dns_custom">Gebruik een aangepaste DNS-resolver</string>
     <string name="title_advanced_ssl_update">Bywurke SSL-provider brûke</string>
     <string name="title_advanced_ssl_harden">SSL-ferbiningen ferhurdzje</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 fereaskje</string>
@@ -593,6 +597,7 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_advanced_expand_all">Automatysk alle lêzen berjochten útklappe</string>
     <string name="title_advanced_expand_one">Mar ien berjocht tagelyk útklappe</string>
     <string name="title_advanced_collapse_multiple">Berjochten yn in petear mei meardere berjochten ynklappe by ‘tebek’</string>
+    <string name="title_advanced_seen_delay">Fertraging foar it automatysk as lêzen markearjen fan berichten</string>
     <string name="title_advanced_autoclose">Petearen automatysk slute</string>
     <string name="title_advanced_autoclose_send">Petearen automatysk slute nei it ferstjoeren fan berjochten</string>
     <string name="title_advanced_onclose">By it sluten fan in petear</string>
@@ -928,12 +933,15 @@ https://en.wikipedia.org/wiki/ASCII</string>
     <string name="title_aliases">Aliassen</string>
     <string name="title_provider">Provider</string>
     <string name="title_custom">Oanpast</string>
+    <string name="title_dnssec">DNSSEC ôftwinge</string>
+    <string name="title_dnssec_remark">Mar in beheind tal DNS-servers stipet DNSSEC</string>
     <string name="title_host">Hostnamme</string>
     <string name="title_encryption">Fersifering</string>
     <string name="title_encryption_none">Gjin (ûnfeilich)</string>
     <string name="title_allow_insecure">Unfeilige ferbiningen tastean</string>
     <string name="title_insecure_remark">Unfeilige ferbiningen moatte allinnich tastien wurde op fertroude netwurken en nea op iepenbiere netwurken</string>
     <string name="title_dane">DANE ôftwinge</string>
+    <string name="title_dane_remark">Mar inkelde mailproviders stypje DANE</string>
     <string name="title_notify_remark">Jo kinne dit ynskeakelje foar accountspesifike meldingen</string>
     <string name="title_port">Poartenûmer</string>
     <string name="title_user">Brûkersnamme</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 3384e60998..905308ceaf 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -170,6 +170,7 @@
     <string name="title_setup_wizard_new">Új e-mail cím megadása</string>
     <string name="title_setup_manual">Kézi beállítás és fiók opciók</string>
     <string name="title_setup_classic">Klasszikus konfiguráció</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">A fenti \"Egyéb szolgáltató\" gyorsbeállítás varázsló általában szintén működik, és könnyebb, mint bevinni a kiszolgáló adatait.</string>
     <string name="title_setup_documentation">Kérjük keresse fel az e-mail szolgáltatójának leírását a korrekt e-mail szerver konfigurációval kapcsolatban</string>
     <string name="title_setup_account_remark">E-mailek fogadása</string>
     <string name="title_setup_identity_remark">E-mailek küldése</string>
@@ -179,6 +180,7 @@
     <string name="title_setup_google_sign_in">Bejelentkezés Google fiókkal</string>
     <string name="title_setup_other">Egyéb szolgáltató</string>
     <string name="title_setup_inbound">Csak bejövő levelek (nem lehet leveleket küldeni!)</string>
+    <string name="title_setup_imap">IMAP fiók</string>
     <string name="title_setup_pop3">POP3 fiók</string>
     <string name="title_setup_oauth_permission">Az e-mail szolgáltató az OAuth-ot csak a Play Store és GitHub verziókra engedélyezte</string>
     <string name="title_setup_gmail_support">Google fiókok engedélyezése csak a Play Store és GitHub verzióknál engedélyezett, mert az Android rendszer ellenőrzi az app digitális aláírását</string>
@@ -436,8 +438,8 @@
     <string name="title_advanced_vpn_only">Csatlakozás csak VPN-en keresztül</string>
     <string name="title_advanced_timeout">Kapcsolat időtúllépés (másodpercben)</string>
     <string name="title_advanced_prefer_ip4">IPv4 preferálása IPv6 fölött</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Előnyben részesített DNS kiszolgáló címek (vesszővel elválasztva)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Használjon egyéni DNS feloldó kiszolgálót</string>
+    <string name="title_advanced_dns">Előnyben részesített DNS kiszolgáló címek (vesszővel elválasztva)</string>
+    <string name="title_advanced_dns_custom">Használjon egyéni DNS feloldó kiszolgálót</string>
     <string name="title_advanced_ssl_update">Frissített SSL szolgáltató használata</string>
     <string name="title_advanced_ssl_harden">SSL kapcsolatok megerősítése</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 megkövetelése</string>
@@ -595,7 +597,7 @@
     <string name="title_advanced_expand_all">Összes olvasott üzenet automatikus kibontása</string>
     <string name="title_advanced_expand_one">Egyszerre csak egy üzenet kibontása</string>
     <string name="title_advanced_collapse_multiple">Több üzenetet tartalmazó beszélgetés üzeneteinek összecsukása \'vissza\'-val</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Üzenetek automatikus olvasottak jelölése ennyi idő után</string>
+    <string name="title_advanced_seen_delay">Üzenetek automatikus olvasottak jelölése ennyi idő után</string>
     <string name="title_advanced_autoclose">Beszélgetések automatikus bezárása</string>
     <string name="title_advanced_autoclose_send">A beszélgetés automatikus bezárása az üzenet elküldése után</string>
     <string name="title_advanced_onclose">Beszélgetés bezárásakor</string>
@@ -930,15 +932,15 @@
     <string name="title_aliases">Álnevek</string>
     <string name="title_provider">Szolgáltató</string>
     <string name="title_custom">Egyéni</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC megkövetelése</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Csak korlátozott számú DNS kiszolgáló támogatja a DNSSEC-et</string>
+    <string name="title_dnssec">DNSSEC megkövetelése</string>
+    <string name="title_dnssec_remark">Csak korlátozott számú DNS kiszolgáló támogatja a DNSSEC-et</string>
     <string name="title_host">Kiszolgálónév</string>
     <string name="title_encryption">Titkosítás</string>
     <string name="title_encryption_none">Nincs (nem biztonságos)</string>
     <string name="title_allow_insecure">Nem biztonságos mért kapcsolatok engedélyezése</string>
     <string name="title_insecure_remark">Nem biztonságos kapcsolatokat csak megbízható hálózatokon ajánlott használni és soha publikus hálózatokon</string>
     <string name="title_dane">DANE megkövetelése</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Csak néhány email kiszolgáló támogatja a DANE-t</string>
+    <string name="title_dane_remark">Csak néhány email kiszolgáló támogatja a DANE-t</string>
     <string name="title_notify_remark">Engedélyezheti a fiókonkénti egyedi értesítéseket</string>
     <string name="title_port">Port szám</string>
     <string name="title_user">Felhasználónév</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 4626f6c1d9..effc340697 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">Mi serve un nuovo indirizzo email</string>
     <string name="title_setup_manual">Configurazione manuale e opzioni del profilo</string>
     <string name="title_setup_classic">Configurazione classica</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">La procedura guidata di configurazione rapida per un \"Altro provider\" sopra funziona di solito anche ed è più facile da usare che inserire tutti i dati del server.</string>
     <string name="title_setup_documentation">Sei pregato di consultare la documentazione del tuo provider email per la corretta configurazione del server email</string>
     <string name="title_setup_account_remark">Ricevi email</string>
     <string name="title_setup_identity_remark">Invia email</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Accedi con Google</string>
     <string name="title_setup_other">Altro provider</string>
     <string name="title_setup_inbound">Solo email in arrivo (impossibile inviare l\'email!)</string>
+    <string name="title_setup_imap">Profilo IMAP</string>
     <string name="title_setup_pop3">Profilo POP3</string>
     <string name="title_setup_oauth_permission">Il provider dell\'email ha approvato OAuth solo per la versione del Play Store e di GitHub</string>
     <string name="title_setup_gmail_support">Autorizzare i profili di Google funzionerà solo nella versione del Play Store e di GitHub, poiché Android controlla la firma digitale dell\'app</string>
@@ -438,8 +440,8 @@
     <string name="title_advanced_vpn_only">Connettiti solo tramite una VPN</string>
     <string name="title_advanced_timeout">Timeout di connessione (secondi)</string>
     <string name="title_advanced_prefer_ip4">Preferisce IPv4 su IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Indirizzi DNS server preferiti (separati da virgola)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Usa risolutore DNS personalizzato</string>
+    <string name="title_advanced_dns">Indirizzi DNS server preferiti (separati da virgole)</string>
+    <string name="title_advanced_dns_custom">Utilizza risolutore DNS personalizzato</string>
     <string name="title_advanced_ssl_update">Utilizza il fornitore SSL aggiornato</string>
     <string name="title_advanced_ssl_harden">Indurisci connessioni SSL</string>
     <string name="title_advanced_ssl_harden_strict">Richiede TLS 1.3</string>
@@ -597,7 +599,7 @@
     <string name="title_advanced_expand_all">Espandi automaticamente tutti i messaggi letti</string>
     <string name="title_advanced_expand_one">Espandi solo un messaggio per volta</string>
     <string name="title_advanced_collapse_multiple">Comprimi i messaggi in una conversazione con più messaggi tornando \'indietro\'</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Ritarda automaticamente la contrassegna dei messaggi come letti</string>
+    <string name="title_advanced_seen_delay">Ritarda automaticamente la contrassegna dei messaggi come letti</string>
     <string name="title_advanced_autoclose">Chiudi automaticamente le conversazioni</string>
     <string name="title_advanced_autoclose_send">Chiudi automaticamente le conversazioni dopo l\'invio dei messaggi</string>
     <string name="title_advanced_onclose">Alla chiusura di una conversazione</string>
@@ -934,15 +936,15 @@
     <string name="title_aliases">Alias</string>
     <string name="title_provider">Provider</string>
     <string name="title_custom">Personalizzato</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Forza DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Solo un numero limitato di server DNS supporta DNSSEC</string>
+    <string name="title_dnssec">Forza DNSSEC</string>
+    <string name="title_dnssec_remark">Solo un numero limitato di server DNS supporta DNSSEC</string>
     <string name="title_host">Nome dell\'host</string>
     <string name="title_encryption">Crittografia</string>
     <string name="title_encryption_none">Nessuna (non sicuro)</string>
     <string name="title_allow_insecure">Consenti connessioni non sicure</string>
     <string name="title_insecure_remark">Le connessioni non sicure dovrebbero esser consentite solo su reti affidabili e mai sulle reti pubbliche</string>
     <string name="title_dane">Forza DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Solo alcuni provider di email supportano DANE</string>
+    <string name="title_dane_remark">Solo alcuni fornitori di email supportano DANE</string>
     <string name="title_notify_remark">Puoi abilitarlo per le notifiche specifiche del profilo</string>
     <string name="title_port">Numero di porta</string>
     <string name="title_user">Nome utente</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 99d5ed2843..03c51a1576 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -199,6 +199,7 @@
     <string name="title_setup_wizard_new">ארצה כתובת דוא״ל חדשה</string>
     <string name="title_setup_manual">הקמה ידנית ואפשרויות חשבון</string>
     <string name="title_setup_classic">הגדרות קלסיות</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">אשף ההגדרה המהירה ל„ספק אחר” להלן בדרך כלל עובד גם כן והוא פשוט יותר ממילוי כל נתוני השרת.</string>
     <string name="title_setup_documentation">נא לעיין בתיעוד ספק הדוא״ל שלך לקבלת הגדרות שרת הדוא״ל הנכונות</string>
     <string name="title_setup_account_remark">קבלת דוא״ל</string>
     <string name="title_setup_identity_remark">שליחת דוא״ל</string>
@@ -208,6 +209,7 @@
     <string name="title_setup_google_sign_in">כניסה עם Google</string>
     <string name="title_setup_other">ספק אחר</string>
     <string name="title_setup_inbound">הודעות נכנסות בלבד (אי אפשר לשלוח הודעה בדוא״ל!)</string>
+    <string name="title_setup_imap">חשבון IMAP</string>
     <string name="title_setup_pop3">חשבון POP3</string>
     <string name="title_setup_oauth_permission">ספק הדוא״ל אישר OAuth רק לגרסאות שבחנות Play וב־GitHub</string>
     <string name="title_setup_gmail_support">אימות חשבונות Google יעבוד רק עם גרסה מחנות Play או מ־GitHub כיוון ש־Android בודק את חתימת היישומון</string>
@@ -466,8 +468,8 @@
     <string name="title_advanced_vpn_only">התחברות רק דרך VPN</string>
     <string name="title_advanced_timeout">זמן קצוב לחיבור (בשניות)</string>
     <string name="title_advanced_prefer_ip4">להעדיף IPv4 על פני IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">כתובות שרתי DNS מועדפים (עם פסיקים בין לבין)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">להשתמש בפותר DNS בהתאמה אישית</string>
+    <string name="title_advanced_dns">כתובות שרתי DNS מועדפים (עם פסיקים בין לבין)</string>
+    <string name="title_advanced_dns_custom">להשתמש בפותר DNS בהתאמה אישית</string>
     <string name="title_advanced_ssl_update">להשתמש בספק SSL עדכני</string>
     <string name="title_advanced_ssl_harden">הקשחת חיבורי SSL</string>
     <string name="title_advanced_ssl_harden_strict">לדרוש TLS‎ 1.3</string>
@@ -625,7 +627,7 @@
     <string name="title_advanced_expand_all">להרחיב אוטומטית את כל ההודעות שנקראו</string>
     <string name="title_advanced_expand_one">להרחיב הודעה אחת כל פעם</string>
     <string name="title_advanced_collapse_multiple">צמצום הודעות בדיונים עם מגוון הודעות עם ‚חזרה’</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">השהיית סימון אוטומטי של הודעות כנקראו</string>
+    <string name="title_advanced_seen_delay">השהיית סימון אוטומטי של הודעות כנקראו</string>
     <string name="title_advanced_autoclose">לסגור דיונים אוטומטית</string>
     <string name="title_advanced_autoclose_send">לסגור דיונים אוטומטית לאחר שליחת הודעות</string>
     <string name="title_advanced_onclose">עם סגירת דיון</string>
@@ -961,15 +963,15 @@
     <string name="title_aliases">כינויים</string>
     <string name="title_provider">ספק</string>
     <string name="title_custom">משלך</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">אכיפת DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">רק כמות מצומצמת של שרתי DNS תומכים ב־DNSSEC</string>
+    <string name="title_dnssec">אכיפת DNSSEC</string>
+    <string name="title_dnssec_remark">רק כמות מצומצמת של שרתי DNS תומכים ב־DNSSEC</string>
     <string name="title_host">שם מארח</string>
     <string name="title_encryption">הצפנה</string>
     <string name="title_encryption_none">ללא (בלתי מאובטח)</string>
     <string name="title_allow_insecure">לאפשר חיבורים מפוקפקים</string>
     <string name="title_insecure_remark">חיבורים בלתי מאובטחים/מפוקפקים יש לאפשר רק ברשתות מהימנות ואף פעם לא ברשתות ציבוריות</string>
     <string name="title_dane">אכיפת DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">רק חלק מספקי הדוא״ל תומכים ב־DANE</string>
+    <string name="title_dane_remark">רק חלק מספקי הדוא״ל תומכים ב־DANE</string>
     <string name="title_notify_remark">אפשר להפעיל את זה לקבלת התראות לחשבון מסוים</string>
     <string name="title_port">מספר פתחה</string>
     <string name="title_user">שם משתמש</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ce2e7057a2..0cc7105104 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -157,6 +157,7 @@
     <string name="title_setup_wizard_new">新しいメールアドレスを取得する</string>
     <string name="title_setup_manual">手動セットアップとアカウントの設定</string>
     <string name="title_setup_classic">クラシカルな設定方法</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">ほとんどの場合、上のクイックセットアップウィザードの「その他のプロバイダー」から、サーバーデータの入力を省略して簡単に設定できます。</string>
     <string name="title_setup_documentation">メールサーバー設定については、メールプロバイダーのドキュメントを参照してください</string>
     <string name="title_setup_account_remark">メールを受信</string>
     <string name="title_setup_identity_remark">メールを送信</string>
@@ -164,9 +165,10 @@
     <string name="title_setup_accounts">アカウント</string>
     <string name="title_setup_identities">ユーザー ID</string>
     <string name="title_setup_google_sign_in">Google でログイン</string>
-    <string name="title_setup_other">その他のプロバイダー (IMAP)</string>
+    <string name="title_setup_other">その他のプロバイダー</string>
     <string name="title_setup_inbound">メール受信のみ (送信できません！)</string>
-    <string name="title_setup_pop3">その他のプロバイダー (POP3)</string>
+    <string name="title_setup_imap">IMAP アカウント</string>
+    <string name="title_setup_pop3">POP3 アカウント</string>
     <string name="title_setup_oauth_permission">OAuth 認証はメールプロバイダーより Play ストア版と GitHub版でのみ承認されています</string>
     <string name="title_setup_gmail_support">Android がアプリの署名を確認するため、Google アカウントを認証する機能は Play ストア版と GitHub 版でのみ動作します</string>
     <string name="title_setup_gmail_rationale">アカウントを選択してアクセス権限を付与してください</string>
@@ -424,8 +426,8 @@
     <string name="title_advanced_vpn_only">VPN 経由でのみ接続する</string>
     <string name="title_advanced_timeout">接続タイムアウト (秒)</string>
     <string name="title_advanced_prefer_ip4">IPv6 より IPv4 を優先する</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">優先 DNS サーバーアドレス (カンマ区切り)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">カスタム DNS リゾルバーを使用する</string>
+    <string name="title_advanced_dns">優先 DNS サーバーアドレス (カンマ区切り)</string>
+    <string name="title_advanced_dns_custom">カスタム DNS リゾルバーを使用する</string>
     <string name="title_advanced_ssl_update">更新された SSL プロバイダーを使用する</string>
     <string name="title_advanced_ssl_harden">より強固な SSL 接続</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 を要求する</string>
@@ -583,7 +585,7 @@
     <string name="title_advanced_expand_all">すべての既読メッセージを自動で展開する</string>
     <string name="title_advanced_expand_one">一度に 1 つのメッセージのみを展開する</string>
     <string name="title_advanced_collapse_multiple">複数のメッセージがある会話で「戻る」をタップしてメッセージを折りたたむ</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">メッセージを自動で既読にするまでに遅延を入れる</string>
+    <string name="title_advanced_seen_delay">メッセージを自動で既読にするまでに遅延を入れる</string>
     <string name="title_advanced_autoclose">会話を自動で閉じる</string>
     <string name="title_advanced_autoclose_send">メッセージを送信したあと、自動で会話を閉じる</string>
     <string name="title_advanced_onclose">会話を閉じるとき</string>
@@ -919,13 +921,15 @@
     <string name="title_aliases">エイリアス</string>
     <string name="title_provider">プロバイダー</string>
     <string name="title_custom">カスタム</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC を強制する</string>
+    <string name="title_dnssec">DNSSEC を強制する</string>
+    <string name="title_dnssec_remark">DNSSEC に対応した DNS サーバーは少数です</string>
     <string name="title_host">ホスト名</string>
     <string name="title_encryption">暗号化</string>
     <string name="title_encryption_none">なし (安全でない)</string>
     <string name="title_allow_insecure">保護されていない接続を許可する</string>
     <string name="title_insecure_remark">保護されていない接続は信頼できるネットワークでのみ許可し、パブリックネットワークでは許可しないでください</string>
     <string name="title_dane">DANE を強制する</string>
+    <string name="title_dane_remark">DANE に対応したメールプロバイダーは少数です</string>
     <string name="title_notify_remark">アカウント別の通知を有効にできます</string>
     <string name="title_port">ポート番号</string>
     <string name="title_user">ユーザー名</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 726d06bf89..c1dcc85ee4 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -170,6 +170,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_setup_wizard_new">Ik heb een nieuw e-mailadres nodig</string>
     <string name="title_setup_manual">Handmatig instellen en account opties</string>
     <string name="title_setup_classic">Klassieke configuratie</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">De snelle installatiewizard voor ‘Andere provider’ hierboven werkt meestal ook en is makkelijker dan het invoeren van alle servergegevens.</string>
     <string name="title_setup_documentation">Raadpleeg a.u.b. de documentatie van uw e-mailprovider voor de juiste mailserverconfiguratie</string>
     <string name="title_setup_account_remark">E-mail ontvangen</string>
     <string name="title_setup_identity_remark">E-mail verzenden</string>
@@ -179,6 +180,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_setup_google_sign_in">Log in met Google</string>
     <string name="title_setup_other">Andere provider</string>
     <string name="title_setup_inbound">Alleen inkomende mail (mail kan niet verzonden worden!)</string>
+    <string name="title_setup_imap">IMAP-account</string>
     <string name="title_setup_pop3">POP3 account</string>
     <string name="title_setup_oauth_permission">De e-mailprovider heeft OAuth alleen goedgekeurd voor de Play Store en GitHub versie</string>
     <string name="title_setup_gmail_support">Autoriseren van Google accounts werkt alleen in de Play Store en GitHub versie omdat Android de digitale app handtekening controleert</string>
@@ -436,8 +438,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_vpn_only">Alleen via een VPN verbinden</string>
     <string name="title_advanced_timeout">Verbinding timeout (seconden)</string>
     <string name="title_advanced_prefer_ip4">Geef de voorkeur aan IPv4 boven IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Voorkeurs DNS serveradressen (komma gescheiden)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Gebruik een aangepaste DNS-resolver</string>
+    <string name="title_advanced_dns">Voorkeur DNS-serveradressen (kommagescheiden)</string>
+    <string name="title_advanced_dns_custom">Aangepaste DNS-resolver gebruiken</string>
     <string name="title_advanced_ssl_update">Bijgewerkte SSL-provider gebruiken</string>
     <string name="title_advanced_ssl_harden">Verhard SSL-verbindingen</string>
     <string name="title_advanced_ssl_harden_strict">Vereis TLS 1.3</string>
@@ -595,7 +597,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_expand_all">Automatisch alle gelezen berichten uitvouwen</string>
     <string name="title_advanced_expand_one">Vouw slechts één bericht per keer uit</string>
     <string name="title_advanced_collapse_multiple">Vouw berichten in een gesprek met meerdere berichten bij \'terug\' samen</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Vertraging voor het automatisch markeren van berichten als gelezen</string>
+    <string name="title_advanced_seen_delay">Vertraging voor het automatisch markeren van berichten als gelezen</string>
     <string name="title_advanced_autoclose">Gesprekken automatisch sluiten</string>
     <string name="title_advanced_autoclose_send">Gesprekken automatisch sluiten na het verzenden van berichten</string>
     <string name="title_advanced_onclose">Bij het sluiten van een gesprek</string>
@@ -930,15 +932,15 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_aliases">Aliassen</string>
     <string name="title_provider">Provider</string>
     <string name="title_custom">Aangepast</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC afdwingen</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Slechts een beperkt aantal DNS-servers ondersteunt DNSSEC</string>
+    <string name="title_dnssec">DNSSEC afdwingen</string>
+    <string name="title_dnssec_remark">Slechts een beperkt aantal DNS-servers ondersteunt DNSSEC</string>
     <string name="title_host">Hostnaam</string>
     <string name="title_encryption">Versleuteling</string>
     <string name="title_encryption_none">Geen (onveilig)</string>
     <string name="title_allow_insecure">Onveilige verbindingen toestaan</string>
     <string name="title_insecure_remark">Onveilige verbindingen mogen alleen worden toegestaan op vertrouwde netwerken en nooit op openbare netwerken</string>
     <string name="title_dane">DANE afdwingen</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Slechts enkele mailaanbieders ondersteunen DANE</string>
+    <string name="title_dane_remark">Slechts enkele mailaanbieders ondersteunen DANE</string>
     <string name="title_notify_remark">U kunt dit inschakelen voor account specifieke meldingen</string>
     <string name="title_port">Poortnummer</string>
     <string name="title_user">Gebruikersnaam</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 69603e9db4..c941093a03 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -199,6 +199,7 @@
     <string name="title_setup_wizard_new">Potrzebujesz nowego adresu e-mail?</string>
     <string name="title_setup_manual">Ręczna konfiguracja i opcje konta</string>
     <string name="title_setup_classic">Konfiguracja klasyczna</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Kreator szybkiej konfiguracji dla \"innego dostawcy\" powyżej zwykle również działa i jest łatwiejszy niż wprowadzanie wszystkich danych serwera.</string>
     <string name="title_setup_documentation">Sprawdź dokumentację dostawcy poczty e-mail w celu uzyskania poprawnej konfiguracji serwera e-mail</string>
     <string name="title_setup_account_remark">Odbieranie wiadomości e-mail</string>
     <string name="title_setup_identity_remark">Wysyłanie wiadomości e-mail</string>
@@ -208,6 +209,7 @@
     <string name="title_setup_google_sign_in">Zaloguj się poprzez Google</string>
     <string name="title_setup_other">Inny dostawca</string>
     <string name="title_setup_inbound">Tylko przychodzące wiadomości e-mail (wiadomości e-mail nie mogą być wysyłane!)</string>
+    <string name="title_setup_imap">Konto IMAP</string>
     <string name="title_setup_pop3">Konto POP3</string>
     <string name="title_setup_oauth_permission">Dostawca poczty e-mail zatwierdził OAuth tylko dla wersji Sklep Play i GitHub</string>
     <string name="title_setup_gmail_support">Autoryzacja kont Google będzie działać tylko w wersji Sklep Play i GitHub, ponieważ Android sprawdza podpis aplikacji cyfrowej</string>
@@ -465,8 +467,8 @@
     <string name="title_advanced_vpn_only">Połącz tylko przez VPN</string>
     <string name="title_advanced_timeout">Limit czasu połączenia (sekundy)</string>
     <string name="title_advanced_prefer_ip4">Preferuj IPv4 nad IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Preferowane adresy serwera DNS (oddzielone przecinkami)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Użyj własnego mechanizmu rozwiązywania DNS</string>
+    <string name="title_advanced_dns">Preferowane adresy serwera DNS (oddzielone przecinkami)</string>
+    <string name="title_advanced_dns_custom">Użyj własnego mechanizmu rozwiązywania DNS</string>
     <string name="title_advanced_ssl_update">Użyj zaktualizowanego dostawcy SSL</string>
     <string name="title_advanced_ssl_harden">Wzmocnij połączenia SSL</string>
     <string name="title_advanced_ssl_harden_strict">Wymagaj TLS 1.3</string>
@@ -624,7 +626,7 @@
     <string name="title_advanced_expand_all">Automatycznie rozwiń wszystkie przeczytane wiadomości</string>
     <string name="title_advanced_expand_one">Rozwiń tylko jedną wiadomość na raz</string>
     <string name="title_advanced_collapse_multiple">Zwiń wiadomości w konwersacji z wieloma wiadomościami przy \'wstecz\'</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Opóźnij automatyczne oznaczanie wiadomości jako przeczytane</string>
+    <string name="title_advanced_seen_delay">Opóźnij automatyczne oznaczanie wiadomości jako przeczytane</string>
     <string name="title_advanced_autoclose">Automatycznie zamykaj konwersacje</string>
     <string name="title_advanced_autoclose_send">Automatycznie zamykaj konwersacje po wysłaniu wiadomości</string>
     <string name="title_advanced_onclose">Przy zamykaniu konwersacji</string>
@@ -960,14 +962,14 @@
     <string name="title_aliases">Aliasy</string>
     <string name="title_provider">Dostawca</string>
     <string name="title_custom">Własne</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Wymuś DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Tylko ograniczona liczba serwerów DNS obsługuje DNSSEC</string>
+    <string name="title_dnssec">Wymuś DNSSEC</string>
+    <string name="title_dnssec_remark">Tylko ograniczona liczba serwerów DNS obsługuje DNSSEC</string>
     <string name="title_host">Nazwa hosta</string>
     <string name="title_encryption">Szyfrowanie</string>
     <string name="title_encryption_none">Brak (niebezpieczne)</string>
     <string name="title_allow_insecure">Zezwól na niezabezpieczone połączenia</string>
     <string name="title_insecure_remark">Niebezpieczne połączenia powinny być dozwolone tylko w zaufanych sieciach, a nigdy w sieciach publicznych</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Tylko niektórzy dostawcy poczty elektronicznej obsługują DANE</string>
+    <string name="title_dane_remark">Tylko niektórzy dostawcy poczty elektronicznej obsługują DANE</string>
     <string name="title_notify_remark">Można włączyć tę funkcję dla specyficznych powiadomień danego konta</string>
     <string name="title_port">Numer portu</string>
     <string name="title_user">Nazwa użytkownika</string>
@@ -1159,7 +1161,7 @@
     <string name="title_folder_inbox">Odebrane</string>
     <string name="title_folder_outbox">Wysyłane</string>
     <string name="title_folder_all">Archiwum</string>
-    <string name="title_folder_drafts">Szkice</string>
+    <string name="title_folder_drafts">Wersje Robocze</string>
     <string name="title_folder_trash">Kosz</string>
     <string name="title_folder_junk">Spam</string>
     <string name="title_folder_sent">Wysłane</string>
@@ -1168,7 +1170,7 @@
     <string name="title_folder_user_only">Tylko foldery użytkownika</string>
     <string name="title_folder_primary">Podstawowe konto folderów</string>
     <string name="title_folders_unified">Wspólne foldery</string>
-    <string name="title_folder_local_drafts">Szkice lokalne</string>
+    <string name="title_folder_local_drafts">Lokalne Wersje Robocze</string>
     <string name="title_no_folders">Brak folderów</string>
     <string name="title_no_messages">Brak wiadomości</string>
     <string name="title_filters_active">Jeden lub więcej filtrów jest aktywnych</string>
@@ -1435,7 +1437,7 @@
     <string name="title_attachment_photo">Zrób zdjęcie</string>
     <string name="title_attachment_audio">Nagraj dźwięk</string>
     <string name="title_show_addresses">Pokaż DW/UDW</string>
-    <string name="title_save_drafts">Zapisz szkice na serwerze</string>
+    <string name="title_save_drafts">Zapisz wersje robocze na serwerze</string>
     <string name="title_send_dialog">Pokaż opcje wysyłania</string>
     <string name="title_image_dialog">Pokaż opcje obrazu</string>
     <string name="title_style_toolbar">Styl paska narzędzi</string>
@@ -1776,7 +1778,7 @@
     <string name="title_legend_unified">Wspólna skrzynka / konto podstawowe</string>
     <string name="title_legend_inbox">Odebrane</string>
     <string name="title_legend_outbox">Wysyłane</string>
-    <string name="title_legend_drafts">Szkice</string>
+    <string name="title_legend_drafts">Wersje Robocze</string>
     <string name="title_legend_sent">Wysłane</string>
     <string name="title_legend_archive">Archiwum</string>
     <string name="title_legend_trash">Kosz</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f6c32c38f1..54e91ae88b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">Preciso de um novo endereço de e-mail</string>
     <string name="title_setup_manual">Opções manuais de configuração e conta</string>
     <string name="title_setup_classic">Configuração clássica</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">O assistente de configuração rápida para “Outro Provedor” acima geralmente também funciona e é mais fácil do que inserir todos os dados do servidor.</string>
     <string name="title_setup_documentation">Por favor, veja a documentação do seu provedor de e-mail para a configuração correta do servidor de e-mail</string>
     <string name="title_setup_account_remark">Receber e-mail</string>
     <string name="title_setup_identity_remark">Enviar e-mail</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Entrar com o Google</string>
     <string name="title_setup_other">Outro provedor</string>
     <string name="title_setup_inbound">Somente e-mails recebidos (e-mail não pode ser enviado!)</string>
+    <string name="title_setup_imap">Conta IMAP</string>
     <string name="title_setup_pop3">Conta POP3</string>
     <string name="title_setup_oauth_permission">O provedor de e-mail aprovou OAuth apenas para a versão Play Store e GitHub</string>
     <string name="title_setup_gmail_support">A autorização de contas Google funcionará apenas nas versões Play Store e GitHub porque o Android verifica a assinatura do aplicativo digital</string>
@@ -437,8 +439,8 @@
     <string name="title_advanced_vpn_only">Conectar somente via VPN</string>
     <string name="title_advanced_timeout">Conexão expira em (segundos)</string>
     <string name="title_advanced_prefer_ip4">Preferir IPv4 ao invés de IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Endereços de servidor DNS preferenciais (separados por vírgula)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Usar resolvedor DNS personalizado</string>
+    <string name="title_advanced_dns">Endereços de servidor DNS preferenciais (separados por vírgula)</string>
+    <string name="title_advanced_dns_custom">Usar resolvedor DNS personalizado</string>
     <string name="title_advanced_ssl_update">Usar provedor SSL atualizado</string>
     <string name="title_advanced_ssl_harden">Reforçar conexões SSL</string>
     <string name="title_advanced_ssl_harden_strict">Requer TLS 1.3</string>
@@ -596,7 +598,7 @@
     <string name="title_advanced_expand_all">Expandir automaticamente todas as mensagens lidas</string>
     <string name="title_advanced_expand_one">Expandir apenas uma mensagem por vez</string>
     <string name="title_advanced_collapse_multiple">Recolher mensagens em uma conversa com várias mensagens ao \'voltar\'</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Atrasar a marcação automática de mensagens como lidas</string>
+    <string name="title_advanced_seen_delay">Atrasar a marcação automática de mensagens como lidas</string>
     <string name="title_advanced_autoclose">Fechar conversas automaticamente</string>
     <string name="title_advanced_autoclose_send">Fechar conversas automaticamente após o envio de mensagens</string>
     <string name="title_advanced_onclose">Ao fechar uma conversa</string>
@@ -932,15 +934,15 @@
     <string name="title_aliases">Apelidos</string>
     <string name="title_provider">Provedor</string>
     <string name="title_custom">Personalizado</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Forçar DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Apenas um número limitado de servidores DNS suporta DNSSEC</string>
+    <string name="title_dnssec">Forçar DNSSEC</string>
+    <string name="title_dnssec_remark">Apenas um número limitado de servidores DNS suporta DNSSEC</string>
     <string name="title_host">Nome do servidor</string>
     <string name="title_encryption">Criptografia</string>
     <string name="title_encryption_none">Nenhuma (inseguro)</string>
     <string name="title_allow_insecure">Permitir conexões inseguras</string>
     <string name="title_insecure_remark">Conexões inseguras só devem ser permitidas em redes confiáveis e nunca em redes públicas</string>
     <string name="title_dane">Forçar DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Apenas alguns provedores de e-mail oferecem suporte a DANE</string>
+    <string name="title_dane_remark">Apenas alguns provedores de e-mail oferecem suporte a DANE</string>
     <string name="title_notify_remark">Você pode habilitar isso para notificações específicas da conta</string>
     <string name="title_port">Número da porta</string>
     <string name="title_user">Nome de usuário</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 4a73db3fde..b948791582 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -171,6 +171,7 @@
     <string name="title_setup_wizard_new">Preciso de um novo endereço de e-mail</string>
     <string name="title_setup_manual">Configuração manual e opções da conta</string>
     <string name="title_setup_classic">Configuração clássica</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">O assistente rápido de configuração para \"Outro Provedor\" acima geralmente funciona também, é mais fácil do que inserir todos os dados do servidor.</string>
     <string name="title_setup_documentation">Por favor, veja a documentação do seu provedor de e-mail para a correta configuração do servidor de e-mail</string>
     <string name="title_setup_account_remark">Receber e-mail</string>
     <string name="title_setup_identity_remark">Enviar e-mail</string>
@@ -180,6 +181,7 @@
     <string name="title_setup_google_sign_in">Iniciar a sessão com conta Google</string>
     <string name="title_setup_other">Outro fornecedor</string>
     <string name="title_setup_inbound">Somente e-mails recebidos (e-mail não pode ser enviado!)</string>
+    <string name="title_setup_imap">Conta IMAP</string>
     <string name="title_setup_pop3">Conta POP3</string>
     <string name="title_setup_oauth_permission">O fornecedor de e-mail aprovou OAuth apenas para a versão da Play Store e do GitHub</string>
     <string name="title_setup_gmail_support">Autorizar contas do Google funcionará na Play Store e na versão GitHub apenas porque o Android verifica a assinatura da aplicação digital</string>
@@ -439,8 +441,8 @@
     <string name="title_advanced_vpn_only">Apenas conectar-se através de uma VPN</string>
     <string name="title_advanced_timeout">Tempo limite de ligação (em segundos)</string>
     <string name="title_advanced_prefer_ip4">Preferir IPv4 sobre IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Endereços dos servidores DNS preferidos (separados por vírgula)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Usar servidor DNS personalizado</string>
+    <string name="title_advanced_dns">Endereços dos servidores DNS preferidos (separados por vírgula)</string>
+    <string name="title_advanced_dns_custom">Usar servidor DNS personalizado</string>
     <string name="title_advanced_ssl_update">Usar provedor SSL atualizado</string>
     <string name="title_advanced_ssl_harden">Reforçar ligações SSL</string>
     <string name="title_advanced_ssl_harden_strict">Requer TLS 1.3</string>
@@ -598,7 +600,7 @@
     <string name="title_advanced_expand_all">Expandir automaticamente todas as mensagens lidas</string>
     <string name="title_advanced_expand_one">Expandir apenas uma mensagem de cada vez</string>
     <string name="title_advanced_collapse_multiple">Esconder mensagens numa conversa com múltiplas mensagens ao \'voltar\'</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Atrasar a marcação automática de mensagens como lidas</string>
+    <string name="title_advanced_seen_delay">Atrasar a marcação automática de mensagens como lidas</string>
     <string name="title_advanced_autoclose">Fechar conversas automaticamente</string>
     <string name="title_advanced_autoclose_send">Fechar conversa automaticamente após o envio de mensagens</string>
     <string name="title_advanced_onclose">Ao fechar uma conversa</string>
@@ -934,15 +936,15 @@
     <string name="title_aliases">Pseudónimos</string>
     <string name="title_provider">Fornecedor</string>
     <string name="title_custom">Personalizado</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Forçar DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Apenas um número limitado de servidores DNS suportam DNSSEC</string>
+    <string name="title_dnssec">Forçar DNSSEC</string>
+    <string name="title_dnssec_remark">Apenas um número limitado de servidores DNS suportam DNSSEC</string>
     <string name="title_host">Nome do servidor</string>
     <string name="title_encryption">Encriptação</string>
     <string name="title_encryption_none">Nenhuma (insegura)</string>
     <string name="title_allow_insecure">Permitir ligações inseguras</string>
     <string name="title_insecure_remark">Ligações inseguras só devem ser permitidas em redes confiáveis e nunca em redes públicas</string>
     <string name="title_dane">Forçar DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Só alguns provedores de e-mail suportam DANE</string>
+    <string name="title_dane_remark">Só alguns provedores de e-mail suportam DANE</string>
     <string name="title_notify_remark">Pode activar isto para ter notificações de uma conta em específico</string>
     <string name="title_port">Número da porta</string>
     <string name="title_user">Nome de utilizador</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index e973be93ff..d99805be72 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -199,6 +199,7 @@
     <string name="title_setup_wizard_new">Мне нужен новый адрес электронной почты</string>
     <string name="title_setup_manual">Ручная настройка и параметры учётной записи</string>
     <string name="title_setup_classic">Классическая настройка</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Мастер быстрой настройки для \"Другого провайдера\" обычно тоже работает и он проще, чем ввод всех данных сервера вручную.</string>
     <string name="title_setup_documentation">Ознакомьтесь с документацией почтового провайдера для правильной настройки сервера</string>
     <string name="title_setup_account_remark">Получение почты</string>
     <string name="title_setup_identity_remark">Отправка почты</string>
@@ -208,6 +209,7 @@
     <string name="title_setup_google_sign_in">Войти с помощью Google</string>
     <string name="title_setup_other">Другой провайдер</string>
     <string name="title_setup_inbound">Только входящая почта (отправка письма невозможна!)</string>
+    <string name="title_setup_imap">Учётная запись IMAP</string>
     <string name="title_setup_pop3">Учётная запись POP3</string>
     <string name="title_setup_oauth_permission">Провайдер электронной почты одобрил OAuth только для официальных версий приложения из Play Store и GitHub</string>
     <string name="title_setup_gmail_support">Авторизация учётных записей Google будет работать только в официальных версиях из Play Store и GitHub, так как Android проверяет подпись приложения</string>
@@ -465,6 +467,8 @@
     <string name="title_advanced_vpn_only">Подключаться только через VPN</string>
     <string name="title_advanced_timeout">Время ожидания подключения (сек.)</string>
     <string name="title_advanced_prefer_ip4">Предпочитать IPv4</string>
+    <string name="title_advanced_dns">Адреса предпочтительных DNS-серверов (через запятую)</string>
+    <string name="title_advanced_dns_custom">Использовать пользовательский DNS</string>
     <string name="title_advanced_ssl_update">Использовать обновлённый SSL-провайдер</string>
     <string name="title_advanced_ssl_harden">Усиленные SSL-подключения</string>
     <string name="title_advanced_ssl_harden_strict">Требовать TLS 1.3</string>
@@ -622,6 +626,7 @@
     <string name="title_advanced_expand_all">Автоматически разворачивать все прочитанные сообщения</string>
     <string name="title_advanced_expand_one">Разворачивать только одно сообщение за раз</string>
     <string name="title_advanced_collapse_multiple">Сворачивать сообщения в диалоге с несколькими сообщениями кнопкой \"назад\"</string>
+    <string name="title_advanced_seen_delay">Задержка автоматической пометки сообщений прочитанными</string>
     <string name="title_advanced_autoclose">Автоматически закрывать диалоги</string>
     <string name="title_advanced_autoclose_send">Автоматически закрывать диалоги после отправки сообщений</string>
     <string name="title_advanced_onclose">При закрытии диалога</string>
@@ -958,12 +963,15 @@
     <string name="title_aliases">Псевдонимы</string>
     <string name="title_provider">Провайдер</string>
     <string name="title_custom">Пользовательское</string>
+    <string name="title_dnssec">Принудительно использовать DNSSEC</string>
+    <string name="title_dnssec_remark">DNSSEC поддерживает ограниченное количество DNS-серверов</string>
     <string name="title_host">Имя хоста</string>
     <string name="title_encryption">Шифрование</string>
     <string name="title_encryption_none">Нет (небезопасно)</string>
     <string name="title_allow_insecure">Разрешить небезопасные подключения</string>
     <string name="title_insecure_remark">Небезопасные соединения могут быть разрешены только в доверенных сетях и никогда в публичных сетях</string>
     <string name="title_dane">Принудительно использовать DANE</string>
+    <string name="title_dane_remark">DANE поддерживают только некоторые провайдеры электронной почты</string>
     <string name="title_notify_remark">Вы можете включить это для уведомлений конкретной учётной записи</string>
     <string name="title_port">Номер порта</string>
     <string name="title_user">Имя пользователя</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f107df19f7..85db312512 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -434,6 +434,8 @@
     <string name="title_advanced_vpn_only">Anslut endast via VPN</string>
     <string name="title_advanced_timeout">Timeout för anslutning (sekunder)</string>
     <string name="title_advanced_prefer_ip4">Föredra IPv4 över IPv6</string>
+    <string name="title_advanced_dns">Föredragna DNS-serveradresser (kommaseparerade)</string>
+    <string name="title_advanced_dns_custom">Använd anpassad DNS-resolver</string>
     <string name="title_advanced_ssl_update">Använd uppdaterad SSL-leverantör</string>
     <string name="title_advanced_ssl_harden">Strikta SSL-anslutningar</string>
     <string name="title_advanced_ssl_harden_strict">Kräv TLS 1.3</string>
@@ -591,6 +593,7 @@
     <string name="title_advanced_expand_all">Expandera automatiskt alla lästa meddelanden</string>
     <string name="title_advanced_expand_one">Expandera endast ett meddelande åt gången</string>
     <string name="title_advanced_collapse_multiple">Kollapsa meddelanden i en konversation med flera meddelanden på \'back\'</string>
+    <string name="title_advanced_seen_delay">Fördröj automatiskt markering av meddelanden som lästa</string>
     <string name="title_advanced_autoclose">Stäng konversationer automatiskt</string>
     <string name="title_advanced_autoclose_send">Stäng konversationer automatiskt efter att ha skickat meddelanden</string>
     <string name="title_advanced_onclose">När du stänger en konversation</string>
@@ -923,12 +926,15 @@
     <string name="title_aliases">Alias</string>
     <string name="title_provider">Leverantör</string>
     <string name="title_custom">Anpassad</string>
+    <string name="title_dnssec">Tvinga DNSSEC</string>
+    <string name="title_dnssec_remark">Endast ett begränsat antal DNS-servrar stöder DNSSEC</string>
     <string name="title_host">Värdnamn</string>
     <string name="title_encryption">Kryptering</string>
     <string name="title_encryption_none">Ingen (osäker)</string>
     <string name="title_allow_insecure">Tillåt osäkra anslutningar</string>
     <string name="title_insecure_remark">Osäkra anslutningar bör endast tillåtas på betrodda nätverk och aldrig på offentliga nätverk</string>
     <string name="title_dane">Tvinga DANE</string>
+    <string name="title_dane_remark">Endast vissa e-postleverantörer stöder DANE</string>
     <string name="title_notify_remark">Du kan aktivera det här för kontospecifika aviseringar</string>
     <string name="title_port">Portnummer</string>
     <string name="title_user">Användarnamn</string>
diff --git a/app/src/main/res/values-szl-rPL/strings.xml b/app/src/main/res/values-szl-rPL/strings.xml
index 69603e9db4..c941093a03 100644
--- a/app/src/main/res/values-szl-rPL/strings.xml
+++ b/app/src/main/res/values-szl-rPL/strings.xml
@@ -199,6 +199,7 @@
     <string name="title_setup_wizard_new">Potrzebujesz nowego adresu e-mail?</string>
     <string name="title_setup_manual">Ręczna konfiguracja i opcje konta</string>
     <string name="title_setup_classic">Konfiguracja klasyczna</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Kreator szybkiej konfiguracji dla \"innego dostawcy\" powyżej zwykle również działa i jest łatwiejszy niż wprowadzanie wszystkich danych serwera.</string>
     <string name="title_setup_documentation">Sprawdź dokumentację dostawcy poczty e-mail w celu uzyskania poprawnej konfiguracji serwera e-mail</string>
     <string name="title_setup_account_remark">Odbieranie wiadomości e-mail</string>
     <string name="title_setup_identity_remark">Wysyłanie wiadomości e-mail</string>
@@ -208,6 +209,7 @@
     <string name="title_setup_google_sign_in">Zaloguj się poprzez Google</string>
     <string name="title_setup_other">Inny dostawca</string>
     <string name="title_setup_inbound">Tylko przychodzące wiadomości e-mail (wiadomości e-mail nie mogą być wysyłane!)</string>
+    <string name="title_setup_imap">Konto IMAP</string>
     <string name="title_setup_pop3">Konto POP3</string>
     <string name="title_setup_oauth_permission">Dostawca poczty e-mail zatwierdził OAuth tylko dla wersji Sklep Play i GitHub</string>
     <string name="title_setup_gmail_support">Autoryzacja kont Google będzie działać tylko w wersji Sklep Play i GitHub, ponieważ Android sprawdza podpis aplikacji cyfrowej</string>
@@ -465,8 +467,8 @@
     <string name="title_advanced_vpn_only">Połącz tylko przez VPN</string>
     <string name="title_advanced_timeout">Limit czasu połączenia (sekundy)</string>
     <string name="title_advanced_prefer_ip4">Preferuj IPv4 nad IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Preferowane adresy serwera DNS (oddzielone przecinkami)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Użyj własnego mechanizmu rozwiązywania DNS</string>
+    <string name="title_advanced_dns">Preferowane adresy serwera DNS (oddzielone przecinkami)</string>
+    <string name="title_advanced_dns_custom">Użyj własnego mechanizmu rozwiązywania DNS</string>
     <string name="title_advanced_ssl_update">Użyj zaktualizowanego dostawcy SSL</string>
     <string name="title_advanced_ssl_harden">Wzmocnij połączenia SSL</string>
     <string name="title_advanced_ssl_harden_strict">Wymagaj TLS 1.3</string>
@@ -624,7 +626,7 @@
     <string name="title_advanced_expand_all">Automatycznie rozwiń wszystkie przeczytane wiadomości</string>
     <string name="title_advanced_expand_one">Rozwiń tylko jedną wiadomość na raz</string>
     <string name="title_advanced_collapse_multiple">Zwiń wiadomości w konwersacji z wieloma wiadomościami przy \'wstecz\'</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Opóźnij automatyczne oznaczanie wiadomości jako przeczytane</string>
+    <string name="title_advanced_seen_delay">Opóźnij automatyczne oznaczanie wiadomości jako przeczytane</string>
     <string name="title_advanced_autoclose">Automatycznie zamykaj konwersacje</string>
     <string name="title_advanced_autoclose_send">Automatycznie zamykaj konwersacje po wysłaniu wiadomości</string>
     <string name="title_advanced_onclose">Przy zamykaniu konwersacji</string>
@@ -960,14 +962,14 @@
     <string name="title_aliases">Aliasy</string>
     <string name="title_provider">Dostawca</string>
     <string name="title_custom">Własne</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Wymuś DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Tylko ograniczona liczba serwerów DNS obsługuje DNSSEC</string>
+    <string name="title_dnssec">Wymuś DNSSEC</string>
+    <string name="title_dnssec_remark">Tylko ograniczona liczba serwerów DNS obsługuje DNSSEC</string>
     <string name="title_host">Nazwa hosta</string>
     <string name="title_encryption">Szyfrowanie</string>
     <string name="title_encryption_none">Brak (niebezpieczne)</string>
     <string name="title_allow_insecure">Zezwól na niezabezpieczone połączenia</string>
     <string name="title_insecure_remark">Niebezpieczne połączenia powinny być dozwolone tylko w zaufanych sieciach, a nigdy w sieciach publicznych</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Tylko niektórzy dostawcy poczty elektronicznej obsługują DANE</string>
+    <string name="title_dane_remark">Tylko niektórzy dostawcy poczty elektronicznej obsługują DANE</string>
     <string name="title_notify_remark">Można włączyć tę funkcję dla specyficznych powiadomień danego konta</string>
     <string name="title_port">Numer portu</string>
     <string name="title_user">Nazwa użytkownika</string>
@@ -1159,7 +1161,7 @@
     <string name="title_folder_inbox">Odebrane</string>
     <string name="title_folder_outbox">Wysyłane</string>
     <string name="title_folder_all">Archiwum</string>
-    <string name="title_folder_drafts">Szkice</string>
+    <string name="title_folder_drafts">Wersje Robocze</string>
     <string name="title_folder_trash">Kosz</string>
     <string name="title_folder_junk">Spam</string>
     <string name="title_folder_sent">Wysłane</string>
@@ -1168,7 +1170,7 @@
     <string name="title_folder_user_only">Tylko foldery użytkownika</string>
     <string name="title_folder_primary">Podstawowe konto folderów</string>
     <string name="title_folders_unified">Wspólne foldery</string>
-    <string name="title_folder_local_drafts">Szkice lokalne</string>
+    <string name="title_folder_local_drafts">Lokalne Wersje Robocze</string>
     <string name="title_no_folders">Brak folderów</string>
     <string name="title_no_messages">Brak wiadomości</string>
     <string name="title_filters_active">Jeden lub więcej filtrów jest aktywnych</string>
@@ -1435,7 +1437,7 @@
     <string name="title_attachment_photo">Zrób zdjęcie</string>
     <string name="title_attachment_audio">Nagraj dźwięk</string>
     <string name="title_show_addresses">Pokaż DW/UDW</string>
-    <string name="title_save_drafts">Zapisz szkice na serwerze</string>
+    <string name="title_save_drafts">Zapisz wersje robocze na serwerze</string>
     <string name="title_send_dialog">Pokaż opcje wysyłania</string>
     <string name="title_image_dialog">Pokaż opcje obrazu</string>
     <string name="title_style_toolbar">Styl paska narzędzi</string>
@@ -1776,7 +1778,7 @@
     <string name="title_legend_unified">Wspólna skrzynka / konto podstawowe</string>
     <string name="title_legend_inbox">Odebrane</string>
     <string name="title_legend_outbox">Wysyłane</string>
-    <string name="title_legend_drafts">Szkice</string>
+    <string name="title_legend_drafts">Wersje Robocze</string>
     <string name="title_legend_sent">Wysłane</string>
     <string name="title_legend_archive">Archiwum</string>
     <string name="title_legend_trash">Kosz</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 78f3ce89ae..5759121039 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -170,6 +170,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_setup_wizard_new">Yeni bir e-posta adresi istiyorum</string>
     <string name="title_setup_manual">Elle kurulum ve hesap ayarları</string>
     <string name="title_setup_classic">Klasik yapılandırma</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Yukarıdaki \"Diğer Sağlayıcı\" için hızlı kurulum sihirbazı da genellikle işe yarar ve tüm sunucu verilerini girmekten daha kolaydır.</string>
     <string name="title_setup_documentation">Doğru e-posta sunucusu yapılandırması için lütfen e-posta sağlayıcınızın belgelerine bakın</string>
     <string name="title_setup_account_remark">E-posta al</string>
     <string name="title_setup_identity_remark">E-posta gönder</string>
@@ -179,6 +180,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_setup_google_sign_in">Google ile giriş yap</string>
     <string name="title_setup_other">Diğer sağlayıcı</string>
     <string name="title_setup_inbound">Yalnızca gelen e-posta (e-posta gönderilemez!)</string>
+    <string name="title_setup_imap">IMAP hesabı</string>
     <string name="title_setup_pop3">POP3 hesabı</string>
     <string name="title_setup_oauth_permission">E-posta sağlayıcısı, yalnızca Play Store ve GitHub sürümü için OAuth\'u onayladı</string>
     <string name="title_setup_gmail_support">Google hesaplarını yetkilendirmek Android dijital uygulama imzasını kontrol ettiğinden, yalnızca Play Store ve GitHub sürümünde çalışır</string>
@@ -436,8 +438,8 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_vpn_only">Yalnızca bir VPN aracılığıyla bağlanın</string>
     <string name="title_advanced_timeout">Bağlantı zaman aşımı (saniye)</string>
     <string name="title_advanced_prefer_ip4">IPv6 yerine IPv4\'ü tercih edin</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Tercih edilen DNS sunucu adresleri (virgülle ayrılmış)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Özel DNS ayrıştırıcısu kullanma</string>
+    <string name="title_advanced_dns">Tercih edilen DNS sunucu adresleri (virgülle ayrılmış)</string>
+    <string name="title_advanced_dns_custom">Özel DNS ayrıştırıcısu kullanma</string>
     <string name="title_advanced_ssl_update">Güncellenmiş SSL sağlayıcısı kullanın</string>
     <string name="title_advanced_ssl_harden">SSL bağlantılarını sağlamlaştır</string>
     <string name="title_advanced_ssl_harden_strict">TLS 1.3 gerektir</string>
@@ -595,7 +597,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_expand_all">Tüm okunmuş mesajları otomatik olarak aç</string>
     <string name="title_advanced_expand_one">Bir kerede yalnızca bir mesaj genişlet</string>
     <string name="title_advanced_collapse_multiple">Birden fazla mesaj içeren sohbetlerdeki mesajları \'geri\' seçeneğinde daralt</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Mesajların otomatik olarak okundu olarak işaretlenmesini geciktirme</string>
+    <string name="title_advanced_seen_delay">Mesajların otomatik olarak okundu olarak işaretlenmesini geciktirme</string>
     <string name="title_advanced_autoclose">İletişimleri otomatik olarak kapat</string>
     <string name="title_advanced_autoclose_send">Mesaj gönderdikten sonra konuşmaları otomatik olarak kapat</string>
     <string name="title_advanced_onclose">Bir konuşmayı kapatırken</string>
@@ -931,15 +933,15 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_aliases">Takma adlar</string>
     <string name="title_provider">Sağlayıcı</string>
     <string name="title_custom">Özel</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">DNSSEC\'i Zorla</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Yalnızca sınırlı sayıda DNS sunucusu DNSSEC\'i destekler</string>
+    <string name="title_dnssec">DNSSEC\'i Zorla</string>
+    <string name="title_dnssec_remark">Yalnızca sınırlı sayıda DNS sunucusu DNSSEC\'i destekler</string>
     <string name="title_host">Sunucu adı</string>
     <string name="title_encryption">Şifreleme açık</string>
     <string name="title_encryption_none">Yok (güvenliksiz)</string>
     <string name="title_allow_insecure">Güvensiz bağlantılara izin ver</string>
     <string name="title_insecure_remark">Güvensiz bağlantılara sadece güvenilen ağlarda izin verilmelidir ve halka açık ağlarda asla izin verilmemelidir</string>
     <string name="title_dane">DANE\'i Zorla</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Yalnızca bazı e-posta sağlayıcıları DANE\'yi destekler</string>
+    <string name="title_dane_remark">Yalnızca bazı e-posta sağlayıcıları DANE\'yi destekler</string>
     <string name="title_notify_remark">Bunu hesaba özel bildirimler için etkinleştirebilirsiniz</string>
     <string name="title_port">Port numarası</string>
     <string name="title_user">Kullanıcı adı</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index d29d8ab344..3d556a5748 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -41,7 +41,7 @@
         <item quantity="other">Повідомлення</item>
     </plurals>
     <string name="page_folders">Теки</string>
-    <string name="page_compose">Написати</string>
+    <string name="page_compose">Створити</string>
     <string name="tile_synchronize">Синхронізувати</string>
     <string name="tile_unseen">Нові повідомлення</string>
     <string name="shortcut_refresh">Оновити</string>
@@ -200,6 +200,7 @@
     <string name="title_setup_wizard_new">Мені потрібна нова адреса електронної пошти</string>
     <string name="title_setup_manual">Ручне налаштування та параметри облікових записів</string>
     <string name="title_setup_classic">Класична конфігурація</string>
+    <string name="title_setup_wizard_hint" comment="title_setup_wizard_hint&#10;Remark at the top of the manual setup section in the main settings screen">Майстер швидкого налаштування для «Іншого постачальника», наведений вище, зазвичай теж працює, і це простіше, ніж вводити всі дані сервера.</string>
     <string name="title_setup_documentation">Перегляньте документацію свого постачальника пошти для правильної конфігурації сервера електронної пошти</string>
     <string name="title_setup_account_remark">Отримання пошти</string>
     <string name="title_setup_identity_remark">Надсилання пошти</string>
@@ -209,6 +210,7 @@
     <string name="title_setup_google_sign_in">Увійти за допомогою Google</string>
     <string name="title_setup_other">Інші постачальники</string>
     <string name="title_setup_inbound">Тільки вхідна пошта (електронні листи не можуть бути надіслані!)</string>
+    <string name="title_setup_imap">Обліковий запис IMAP</string>
     <string name="title_setup_pop3">Обліковий запис POP3</string>
     <string name="title_setup_oauth_permission">Постачальник електронної пошти схвалив OAuth тільки для версій з Play Store та GitHub</string>
     <string name="title_setup_gmail_support">Авторизація облікових записів Google працюватиме тільки в версіях з Play Store та GitHub, тому що Android перевіряє цифровий підпис додатка</string>
@@ -466,8 +468,8 @@
     <string name="title_advanced_vpn_only">Під’єднуватися тільки через VPN</string>
     <string name="title_advanced_timeout">Час очікування підключення (секунди)</string>
     <string name="title_advanced_prefer_ip4">Віддавати перевагу IPv4 над IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Бажані адреси DNS-серверів (через кому)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">Використовувати нетиповий DNS resolver</string>
+    <string name="title_advanced_dns">Бажані адреси DNS-серверів (через кому)</string>
+    <string name="title_advanced_dns_custom">Використовувати нетиповий DNS resolver</string>
     <string name="title_advanced_ssl_update">Використовувати оновленого SSL-провайдера</string>
     <string name="title_advanced_ssl_harden">Посилене SSL-з\'єднання</string>
     <string name="title_advanced_ssl_harden_strict">Вимагати TLS 1.3</string>
@@ -625,7 +627,7 @@
     <string name="title_advanced_expand_all">Автоматично розкривати всі прочитані повідомлення</string>
     <string name="title_advanced_expand_one">Розкривати лише одне повідомлення за раз</string>
     <string name="title_advanced_collapse_multiple">Згортати повідомлення в розмові з декількома повідомленнями при переході «Назад»</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">Затримка автоматичного позначення повідомлень прочитаними</string>
+    <string name="title_advanced_seen_delay">Затримка автоматичного позначення повідомлень прочитаними</string>
     <string name="title_advanced_autoclose">Автоматично закривати розмови</string>
     <string name="title_advanced_autoclose_send">Автоматично закривати розмови після відправлення повідомлень</string>
     <string name="title_advanced_onclose">При закритті розмови</string>
@@ -960,15 +962,15 @@
     <string name="title_aliases">Псевдоніми</string>
     <string name="title_provider">Постачальник</string>
     <string name="title_custom">Власний</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Примусово використовувати DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">Лише обмежена кількість DNS-серверів підтримує DNSSEC</string>
+    <string name="title_dnssec">Примусово використовувати DNSSEC</string>
+    <string name="title_dnssec_remark">Лише обмежена кількість DNS-серверів підтримує DNSSEC</string>
     <string name="title_host">Ім\'я хосту</string>
     <string name="title_encryption">Шифрування</string>
     <string name="title_encryption_none">Немає (незахищено)</string>
     <string name="title_allow_insecure">Дозволити незахищене з’єднання</string>
     <string name="title_insecure_remark">Небезпечні підключення повинні бути дозволені тільки в надійних мережах і ніколи в мережах спільного користування</string>
     <string name="title_dane">Примусово використовувати DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">Лише деякі поштові провайдери підтримують DANE</string>
+    <string name="title_dane_remark">Лише деякі поштові провайдери підтримують DANE</string>
     <string name="title_notify_remark">Ви можете ввімкнути цю функцію для сповіщень в певному обліковому записі</string>
     <string name="title_port">Номер порту</string>
     <string name="title_user">Ім\'я користувача</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index aaade2e459..edfc649427 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -423,8 +423,8 @@
     <string name="title_advanced_vpn_only">仅通过 VPN 连接</string>
     <string name="title_advanced_timeout">连接超时 (秒)</string>
     <string name="title_advanced_prefer_ip4">IPv4 优先于 IPv6</string>
-    <string name="title_advanced_dns" comment="title_advanced_dns&#10;Title for an option to configure extra, preferred DNS server addresses&#10;https://en.wikipedia.org/wiki/Domain_Name_System">首选的DNS服务器地址 (逗号分隔)</string>
-    <string name="title_advanced_dns_custom" comment="title_advanced_dns_custom&#10;Title for an option to use a custom DNS resolver instead of the Android DNS resolver&#10;https://en.wikipedia.org/wiki/Domain_Name_System">使用自定义 DNS 解析器</string>
+    <string name="title_advanced_dns">首选的DNS服务器地址 (逗号分隔)</string>
+    <string name="title_advanced_dns_custom">使用自定义 DNS 解析器</string>
     <string name="title_advanced_ssl_update">使用更新的 SSL 提供商</string>
     <string name="title_advanced_ssl_harden">加强 SSL 连接</string>
     <string name="title_advanced_ssl_harden_strict">需要 TLS 1.3</string>
@@ -582,7 +582,7 @@
     <string name="title_advanced_expand_all">自动展开所有已读消息</string>
     <string name="title_advanced_expand_one">每次仅展开一个消息</string>
     <string name="title_advanced_collapse_multiple">按返回时折叠会话中的多条消息</string>
-    <string name="title_advanced_seen_delay" comment="title_advanced_seen_delay&#10;Title for an option to configure the time to delay marking messages automatically read on opening/expanding messages.">推迟自动将消息标记为已读</string>
+    <string name="title_advanced_seen_delay">推迟自动将消息标记为已读</string>
     <string name="title_advanced_autoclose">自动关闭对话</string>
     <string name="title_advanced_autoclose_send">发送消息后自动关闭对话</string>
     <string name="title_advanced_onclose">关闭对话时</string>
@@ -918,15 +918,15 @@
     <string name="title_aliases">別名</string>
     <string name="title_provider">服务提供商</string>
     <string name="title_custom">自定义</string>
-    <string name="title_dnssec" comment="title_dnssec&#10;Title for account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">强制使用DNSSEC</string>
-    <string name="title_dnssec_remark" comment="title_dnssec_remark&#10;Remark below account/identity option to enforce DNSSEC&#10;https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions">仅数量有限的 DNS 服务器支持 DNSSEC</string>
+    <string name="title_dnssec">强制使用DNSSEC</string>
+    <string name="title_dnssec_remark">仅数量有限的 DNS 服务器支持 DNSSEC</string>
     <string name="title_host">主机名</string>
     <string name="title_encryption">加密</string>
     <string name="title_encryption_none">无（不安全）</string>
     <string name="title_allow_insecure">允许不安全的连接</string>
     <string name="title_insecure_remark">只应在受信任的网络中允许不安全连接，请勿用于公共网络</string>
     <string name="title_dane">强制使用DANE</string>
-    <string name="title_dane_remark" comment="title_dane_remark&#10;Remark below account/identity option to enforce DANE&#10;https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities">只有一些电子邮件提供商支持 DANE</string>
+    <string name="title_dane_remark">只有一些电子邮件提供商支持 DANE</string>
     <string name="title_notify_remark">你可以为特定于账户的通知启用该选项</string>
     <string name="title_port">端口号</string>
     <string name="title_user">用户名</string>