diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 34b577955d..3b3afec55c 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -646,7 +646,6 @@
     <string name="title_ask_reporting">Изпрати репорт с грешки?</string>
     <string name="title_reporting_why">Докладе с грешки ще помогне да се подобри FairEmail</string>
     <string name="title_message_bar_hint">Докоснете иконата, за да архивирате, изтриете или докладвате съобщение като спам и да премахнете това известие</string>
-    <string name="title_answer_hint">Отговорите на всички, пренасочването и т.н. са преместени в бутона за отговор в долната част</string>
     <string name="title_ask_review">Моля, прегледайте FairEmail</string>
     <string name="title_ask_review_rationale">        Използвате FairEmail от известно време.
         Ще Ви бъде благодарен, ако можете да оцените FairEmail в Play Store.
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 1480176dbd..415e65f4a5 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -226,12 +226,14 @@
     <string name="title_advanced_section_display">Zobrazení</string>
     <string name="title_advanced_section_behavior">Chování</string>
     <string name="title_advanced_section_privacy">Soukromí</string>
+    <string name="title_advanced_section_encryption">Šifrování</string>
     <string name="title_advanced_section_notifications">Oznámení</string>
     <string name="title_advanced_section_misc">Ostatní</string>
     <string name="title_advanced_receive">Přijímat zprávy</string>
     <string name="title_advanced_when">Kdy</string>
     <string name="title_advanced_always">Tyto účty synchronizovat vždy</string>
     <string name="title_advanced_schedule">Plán</string>
+    <string name="title_advanced_advanced">Pokročilé</string>
     <string name="title_advanced_unseen">Všechny nepřečtené zprávy</string>
     <string name="title_advanced_flagged">Všechny zprávy s hvězdičkou</string>
     <string name="title_advanced_delete_unseen">Smazat staré nepřečtené zprávy</string>
@@ -264,6 +266,9 @@
     <string name="title_advanced_ssl_harden">Obrnit SSL připojení</string>
     <string name="title_advanced_socks">Použít SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Spravovat připojení</string>
+    <string name="title_advanced_caption_general">Obecné</string>
+    <string name="title_advanced_caption_conversation">Konverzace</string>
+    <string name="title_advanced_caption_message">Zpráva</string>
     <string name="title_advanced_landscape">Dvou-sloupcové rozvržení v režimu na šířku</string>
     <string name="title_advanced_landscape3">Povolit ukotvené navigační menu v režimu na šířku</string>
     <string name="title_advanced_startup">Na úvodní obrazovce zobrazit</string>
@@ -308,6 +313,7 @@
     <string name="title_advanced_navbar_colorize">Obarvit navigační panel Androidu</string>
     <string name="title_advanced_double_back">Dvakrát \"zpět\" pro ukončení</string>
     <string name="title_advanced_pull_refresh">Aktualizovat tažením dolů</string>
+    <string name="title_advanced_hide_actionbar">Skrýt panel akcí při posouvání dolů</string>
     <string name="title_advanced_autoscroll">Posun na začátek při příjmu nových zpráv</string>
     <string name="title_advanced_double_tap">Dvojstisk pro označení zprávy jako přečtené/nepřečtené</string>
     <string name="title_advanced_swipenav">Tahem vlevo/vpravo přejít na další/předešlou konverzaci</string>
@@ -667,7 +673,6 @@
     <string name="title_ask_reporting">Odeslat zprávy o chybách?</string>
     <string name="title_reporting_why">Zprávami o chybách pomůžete zlepšit FairEmail</string>
     <string name="title_message_bar_hint">Stisk křížku archivuje, smaže či označí zprávu jako nevyžádanou, a odeberte toto oznámení</string>
-    <string name="title_answer_hint">Odpověď všem, přeposlání, atd. byly přesunuty dolů, pod tlačítko odpovědi</string>
     <string name="title_ask_review">Prosím, ohodnoťte FairEmail</string>
     <string name="title_ask_review_rationale">        Již nějakou dobu FairEmail používáte.
         Vážil bych si, kdyby jste mohli FairEmail ohodnotit v Obchodě Play.
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index d91a5657ee..797791341d 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -203,12 +203,14 @@
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Adfærd</string>
     <string name="title_advanced_section_privacy">Fortrolighed</string>
+    <string name="title_advanced_section_encryption">Kryptering</string>
     <string name="title_advanced_section_notifications">Notifikationer</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Beskedmodtagelse</string>
     <string name="title_advanced_when">Når</string>
     <string name="title_advanced_always">Synkronisér altid disse konti</string>
     <string name="title_advanced_schedule">Planlægning</string>
+    <string name="title_advanced_advanced">Avanceret</string>
     <string name="title_advanced_unseen">Alle ulæste beskeder</string>
     <string name="title_advanced_flagged">Alle stjernemarkerede beskeder</string>
     <string name="title_advanced_delete_unseen">Slet gamle, ulæste beskeder</string>
@@ -241,6 +243,9 @@
     <string name="title_advanced_ssl_harden">Hærd SSL-forbindelser</string>
     <string name="title_advanced_socks">Benyt SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Håndtér konnektivitet</string>
+    <string name="title_advanced_caption_general">Generelt</string>
+    <string name="title_advanced_caption_conversation">Samtale</string>
+    <string name="title_advanced_caption_message">Besked</string>
     <string name="title_advanced_landscape">Benyt to kolonner i liggende tilstand</string>
     <string name="title_advanced_landscape3">Tillad fastgjort navigeringsmenu i liggende tilstand</string>
     <string name="title_advanced_startup">Vis på startskærmen</string>
@@ -286,6 +291,7 @@
     <string name="title_advanced_navbar_colorize">Farvelæg Abdroid-navigeringsbjælken</string>
     <string name="title_advanced_double_back">Dobbelttryk \"Tilbage\"/stryg for at lukke</string>
     <string name="title_advanced_pull_refresh">Træk ned for at opfriske</string>
+    <string name="title_advanced_hide_actionbar">Skjul handlingsbjælke, når der rulles ned</string>
     <string name="title_advanced_autoscroll">Rul til toppen, når ny besked modtages</string>
     <string name="title_advanced_double_tap">Dobbelttryk for at markere besked læst/ulæst</string>
     <string name="title_advanced_swipenav">Stryg til venstre/højre for at gå til næste/forrige samtale</string>
@@ -646,7 +652,6 @@
     <string name="title_ask_reporting">Send fejlrapporter?</string>
     <string name="title_reporting_why">Rapportering af fejl vil hjælpe med at forbedre FairEmail</string>
     <string name="title_message_bar_hint">Tryk på krydsikonet for at arkivere, slette eller rapportere en besked som spam og fjerne denne meddelelse</string>
-    <string name="title_answer_hint">Besvar alle, videresend mv. er flyttet til Besvar-knappen nederst</string>
     <string name="title_ask_review">Bedøm venligst FairEmail</string>
     <string name="title_ask_review_rationale">        Du har brugt FairEmail i et stykke tid nu.
         Det vil blive værdsat, hvis du kunne bedømme FairEmail i Play Butik.
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ccedc36207..bd1b9e17fe 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -211,6 +211,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_when">Wann</string>
     <string name="title_advanced_always">Diese Konten immer synchronisieren</string>
     <string name="title_advanced_schedule">Zeitplan</string>
+    <string name="title_advanced_advanced">Erweitert</string>
     <string name="title_advanced_unseen">Alle ungelesenen Nachrichten</string>
     <string name="title_advanced_flagged">Alle markierten Nachrichten</string>
     <string name="title_advanced_delete_unseen">Alte ungelesene Nachrichten löschen</string>
@@ -652,7 +653,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_ask_reporting">Fehlerberichte senden?</string>
     <string name="title_reporting_why">Fehlerberichte helfen uns, FairEmail zu verbessern</string>
     <string name="title_message_bar_hint">Tippen Sie auf das Kreuz-Symbol, um eine Nachricht zu archivieren, zu löschen oder als Spam zu melden und um diesen Hinweis auszublenden</string>
-    <string name="title_answer_hint">„Allen antworten”, „Weiterleiten”, &#8230; wurde auf die Antwortschaltfläche am unteren Rand verschoben</string>
     <string name="title_ask_review">Bitte bewerten Sie FairEmail</string>
     <string name="title_ask_review_rationale">        Du benutzt FairEmail schon eine Weile.
         Sofern Du zufrieden bist, wäre es nett, wenn du FairEmail im Play Store positiv bewerten könntest.
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 7793304338..fde4c1c2ac 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -211,6 +211,7 @@
     <string name="title_advanced_when">Cuando</string>
     <string name="title_advanced_always">Siempre sincronizar estas cuentas</string>
     <string name="title_advanced_schedule">Programar</string>
+    <string name="title_advanced_advanced">Avanzado</string>
     <string name="title_advanced_unseen">Todos los mensajes no leídos</string>
     <string name="title_advanced_flagged">Todos los mensajes destacados</string>
     <string name="title_advanced_delete_unseen">Eliminar mensajes no leídos antiguos</string>
@@ -652,7 +653,6 @@
     <string name="title_ask_reporting">¿Enviar informes de error?</string>
     <string name="title_reporting_why">Informar de errores ayudará a mejorar FairEmail</string>
     <string name="title_message_bar_hint">Toque la cruz para archivar, borrar o reportar un mensaje como spam y eliminar este aviso</string>
-    <string name="title_answer_hint">Responder a todos, reenviar, etc. se han movido al botón de respuesta en la parte inferior</string>
     <string name="title_ask_review">Por favor califique FairEmail</string>
     <string name="title_ask_review_rationale">        Ha estado usando FairEmail durante un tiempo.
         Agradecería que pudiera calificar a FairEmail en Play Store.
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 40a735502d..e02ecc8994 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -203,12 +203,14 @@
     <string name="title_advanced_section_display">Bistaratzea</string>
     <string name="title_advanced_section_behavior">Portaera</string>
     <string name="title_advanced_section_privacy">Pribatutasuna</string>
+    <string name="title_advanced_section_encryption">Zifratzea</string>
     <string name="title_advanced_section_notifications">Jakinarazpenak</string>
     <string name="title_advanced_section_misc">Miszelanea</string>
     <string name="title_advanced_receive">Jaso mezuak</string>
     <string name="title_advanced_when">Noiz</string>
     <string name="title_advanced_always">Sinkronizatu beti kontu hauek</string>
     <string name="title_advanced_schedule">Egitaraua</string>
+    <string name="title_advanced_advanced">Aurreratua</string>
     <string name="title_advanced_unseen">Irakurri gabeko mezu guztiak</string>
     <string name="title_advanced_flagged">Izardun mezu guztiak</string>
     <string name="title_advanced_delete_unseen">Ezabatu irakurri gabeko mezu zaharrak</string>
@@ -241,6 +243,9 @@
     <string name="title_advanced_ssl_harden">Gogortu SSL konexioak</string>
     <string name="title_advanced_socks">Erabili SOCKS proxya</string>
     <string name="title_advanced_manage_connectivity">Kudeatu konektibitatea</string>
+    <string name="title_advanced_caption_general">Orokorra</string>
+    <string name="title_advanced_caption_conversation">Elkarrizketa</string>
+    <string name="title_advanced_caption_message">Mezua</string>
     <string name="title_advanced_landscape">Erabili bi zutabe modu horizontalean</string>
     <string name="title_advanced_landscape3">Baimendu nabigazio menu finkoa horizontalean</string>
     <string name="title_advanced_startup">Erakutsi hasiera pantailan</string>
@@ -286,6 +291,7 @@
     <string name="title_advanced_navbar_colorize">Koloreztatu Android-en nabigazio barra</string>
     <string name="title_advanced_double_back">\'Atzera\' birritan irteteko</string>
     <string name="title_advanced_pull_refresh">Tiratu behera berritzeko</string>
+    <string name="title_advanced_hide_actionbar">Ezkutatu ekintza barra beherantz korritzean</string>
     <string name="title_advanced_autoscroll">Korritu gora mezu berriak jasotzean</string>
     <string name="title_advanced_double_tap">Sakatu birritan mezua irakurrita/irakurri gabeko gisa markatzeko</string>
     <string name="title_advanced_swipenav">Pasatu hatza ezkerrera/eskuinera aurreko/hurrengo elkarrizketara joateko</string>
@@ -645,7 +651,6 @@
     <string name="title_ask_reporting">Bidali errore txostenak?</string>
     <string name="title_reporting_why">Errore txostenek FairEmail hobetzen laguntzen dute</string>
     <string name="title_message_bar_hint">Tap egin gurutzearen ikonoan mezua gordetzeko, ezabatzeko edo spam gisa artxibatzeko eta ohar hau kentzeko</string>
-    <string name="title_answer_hint">Denei erantzutea, birbidaltzea eta abar behean dagoen erantzun-botoira eraman dira</string>
     <string name="title_ask_review">Baloratu FairEmail mesedez</string>
     <string name="title_ask_review_rationale">FairEmail denbora batez erabili duzu.
 Eskertzekoa litzateke Play Storen FairEmail baloratuko bazenu.
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 2cc23ca394..7c89bb32bb 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -76,6 +76,7 @@
     <string name="title_notification_failed">\'%1$s\' epäonnistui</string>
     <string name="title_notification_alert">Palvelimen \'%1$s\' hälytys</string>
     <string name="title_name_count">%1$s (%2$s)</string>
+    <string name="title_name_plus">%1$s +%2$d</string>
     <string name="title_factor_minutes">%1$d minuuttia</string>
     <string name="menu_exit">Poistu</string>
     <string name="menu_answers">Viestipohjat</string>
@@ -201,12 +202,14 @@
     <string name="title_advanced_section_display">Ulkoasu</string>
     <string name="title_advanced_section_behavior">Toiminnot</string>
     <string name="title_advanced_section_privacy">Yksityisyys</string>
+    <string name="title_advanced_section_encryption">Salaus</string>
     <string name="title_advanced_section_notifications">Ilmoitukset</string>
     <string name="title_advanced_section_misc">Sekalaiset</string>
     <string name="title_advanced_receive">Vastaanota viestejä</string>
     <string name="title_advanced_when">Milloin</string>
     <string name="title_advanced_always">Synkronoi aina nämä tilit</string>
     <string name="title_advanced_schedule">Aikataulu</string>
+    <string name="title_advanced_advanced">Lisäasetukset</string>
     <string name="title_advanced_unseen">Kaikki lukemattomat viestit</string>
     <string name="title_advanced_flagged">Kaikki tähdelliset viestit</string>
     <string name="title_advanced_delete_unseen">Poista vanhat lukemattomat viestit</string>
@@ -239,6 +242,9 @@
     <string name="title_advanced_ssl_harden">Koveta SSL-yhteydet</string>
     <string name="title_advanced_socks">Käytä SOCKS-proxypalvelinta</string>
     <string name="title_advanced_manage_connectivity">Hallitse verkkoyhteyksiä</string>
+    <string name="title_advanced_caption_general">Yleiset</string>
+    <string name="title_advanced_caption_conversation">Keskustelu</string>
+    <string name="title_advanced_caption_message">Viesti</string>
     <string name="title_advanced_landscape">Käytä kahta saraketta vaakatilassa</string>
     <string name="title_advanced_landscape3">Salli kiinteä navigointivalikko vaakatilassa</string>
     <string name="title_advanced_startup">Näytä aloitusnäytössä</string>
@@ -281,8 +287,10 @@
     <string name="title_advanced_images_inline">Näytä tekstiin upotetut kuvat oletuksena</string>
     <string name="title_advanced_seekbar">Näytä suhteellinen sijainti keskustelussa pisteellä</string>
     <string name="title_advanced_actionbar">Näytä keskustelun toimintopalkki</string>
+    <string name="title_advanced_navbar_colorize">Väritä Androidin navigointipalkki</string>
     <string name="title_advanced_double_back">\'Takaisin\' kaksi kertaa sulkee sovelluksen</string>
     <string name="title_advanced_pull_refresh">Vedä alas päivittääksesi</string>
+    <string name="title_advanced_hide_actionbar">Piilota toimintopalkki alas vieritettäessä</string>
     <string name="title_advanced_autoscroll">Vieritä ylös, kun uusi viesti saapuu</string>
     <string name="title_advanced_double_tap">Tuplanäpäytys merkitsee viestin luetuksi/lukemattomaksi</string>
     <string name="title_advanced_swipenav">Pyyhkäise vasemmalle/oikealle siirtyäksesi seuraavaan/edelliseen keskusteluun</string>
@@ -365,6 +373,7 @@
     <string name="title_advanced_check_mx">Tarkista lähettäjien sähköpostiosoitteet viestejä synkronoitaessa</string>
     <string name="title_advanced_check_reply">Tarkista vastaussähköpostiosoitteet viestejä synkronoitaessa</string>
     <string name="title_advanced_unseen_hint">Jotkin palveluntarjoajat eivät tue tätä kunnolla, mikä voi aiheuttaa kaikkien tai ei minkään viestin synkronoinnin</string>
+    <string name="title_advanced_deleted_unseen">Lukemattomat viestit pidetään laitteessa ikuisesti, kun poissa käytöstä</string>
     <string name="title_advanced_sync_kept_hint">Tämä lisää datan ja akun käyttöä varsinkin, jos paikallisia viestejä on paljon</string>
     <string name="title_advanced_sync_folders_hint">Tämän kytkeminen pois vähentää datan ja akun käyttöä, mutta kytkee pois myös kansiolistan päivittymisen</string>
     <string name="title_advanced_subscribed_only_hint">Tämän käyttöönotto poistaa kaikki paikalliset kansiot, joita ei ole tilattu</string>
@@ -435,6 +444,7 @@
     <string name="title_account_left">Pyyhkäisy vasemmalle</string>
     <string name="title_account_right">Pyyhkäisy oikealle</string>
     <string name="title_account_move">Oletuskohdekansio</string>
+    <string name="title_account_gmail">Gmail-tilin luotettavasti synkronoimiseksi tulisi käyttää Gmail-pika-asetusvelhoa aina, kun mahdollista</string>
     <string name="title_domain">Verkkotunnus</string>
     <string name="title_autoconfig">Hae asetukset</string>
     <string name="title_aliases">Aliakset</string>
@@ -585,6 +595,8 @@
     <string name="title_more">Lisää</string>
     <string name="title_spam">Siirrä roskapostikansioon</string>
     <string name="title_move">Siirrä</string>
+    <string name="title_no_junk">Ei roskaposti</string>
+    <string name="title_move_to">Siirrä kansioon &#8230;</string>
     <string name="title_move_to_folder">Siirrä kansioon &#8230;</string>
     <string name="title_move_to_account">Siirrä tilillä %1$s &#8230;</string>
     <string name="title_snooze">Torkuta &#8230;</string>
@@ -638,6 +650,7 @@
     <string name="title_ask_help">Auta parantamaan FairEmailia</string>
     <string name="title_ask_reporting">Lähetetäänkö virheraportteja?</string>
     <string name="title_reporting_why">Virheraportointi auttaa FairEmailin kehittämisessä</string>
+    <string name="title_message_bar_hint">Napauta ristikuvaketta arkistoidaksesi, poistaaksesi tai merkitäksesi viestin roskapostiksi ja poistaaksesi tämän huomautuksen</string>
     <string name="title_ask_review">Ole hyvä ja arvostele FairEmail</string>
     <string name="title_ask_review_rationale">Olet käyttänyt FairEmailia jonkin aikaa.
         Olisi hienoa, jos voisit arvioida FairEmailin Play Kaupassa.
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 8738aa535d..011348063b 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -211,6 +211,7 @@
     <string name="title_advanced_when">Quand</string>
     <string name="title_advanced_always">Toujours synchroniser ces comptes</string>
     <string name="title_advanced_schedule">Planification</string>
+    <string name="title_advanced_advanced">Avancé</string>
     <string name="title_advanced_unseen">Tous les messages non lus</string>
     <string name="title_advanced_flagged">Tous les messages suivis</string>
     <string name="title_advanced_delete_unseen">Supprimer les anciens messages non lus</string>
@@ -652,7 +653,6 @@
     <string name="title_ask_reporting">Envoyer des rapports d\'erreur ?</string>
     <string name="title_reporting_why">Un rapport d\'erreur aidera à améliorer FairEmail</string>
     <string name="title_message_bar_hint">Appuyez sur l\'icône de la croix pour archiver, supprimer ou marquer un message comme spam et pour supprimer cet avis</string>
-    <string name="title_answer_hint">Répondre à tous, transférer, etc... ont été déplacés vers le bouton de réponse en bas</string>
     <string name="title_ask_review">Veuillez évaluer FairEmail</string>
     <string name="title_ask_review_rationale">        Vous utilisez FairEmail depuis un moment.
         Je vous serais reconnaissant si vous pouviez noter FairEmail dans le Play Store.
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 11e07b1bb4..80a0373b3c 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -210,6 +210,7 @@
     <string name="title_advanced_when">Quando</string>
     <string name="title_advanced_always">Sincronizza sempre questi account</string>
     <string name="title_advanced_schedule">Pianificazione</string>
+    <string name="title_advanced_advanced">Avanzato</string>
     <string name="title_advanced_unseen">Tutti i messaggi non letti</string>
     <string name="title_advanced_flagged">Tutti i messaggi preferiti</string>
     <string name="title_advanced_delete_unseen">Elimina i vecchi messaggi non letti</string>
@@ -651,7 +652,6 @@
     <string name="title_ask_reporting">Inviare rapporti di errore?</string>
     <string name="title_reporting_why">Il report di errore aiuterà a migliorare FairEmail</string>
     <string name="title_message_bar_hint">Tocca l\'icona a forma di croce per archiviare, eliminare o segnalare un messaggio come spam e per rimuovere questo avviso</string>
-    <string name="title_answer_hint">Rispondi a tutti, inoltra, ecc. sono stati stati spostati nel pulsante di risposta in basso</string>
     <string name="title_ask_review">Si prega di valutare FairEmail</string>
     <string name="title_ask_review_rationale">        Stai usando FairEmail da un po\'.
         Ti saremmo grati se potessi valutare FairEmail nel Play Store.
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 057ae3ddb6..a08bb3575c 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -637,7 +637,6 @@
     <string name="title_ask_reporting">エラーレポートを送信しますか？</string>
     <string name="title_reporting_why">エラー報告はFairEmailの改善に役立ちます</string>
     <string name="title_message_bar_hint">十字アイコンをタップしメッセージをスパムとしてアーカイブ、削除、又は報告し、この通知を削除します</string>
-    <string name="title_answer_hint">全員への返信、転送などが下部の返信ボタンに移動しました</string>
     <string name="title_ask_review">FairEmailを確認して下さい</string>
     <string name="title_ask_review_rationale">FairEmailをしばらく使用しています。
 PlayストアでFairEmailを評価できれば幸いです。
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 26dfd65878..b154576f15 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -211,6 +211,7 @@
     <string name="title_advanced_when">Wanneer</string>
     <string name="title_advanced_always">Synchroniseer deze accounts altijd</string>
     <string name="title_advanced_schedule">Schema</string>
+    <string name="title_advanced_advanced">Geavanceerd</string>
     <string name="title_advanced_unseen">Alle ongelezen berichten</string>
     <string name="title_advanced_flagged">Alle berichten met een ster</string>
     <string name="title_advanced_delete_unseen">Verwijder oude, ongelezen berichten</string>
@@ -652,7 +653,6 @@
     <string name="title_ask_reporting">Foutrapporten verzenden?</string>
     <string name="title_reporting_why">Foutrapportage helpt om FairEmail te verbeteren</string>
     <string name="title_message_bar_hint">Klik op het kruisicoon om een bericht te archiveren, te verwijderen of te rapporteren als spam en om deze melding te verwijderen</string>
-    <string name="title_answer_hint">Allen beantwoorden, doorsturen, etc. zijn verplaatst naar de antwoordknop onderaan</string>
     <string name="title_ask_review">Beoordeel a.u.b. FairEmail</string>
     <string name="title_ask_review_rationale">        U heeft FairEmail al een tijdje gebruikt.
         Het wordt gewaardeerd als u FairEmail in de Play Store zou beoordelen.
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 5c555c8065..e74c9f1fcb 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -204,12 +204,14 @@
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Oppførsel</string>
     <string name="title_advanced_section_privacy">Personvern</string>
+    <string name="title_advanced_section_encryption">Kryptering</string>
     <string name="title_advanced_section_notifications">Varslinger</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Motta meldinger</string>
     <string name="title_advanced_when">Når</string>
     <string name="title_advanced_always">Synkroniser alltid disse kontoene</string>
     <string name="title_advanced_schedule">Tidsplan</string>
+    <string name="title_advanced_advanced">Avansert</string>
     <string name="title_advanced_unseen">Alle uleste meldinger</string>
     <string name="title_advanced_flagged">Alle stjernemerkede meldinger</string>
     <string name="title_advanced_delete_unseen">Slett gamle uleste meldinger</string>
@@ -242,6 +244,9 @@
     <string name="title_advanced_ssl_harden">Styrke SSL-tilkoblinger</string>
     <string name="title_advanced_socks">Bruk SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Administrer tilkobling</string>
+    <string name="title_advanced_caption_general">Generelt</string>
+    <string name="title_advanced_caption_conversation">Samtale</string>
+    <string name="title_advanced_caption_message">Melding</string>
     <string name="title_advanced_landscape">Bruk to kolonner i liggende modus</string>
     <string name="title_advanced_landscape3">Tillat fast navigasjonsmeny i liggende modus</string>
     <string name="title_advanced_startup">Vis på startskjermen</string>
@@ -287,6 +292,7 @@
     <string name="title_advanced_navbar_colorize">Fargelegg Android-navigasjonslinjen</string>
     <string name="title_advanced_double_back">Dobbel \'tilbake\' for å avslutte</string>
     <string name="title_advanced_pull_refresh">Dra ned for å oppdatere</string>
+    <string name="title_advanced_hide_actionbar">Skjul handlingslinjen når du blar ned</string>
     <string name="title_advanced_autoscroll">Rull til toppen når du mottar nye meldinger</string>
     <string name="title_advanced_double_tap">Dobbeltklikk for å markere meldingen lest/ulest</string>
     <string name="title_advanced_swipenav">Sveip til venstre/høyre for å gå til neste/forrige samtale</string>
@@ -647,7 +653,6 @@
     <string name="title_ask_reporting">Send feilrapporter?</string>
     <string name="title_reporting_why">Feilrapportering vil bidra til å forbedre FairEmail</string>
     <string name="title_message_bar_hint">Trykk på kryssikonet for å arkivere, slette eller rapportere en melding som spam og for å fjerne dette varselet</string>
-    <string name="title_answer_hint">Svar til alle, videresending osv. Er flyttet til svar-knappen nederst</string>
     <string name="title_ask_review">Vennligst anmeld FairEmail</string>
     <string name="title_ask_review_rationale">Du har brukt FairEmail en stund.
 Det vil bli satt pris på om du kunne rangere FairEmail i Play Store.
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 5c555c8065..e74c9f1fcb 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -204,12 +204,14 @@
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Oppførsel</string>
     <string name="title_advanced_section_privacy">Personvern</string>
+    <string name="title_advanced_section_encryption">Kryptering</string>
     <string name="title_advanced_section_notifications">Varslinger</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Motta meldinger</string>
     <string name="title_advanced_when">Når</string>
     <string name="title_advanced_always">Synkroniser alltid disse kontoene</string>
     <string name="title_advanced_schedule">Tidsplan</string>
+    <string name="title_advanced_advanced">Avansert</string>
     <string name="title_advanced_unseen">Alle uleste meldinger</string>
     <string name="title_advanced_flagged">Alle stjernemerkede meldinger</string>
     <string name="title_advanced_delete_unseen">Slett gamle uleste meldinger</string>
@@ -242,6 +244,9 @@
     <string name="title_advanced_ssl_harden">Styrke SSL-tilkoblinger</string>
     <string name="title_advanced_socks">Bruk SOCKS-proxy</string>
     <string name="title_advanced_manage_connectivity">Administrer tilkobling</string>
+    <string name="title_advanced_caption_general">Generelt</string>
+    <string name="title_advanced_caption_conversation">Samtale</string>
+    <string name="title_advanced_caption_message">Melding</string>
     <string name="title_advanced_landscape">Bruk to kolonner i liggende modus</string>
     <string name="title_advanced_landscape3">Tillat fast navigasjonsmeny i liggende modus</string>
     <string name="title_advanced_startup">Vis på startskjermen</string>
@@ -287,6 +292,7 @@
     <string name="title_advanced_navbar_colorize">Fargelegg Android-navigasjonslinjen</string>
     <string name="title_advanced_double_back">Dobbel \'tilbake\' for å avslutte</string>
     <string name="title_advanced_pull_refresh">Dra ned for å oppdatere</string>
+    <string name="title_advanced_hide_actionbar">Skjul handlingslinjen når du blar ned</string>
     <string name="title_advanced_autoscroll">Rull til toppen når du mottar nye meldinger</string>
     <string name="title_advanced_double_tap">Dobbeltklikk for å markere meldingen lest/ulest</string>
     <string name="title_advanced_swipenav">Sveip til venstre/høyre for å gå til neste/forrige samtale</string>
@@ -647,7 +653,6 @@
     <string name="title_ask_reporting">Send feilrapporter?</string>
     <string name="title_reporting_why">Feilrapportering vil bidra til å forbedre FairEmail</string>
     <string name="title_message_bar_hint">Trykk på kryssikonet for å arkivere, slette eller rapportere en melding som spam og for å fjerne dette varselet</string>
-    <string name="title_answer_hint">Svar til alle, videresending osv. Er flyttet til svar-knappen nederst</string>
     <string name="title_ask_review">Vennligst anmeld FairEmail</string>
     <string name="title_ask_review_rationale">Du har brukt FairEmail en stund.
 Det vil bli satt pris på om du kunne rangere FairEmail i Play Store.
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 3ca222a6b7..9562b97f03 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -657,7 +657,6 @@
     <string name="title_ask_reporting">Trimite rapoarte de eroare?</string>
     <string name="title_reporting_why">Raportarea erorilor va ajuta la îmbunătățirea FairEmail</string>
     <string name="title_message_bar_hint">Atingeți iconița plus pentru a arhiva, șterge sau raporta un mesaj ca spam și a elimina această notificare</string>
-    <string name="title_answer_hint">Răspundeți tuturor, redirecționare, etc. au fost mutate în butonul de răspuns de jos</string>
     <string name="title_ask_review">Vă rugăm să evaluați FairEmail</string>
     <string name="title_ask_review_rationale">        Utilizați FairEmail de ceva vreme.
         Vom aprecia dacă ați putea evalua FairEmail în Play Store.
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 87d8cd5999..9e63d36f4d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -233,6 +233,7 @@
     <string name="title_advanced_when">Когда</string>
     <string name="title_advanced_always">Всегда синхронизировать эти учётные записи</string>
     <string name="title_advanced_schedule">Расписание</string>
+    <string name="title_advanced_advanced">Дополнительно</string>
     <string name="title_advanced_unseen">Все непрочитанные сообщения</string>
     <string name="title_advanced_flagged">Все избранные сообщения</string>
     <string name="title_advanced_delete_unseen">Удалять старые непрочитанные сообщения</string>
@@ -674,7 +675,6 @@
     <string name="title_ask_reporting">Отправлять отчёты об ошибках?</string>
     <string name="title_reporting_why">Отчёты об ошибках помогут улучшить FairEmail</string>
     <string name="title_message_bar_hint">Нажмите на значок ×, чтобы архивировать, удалить или пометить сообщение как спам, а также скрыть эту надпись</string>
-    <string name="title_answer_hint">Ответить всем, пересылка и т. д. были перемещены на кнопку «Ответить» внизу</string>
     <string name="title_ask_review">Пожалуйста, оцените FairEmail</string>
     <string name="title_ask_review_rationale">        Вы давно используете FairEmail.
         Будем признательны, если вы сможете оценить FairEmail в Play Store.
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8aa70964b2..eb4cc5e949 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -198,6 +198,7 @@
     <string name="title_advanced_when">何时</string>
     <string name="title_advanced_always">总是同步这些账户</string>
     <string name="title_advanced_schedule">计划任务</string>
+    <string name="title_advanced_advanced">高级</string>
     <string name="title_advanced_unseen">所有未读消息</string>
     <string name="title_advanced_flagged">所有已标星消息</string>
     <string name="title_advanced_delete_unseen">删除旧的未读消息</string>
@@ -639,7 +640,6 @@
     <string name="title_ask_reporting">发送错误报告?</string>
     <string name="title_reporting_why">错误报告将有助于改进FairEmail</string>
     <string name="title_message_bar_hint">点击十字图标可将邮件存档，删除或报告为垃圾邮件，并删除此通知</string>
-    <string name="title_answer_hint">回复所有人，转发等已移至底部的回复按钮</string>
     <string name="title_ask_review">请给FairEmail评分</string>
     <string name="title_ask_review_rationale">        您已经使用FairEmail一段时间了。
         如果您能在谷歌商店为FairEmail评分，我将感激不尽。