diff --git a/app/src/main/assets/SETUP-pt-rPT.md b/app/src/main/assets/SETUP-pt-rPT.md
index ff2b13fc33..333ea44308 100644
--- a/app/src/main/assets/SETUP-pt-rPT.md
+++ b/app/src/main/assets/SETUP-pt-rPT.md
@@ -8,7 +8,7 @@ Uma ligação à internet é obrigatória para configurar contas e identidades.
 
 ## Configurador rápido
 
-Se mostrado, selecionar o seu provedor, senão escolher *Outro provedor*, então inserir o seu nome, endereço eletrónico e palavra-passe e tocar em *Verificar*.
+Apenas escolha o fornecedor apropriado ou a opção *Outro fornecedor* e insira o seu nome, endereço de correio electrónico e a palavra-passe. Por fim, toque em *Verificar*.
 
 Isto funcionará para a maioria dos provedores de e-mail.
 
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 965b271359..78f6780d1c 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -1709,12 +1709,6 @@
         <item>Əvvəlki danışığa get</item>
         <item>Sonrakı danışığa get</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Kiçik</item>
-        <item>Orta</item>
-        <item>Böyük</item>
-        <item>Ekstra böyük</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index aaa3e68c69..55b57fac58 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1339,12 +1339,6 @@
         <item>Към предишния разговор</item>
         <item>Към следващия разговор</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Малък</item>
-        <item>Среден</item>
-        <item>Голяма</item>
-        <item>Много голям</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 40bade0da7..9eaa609894 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -252,6 +252,8 @@
     <string name="title_setup_theme_red_green">Crvena/zelena</string>
     <string name="title_setup_theme_grey">Siva</string>
     <string name="title_setup_theme_black">Crna</string>
+    <string name="title_setup_theme_white">Bijela</string>
+    <string name="title_setup_theme_black_or_white">Crna ili bijela</string>
     <string name="title_setup_theme_black_and_white">Crnobijela</string>
     <string name="title_setup_theme_reverse">Zamijeni boje</string>
     <string name="title_setup_theme_light">Svijetla</string>
@@ -322,6 +324,7 @@
     <string name="title_advanced_suggest_received">Predloži adrese pronađene u primljenim porukama</string>
     <string name="title_advanced_suggest_frequently">Sortiraj predložene adrese prema učestalosti korištenja</string>
     <string name="title_advanced_alt_re_fwd">Alternativni prefiks za odgovor/prosljeđenje</string>
+    <string name="title_advanced_send_chips">Prikaži balone s adresom</string>
     <string name="title_advanced_send_reminders">Prikaži podsjetnike</string>
     <string name="title_advanced_send_delayed">Odgodi slanje poruka</string>
     <string name="title_advanced_attach_new">Dodaj dijeljene datoteke u novi nacrt</string>
@@ -490,6 +493,7 @@
     <string name="title_advanced_undo">Vrijeme isteka za vraćanje</string>
     <string name="title_advanced_quick_filter">Prikaži nenametljive ikonice za brzo filtriranje</string>
     <string name="title_advanced_quick_scroll">Prikaži nenametljive ikonice za brzo pomicanje gore/dolje</string>
+    <string name="title_advanced_folder_nav">Uvijek se vraćaj sa spiska poruka na spisak foldera </string>
     <string name="title_advanced_autoread">Automatski označi poruke kao pročitane pri premještanju istih</string>
     <string name="title_advanced_star_snoozed">Automatski dodaj zvjezdicu za odložene poruke</string>
     <string name="title_advanced_autounstar">Automatski ukloni zvjezdicu s poruka pri premještanju istih</string>
@@ -1720,12 +1724,6 @@
         <item>Idi na prethodnu konverzaciju</item>
         <item>Idi na sljedeću konverzaciju</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Mali</item>
-        <item>Srednji</item>
-        <item>Veliki</item>
-        <item>Vrlo veliko</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 90c58206f3..6c72dc69da 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1193,12 +1193,6 @@ Ambdues opcions es poden desactivar si es desitja.</string>
         <item>Conversa anterior</item>
         <item>Següent conversa</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Petit</item>
-        <item>Mitjà</item>
-        <item>Gran</item>
-        <item>Extra gran</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 2d0c7fa1b3..35732248e6 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -262,6 +262,7 @@
     <string name="title_setup_theme_red_green">Červený/zelený</string>
     <string name="title_setup_theme_grey">Šedý</string>
     <string name="title_setup_theme_black">Černý</string>
+    <string name="title_setup_theme_white">Bílá</string>
     <string name="title_setup_theme_black_or_white">Černá nebo bílá</string>
     <string name="title_setup_theme_black_and_white">Černobílý</string>
     <string name="title_setup_theme_reverse">Prohodit barvy</string>
@@ -332,10 +333,11 @@
     <string name="title_advanced_suggest_received">Navrhovat adresy nalezené v přijatých zprávách</string>
     <string name="title_advanced_suggest_frequently">Řadit navrhované adresy dle četnosti použití</string>
     <string name="title_advanced_alt_re_fwd">Alternativní adresa pro odpovědi/přeposílání</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Zobrazit bubliny s kontakty</string>
+    <string name="title_advanced_send_chips">Zobrazit bubliny s kontakty</string>
     <string name="title_advanced_send_reminders">Zobrazit připomínky</string>
     <string name="title_advanced_send_delayed">Pozdržet odesílání zpráv</string>
     <string name="title_advanced_attach_new">Přidat sdílené soubory do nového konceptu</string>
+    <string name="title_advanced_answer_action">Dlouhým stisknutím tlačítka odpovědi:</string>
     <string name="title_advanced_send_pending">Zobrazit neobtěžující ikonu zpožděného odeslání</string>
     <string name="title_advanced_compose_font">Výchozí písmo</string>
     <string name="title_advanced_prefix_once">Při odpovídání nebo přeposílání přidat do předmětu pouze jednu předponu</string>
@@ -416,6 +418,7 @@
     <string name="title_advanced_bimi_unverified">Neověřený odesílatel</string>
     <string name="title_advanced_bimi_verified">Ověřený odesílatel</string>
     <string name="title_advanced_favicons">Zobrazit ikony stránek</string>
+    <string name="title_advanced_favicons_partial">Skenovat pouze prvních %1$s webové stránky</string>
     <string name="title_advanced_generated_icons">Zobrazit generované ikony</string>
     <string name="title_advanced_identicons">Zobrazit identikony</string>
     <string name="title_advanced_circular">Zobrazit kulaté ikony</string>
@@ -1727,12 +1730,6 @@
         <item>Přejít na předchozí konverzaci</item>
         <item>Přejít na další konverzaci</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Malé</item>
-        <item>Střední</item>
-        <item>Velké</item>
-        <item>Velmi velké</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index a5000d5c4b..6185e03061 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -314,7 +314,7 @@
     <string name="title_advanced_suggest_received">Foreslå adresser fra modtagne beskeder</string>
     <string name="title_advanced_suggest_frequently">Sortér foreslåede adresser efter brugsfrekvens</string>
     <string name="title_advanced_alt_re_fwd">Alternativt besvarelses-/videresendelsespræfiks</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Vis adressebobler</string>
+    <string name="title_advanced_send_chips">Vis adressebobler</string>
     <string name="title_advanced_send_reminders">Vis påmindelser</string>
     <string name="title_advanced_send_delayed">Udsæt afsendelsen af beskeder</string>
     <string name="title_advanced_attach_new">Føj delte filer til et nyt udkast</string>
@@ -1713,12 +1713,6 @@
         <item>Gå til foregående samtale</item>
         <item>Gå til næste samtale</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Lille</item>
-        <item>Mellem</item>
-        <item>Stor</item>
-        <item>Ekstra stor</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index a946330490..356aeec2f7 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -312,7 +312,7 @@
     <string name="title_advanced_suggest_received">Adressen aus empfangenen Nachrichten vorschlagen</string>
     <string name="title_advanced_suggest_frequently">Vorgeschlagene Adressen nach Nutzungshäufigkeit sortieren</string>
     <string name="title_advanced_alt_re_fwd">Alternative Präfixe für „Antworten” bzw. „Weiterleiten”</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Adress-Blasen anzeigen</string>
+    <string name="title_advanced_send_chips">Adress-Blasen anzeigen</string>
     <string name="title_advanced_send_reminders">Erinnerungen anzeigen</string>
     <string name="title_advanced_send_delayed">Senden von Nachrichten verzögern</string>
     <string name="title_advanced_attach_new">Freigegebene Dateien zu einem neuen Entwurf hinzufügen</string>
@@ -1707,12 +1707,6 @@ Zur Erinnerung daran zeigt FairEmail einen kleinen Hinweis an, dieser verschwind
         <item>Zur vorherigen Unterhaltung wechseln</item>
         <item>Zur nächsten Unterhaltung wechseln</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Klein</item>
-        <item>Mittel</item>
-        <item>Groß</item>
-        <item>Sehr groß</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 50256388cb..b996c25d4f 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -313,7 +313,7 @@
     <string name="title_advanced_suggest_received">Προτείνονται διευθύνσεις που βρέθηκαν σε μηνύματα που έχουν ληφθεί</string>
     <string name="title_advanced_suggest_frequently">Ταξινόμηση των προτεινόμενων διευθύνσεων με βάση τη συχνότητα που χρησιμοποιούνται</string>
     <string name="title_advanced_alt_re_fwd">Εναλλακτικό πρόθεμα απάντησης/προώθησης</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Προβολή διευθύνσεων μέσα σε φυσαλίδες</string>
+    <string name="title_advanced_send_chips">Προβολή διευθύνσεων μέσα σε φυσαλίδες</string>
     <string name="title_advanced_send_reminders">Εμφάνιση υπενθυμίσεων</string>
     <string name="title_advanced_send_delayed">Καθυστέρηση στην αποστολή μηνυμάτων</string>
     <string name="title_advanced_attach_new">Προσθήκη κοινόχρηστων αρχείων σε ένα νέο προσχέδιο</string>
@@ -1706,12 +1706,6 @@
         <item>Μετάβαση στην προηγούμενη συζήτηση</item>
         <item>Μετάβαση στην επόμενη συζήτηση</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Μικρό</item>
-        <item>Μεσαίο</item>
-        <item>Μεγάλο</item>
-        <item>Πολύ μεγάλο</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ea6967ffd1..cf40b99af9 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -242,6 +242,8 @@
     <string name="title_setup_theme_red_green">Rojo/verde</string>
     <string name="title_setup_theme_grey">Gris</string>
     <string name="title_setup_theme_black">Negro</string>
+    <string name="title_setup_theme_white">Blanco</string>
+    <string name="title_setup_theme_black_or_white">Negro o blanco</string>
     <string name="title_setup_theme_black_and_white">Blanco y Negro</string>
     <string name="title_setup_theme_reverse">Invertir colores</string>
     <string name="title_setup_theme_light">Claro</string>
@@ -311,6 +313,7 @@
     <string name="title_advanced_suggest_received">Sugerir direcciones encontradas en mensajes recibidos</string>
     <string name="title_advanced_suggest_frequently">Ordenar direcciones sugeridas por frecuencia de uso</string>
     <string name="title_advanced_alt_re_fwd">Prefijo alternativo de respuesta/reenvío</string>
+    <string name="title_advanced_send_chips">Mostrar burbujas de dirección</string>
     <string name="title_advanced_send_reminders">Mostrar recordatorios</string>
     <string name="title_advanced_send_delayed">Diferir envío de mensajes</string>
     <string name="title_advanced_attach_new">Añadir archivos compartidos a un nuevo borrador</string>
@@ -479,6 +482,7 @@
     <string name="title_advanced_undo">Tiempo de espera para deshacer</string>
     <string name="title_advanced_quick_filter">Mostrar iconos de filtro rápido no intrusivos</string>
     <string name="title_advanced_quick_scroll">Mostrar iconos rápidos de arriba/abajo no intrusivos</string>
+    <string name="title_advanced_folder_nav">Siempre volver a la lista de carpetas de una lista de mensajes</string>
     <string name="title_advanced_autoread">Marcar mensaje como leído automáticamente al moverlo</string>
     <string name="title_advanced_star_snoozed">Destacar automáticamente al posponer mensajes</string>
     <string name="title_advanced_autounstar">Eliminar automáticamente la estrella de los mensajes al ser movidos</string>
@@ -1703,12 +1707,6 @@
         <item>Ir a la conversación anterior</item>
         <item>Ir a la siguiente conversación</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Pequeño</item>
-        <item>Mediano</item>
-        <item>Grande</item>
-        <item>Extra grande</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 62b1467e4e..0bce7ea6f8 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1237,12 +1237,6 @@
         <item>Joan aurreko elkarrizketara</item>
         <item>Joan hurrengo elkarrizketara</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Txikia</item>
-        <item>Ertaina</item>
-        <item>Handia</item>
-        <item>Oso handia</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 82367f88b9..4f2b770003 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -1131,12 +1131,6 @@
         <item>رفتن به گفتگو قبلی</item>
         <item>رفتن به گفتگو بعدی</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>کوچک</item>
-        <item>متوسط</item>
-        <item>بزرگ</item>
-        <item>خیلی بزرگ</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 63f4cfb750..16f77a5708 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1701,12 +1701,6 @@
         <item>Siirry edelliseen keskusteluun</item>
         <item>Siirry seuraavaan keskusteluun</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Pieni</item>
-        <item>Keskikokoinen</item>
-        <item>Suuri</item>
-        <item>Erittäin suuri</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 6fd7dea235..cae694a486 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -314,7 +314,7 @@
     <string name="title_advanced_suggest_received">Suggérer les adresses trouvées dans les messages reçus</string>
     <string name="title_advanced_suggest_frequently">Trier les adresses suggérées par fréquence d’utilisation</string>
     <string name="title_advanced_alt_re_fwd">Préfixe alternatif de réponse/transfert</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Afficher les adresses dans une bulle</string>
+    <string name="title_advanced_send_chips">Afficher les bulles d\'adresse</string>
     <string name="title_advanced_send_reminders">Afficher les rappels</string>
     <string name="title_advanced_send_delayed">Retarder l’envoi des messages</string>
     <string name="title_advanced_attach_new">Ajouter des fichiers partagés à un nouveau brouillon</string>
@@ -1714,12 +1714,6 @@
         <item>Aller à la conversation précédente</item>
         <item>Aller à la conversation suivante</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Petit</item>
-        <item>Moyen</item>
-        <item>Grand</item>
-        <item>Très grand</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 37eab74529..db1b773320 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -314,7 +314,7 @@
     <string name="title_advanced_suggest_received">Suggérer les adresses trouvées dans les messages reçus</string>
     <string name="title_advanced_suggest_frequently">Trier les adresses suggérées par fréquence d’utilisation</string>
     <string name="title_advanced_alt_re_fwd">Préfixe alternatif de réponse/transfert</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Activer les bulles d\'adresse</string>
+    <string name="title_advanced_send_chips">Afficher les bulles d\'adresse</string>
     <string name="title_advanced_send_reminders">Afficher les rappels</string>
     <string name="title_advanced_send_delayed">Retarder l\'envoi des messages</string>
     <string name="title_advanced_attach_new">Ajouter des fichiers partagés à un nouveau brouillon</string>
@@ -1714,12 +1714,6 @@
         <item>Aller à la conversation précédente</item>
         <item>Aller à la conversation suivante</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Petit</item>
-        <item>Moyen</item>
-        <item>Grand</item>
-        <item>Très grand</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 854c63b916..0bc3a86aba 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -1455,12 +1455,6 @@
         <item>Gean nei foarige konversaasje</item>
         <item>Gean nei folgjende petear</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Lyts</item>
-        <item>Medium</item>
-        <item>Grutte</item>
-        <item>Ekstra grut</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index ae5df54033..a3d80152fb 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1656,12 +1656,6 @@
         <item>Ir á conversa anterior</item>
         <item>Ir á conversa seguinte</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Pequeno</item>
-        <item>Mediano</item>
-        <item>Grande</item>
-        <item>Extragrande</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 0eecf71474..a25e844363 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1064,12 +1064,6 @@
         <item>Pređi na prethodni razgovor</item>
         <item>Pređi na sljedeći razgovor</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Maleno</item>
-        <item>Srednje</item>
-        <item>Veliko</item>
-        <item>Extra veliko</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index e9cc281460..60dae716a0 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1682,12 +1682,6 @@
         <item>Ugrás az előző beszélgetéshez</item>
         <item>Ugrás a következő beszélgetéshez</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Kicsi</item>
-        <item>Közepes</item>
-        <item>Nagy</item>
-        <item>Óriási</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 4f2d80e5ce..6afa98b7e9 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1633,12 +1633,6 @@ Memformat ulang pesan perlu waktu, tergantung dari ukuran pesan dan keceoatan pe
         <item>Percakapan sebelumnya</item>
         <item>Percakapan selanjutnya</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Kecil</item>
-        <item>Sedang</item>
-        <item>Besar</item>
-        <item>Ekstra besar</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 48409bf8c8..b226586a27 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -314,7 +314,7 @@
     <string name="title_advanced_suggest_received">Suggerisci indirizzi trovati nei messaggi ricevuti</string>
     <string name="title_advanced_suggest_frequently">Ordina gli indirizzi suggeriti per frequenza d\'uso</string>
     <string name="title_advanced_alt_re_fwd">Prefisso alternativo di risposta/inoltro</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Mostra le bolle degli indirizzi</string>
+    <string name="title_advanced_send_chips">Mostra le bolle degli indirizzi</string>
     <string name="title_advanced_send_reminders">Mostra promemoria</string>
     <string name="title_advanced_send_delayed">Ritarda invio dei messaggi</string>
     <string name="title_advanced_attach_new">Aggiungi i file condivisi a una nuova bozza</string>
@@ -1714,12 +1714,6 @@
         <item>Vai alla conversazione precedente</item>
         <item>Vai alla conversazione successiva</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Piccolo</item>
-        <item>Medio</item>
-        <item>Grande</item>
-        <item>Extra large</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 956ca5b200..313648138c 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -334,7 +334,7 @@
     <string name="title_advanced_suggest_received">להציע כתובות שנמצאו בהודעות שהתקבלו</string>
     <string name="title_advanced_suggest_frequently">סידור הכתובות המוצעות לפי תדירות השימוש</string>
     <string name="title_advanced_alt_re_fwd">קידומת חלופית לתגובה/העברה</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">הצגת בועיות כתובות</string>
+    <string name="title_advanced_send_chips">הצגת בועיות כתובות</string>
     <string name="title_advanced_send_reminders">הצגת תזכורות</string>
     <string name="title_advanced_send_delayed">השהיית שליחת הודעות</string>
     <string name="title_advanced_attach_new">הוספת קבצים משותפים לטיוטה חדשה</string>
@@ -1735,12 +1735,6 @@
         <item>מעבר לדיון הקודם</item>
         <item>מעבר לדיון הבא</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>קטן</item>
-        <item>בינוני</item>
-        <item>גודל</item>
-        <item>גדול במיוחד</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index cb3362bfef..da2ad13158 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -232,6 +232,8 @@
     <string name="title_setup_theme_red_green">レッド/グリーン</string>
     <string name="title_setup_theme_grey">グレー</string>
     <string name="title_setup_theme_black">ブラック</string>
+    <string name="title_setup_theme_white">ホワイト</string>
+    <string name="title_setup_theme_black_or_white">黒または白</string>
     <string name="title_setup_theme_black_and_white">モノクロ</string>
     <string name="title_setup_theme_reverse">配色を反転</string>
     <string name="title_setup_theme_light">ライト</string>
@@ -302,9 +304,11 @@
     <string name="title_advanced_suggest_received">メッセージを受信したことのあるアドレスを提案</string>
     <string name="title_advanced_suggest_frequently">提案するアドレスを使用頻度で並べ替え</string>
     <string name="title_advanced_alt_re_fwd">返信/転送のプレフィックスを変更</string>
+    <string name="title_advanced_send_chips">アドレスバルーンを表示</string>
     <string name="title_advanced_send_reminders">リマインダーを表示</string>
     <string name="title_advanced_send_delayed">メッセージ送信を遅延させる</string>
     <string name="title_advanced_attach_new">共有されたファイルを返信の下書きに追加</string>
+    <string name="title_advanced_answer_action">返信ボタンを長押ししたときのアクション:</string>
     <string name="title_advanced_send_pending">目立たない送信遅延アイコンを表示</string>
     <string name="title_advanced_compose_font">デフォルトのフォント</string>
     <string name="title_advanced_prefix_once">返信/転送のプレフィックスを 1 つだけにする</string>
@@ -469,6 +473,7 @@
     <string name="title_advanced_undo">「元に戻す」を表示する時間</string>
     <string name="title_advanced_quick_filter">目立たないクイックフィルターアイコンを表示</string>
     <string name="title_advanced_quick_scroll">目立たないクイックスクロールアップ/ダウンアイコンを表示</string>
+    <string name="title_advanced_folder_nav">デフォルトでメッセージリストからフォルダーリストに戻る</string>
     <string name="title_advanced_autoread">移動するメッセージを自動で既読にする</string>
     <string name="title_advanced_star_snoozed">スヌーズしたメッセージに自動でスターを付ける</string>
     <string name="title_advanced_autounstar">移動するメッセージのスターを自動で取り消す</string>
@@ -503,7 +508,7 @@
     <string name="title_advanced_notify_action_hide">非表示</string>
     <string name="title_advanced_notify_action_snooze">スヌーズ</string>
     <string name="title_advanced_notify_remove">通知をタップして新着メッセージ通知を削除</string>
-    <string name="title_advanced_notify_clear">メッセージ一覧を開いたとき、新着メッセージ通知を削除</string>
+    <string name="title_advanced_notify_clear">メッセージリストを開いたとき、新着メッセージ通知を削除</string>
     <string name="title_advanced_notify_subtext">アカウントまたはフォルダー名をサブタイトルに表示</string>
     <string name="title_advanced_wearable_preview">プレビュー付き通知のみウェアラブルに送信</string>
     <string name="title_advanced_notify_messaging">Android の「Messaging Style」の通知フォーマットを使用</string>
@@ -579,7 +584,7 @@
     <string name="title_advanced_protocol">プロトコルログ</string>
     <string name="title_advanced_log_info">デバッグログ</string>
     <string name="title_advanced_debug">デバッグモード</string>
-    <string name="title_advanced_manual_hint">メッセージの受信が無効になっている場合でも、メッセージ一覧をプルダウンして手動でメッセージを受信することができます</string>
+    <string name="title_advanced_manual_hint">メッセージの受信が無効になっている場合でも、メッセージリストをプルダウンして手動でメッセージを受信することができます</string>
     <string name="title_advanced_poll_battery">バッテリー使用量が大幅に増加する可能性があります！</string>
     <string name="title_advanced_poll_hint">新着メッセージを定期的に確認すると、ローカルのメッセージとサーバーのメッセージが毎回比較されます。これは負荷のかかる操作であり、特にメッセージが多い場合は、バッテリー使用量が大幅に増加する可能性があります。常に受信すると変更を継続的に追跡するため、このような問題はありません。</string>
     <string name="title_advanced_optimize_hint">バッテリー使用量を節約するために、メールサーバーの機能と動作に応じて同期頻度を変更することがあります</string>
@@ -836,6 +841,7 @@
     <string name="title_delete_operation_deleted">%1$d 件の操作が削除されました</string>
     <string name="title_delete_contacts">すべてのローカル連絡先を削除しますか？</string>
     <string name="title_no_operations">保留中の操作はありません</string>
+    <string name="title_check_operations">操作の確認</string>
     <string name="title_hint_operations">操作を削除するとメッセージが消失し、同期の問題が発生する可能性があります</string>
     <string name="title_op_title_headers">ヘッダーをダウンロードしています</string>
     <string name="title_op_title_raw">元のメッセージをダウンロードしています</string>
@@ -1025,6 +1031,8 @@
     <string name="title_ask_show_html_images">元のメッセージを表示するときは常に画像を表示</string>
     <string name="title_ask_show_image">画像を表示するとプライバシーデータの漏洩の原因となる可能性があります</string>
     <string name="title_ask_show_image_hint">アナティリスク追跡画像として識別された画像は表示されません</string>
+    <string name="title_ask_show_amp">AMP メッセージを表示しますか？</string>
+    <string name="title_ask_show_amp_hint">AMP メッセージはインターネットを利用して動的に表示するため、必然的にトラッキングされます</string>
     <string name="title_ask_delete_local">ローカルメッセージを削除しますか？ メッセージはリモートサーバーに残ります</string>
     <string name="title_ask_help">FairEmail の改善にご協力ください</string>
     <string name="title_ask_reporting">エラーレポートを送信しますか？</string>
@@ -1167,6 +1175,8 @@
     <string name="title_encrypt">暗号化</string>
     <string name="title_decrypt">復号</string>
     <string name="title_resync">再同期</string>
+    <string name="title_alternative_text">プレーンテキストを表示</string>
+    <string name="title_alternative_html">HTML を表示</string>
     <string name="title_no_openpgp">OpenKeychain が見つかりません</string>
     <string name="title_user_interaction">OpenKeychain へ転送しています</string>
     <string name="title_signed_data">電子署名を確認して本文を表示</string>
@@ -1312,7 +1322,7 @@
     <string name="title_rule_header">ヘッダーに以下の語句を含む</string>
     <string name="title_rule_body">本文に以下の語句を含む</string>
     <string name="title_rule_skip_quotes">引用テキストをスキップ</string>
-    <string name="title_rule_body_remark">この条件を使用すると本文が常にダウンロードされ、メッセージ一覧の同期が遅れることがあります</string>
+    <string name="title_rule_body_remark">この条件を使用すると本文が常にダウンロードされ、メッセージリストの同期が遅れることがあります</string>
     <string name="title_rule_time_abs">以下の期間に受信</string>
     <string name="title_rule_time_after">から</string>
     <string name="title_rule_time_before">まで</string>
@@ -1455,6 +1465,7 @@
     <string name="title_legend_show_unsubscribe">リストから退会</string>
     <string name="title_legend_show_images">画像を表示</string>
     <string name="title_legend_hide_images">画像を非表示</string>
+    <string name="title_legend_show_amp">AMP を表示</string>
     <string name="title_legend_show_full">元のメッセージを表示</string>
     <string name="title_legend_show_reformatted">再フォーマットされたメッセージを表示</string>
     <string name="title_legend_edit">編集</string>
@@ -1691,12 +1702,6 @@
         <item>前の会話に移動</item>
         <item>次の会話に移動</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>小</item>
-        <item>中</item>
-        <item>大</item>
-        <item>特大</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index ad5d8e78c5..e5cfcce895 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -287,6 +287,7 @@
     <string name="title_advanced_volumenav">음량 상하 버튼을 눌러 전후 대화로 이동</string>
     <string name="title_advanced_swipe_close">아래로 밀어 대화 닫기</string>
     <string name="title_advanced_undo">되돌리기 제한 시간</string>
+    <string name="title_advanced_folder_nav">항상 메시지 목록에서 폴더 목록으로 돌아가기</string>
     <string name="title_advanced_notifications">알림 관리</string>
     <string name="title_advanced_notifications_default">기본 채널</string>
     <string name="title_advanced_notifications_service">수신 채널</string>
@@ -906,12 +907,6 @@
         <item>Go to previous conversation</item>
         <item>Go to next conversation</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>작게</item>
-        <item>보통</item>
-        <item>크게</item>
-        <item>매우 크게</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index fa15f99a96..f1bd474db5 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1316,12 +1316,6 @@
         <item>Gå til forrige samtale</item>
         <item>Gå til neste samtale</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Liten</item>
-        <item>Medium</item>
-        <item>Stor</item>
-        <item>Ekstra stor</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index f5000aeeff..fbfd5e3c4c 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -312,7 +312,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_suggest_received">Suggereer adressen gevonden in ontvangen berichten</string>
     <string name="title_advanced_suggest_frequently">Sorteer voorgestelde adressen op gebruiksfrequentie</string>
     <string name="title_advanced_alt_re_fwd">Alternatief antwoord/doorsturen voorvoegsel</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Toon adresballonnen</string>
+    <string name="title_advanced_send_chips">Toon adresballonnen</string>
     <string name="title_advanced_send_reminders">Toon herinneringen</string>
     <string name="title_advanced_send_delayed">Verzenden van berichten uitstellen</string>
     <string name="title_advanced_attach_new">Voeg gedeelde bestanden toe aan een nieuw concept</string>
@@ -1703,6 +1703,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
         <item>Ga naar volgende gesprek</item>
     </string-array>
     <string-array name="resizeNames">
+        <item>Extra klein</item>
         <item>Klein</item>
         <item>Gemiddeld</item>
         <item>Groot</item>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index e7a76a41f4..a9c08e5e4b 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -1316,12 +1316,6 @@
         <item>Gå til forrige samtale</item>
         <item>Gå til neste samtale</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Liten</item>
-        <item>Middels</item>
-        <item>Stor</item>
-        <item>Ekstra stor</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index fa15f99a96..f1bd474db5 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -1316,12 +1316,6 @@
         <item>Gå til forrige samtale</item>
         <item>Gå til neste samtale</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Liten</item>
-        <item>Medium</item>
-        <item>Stor</item>
-        <item>Ekstra stor</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
index 6500d233c7..4362138bbb 100644
--- a/app/src/main/res/values-or-rIN/strings.xml
+++ b/app/src/main/res/values-or-rIN/strings.xml
@@ -602,12 +602,6 @@
         <item>ପୂର୍ବବର୍ତ୍ତୀ ବାର୍ତ୍ତାଳାପକୁ ଯାଅ</item>
         <item>ପରବର୍ତ୍ତୀ ବାର୍ତ୍ତାଳାପକୁ ଯାଅ</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>ଛୋଟ</item>
-        <item>ମଧ୍ୟମ</item>
-        <item>ବଡ଼</item>
-        <item>ଅତିରିକ୍ତ ବଡ଼</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 1e3378331b..9e48976aaa 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1728,12 +1728,6 @@
         <item>Idź do poprzedniej wiadomości</item>
         <item>Idź do następnej wiadomości</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Małe</item>
-        <item>Średnie</item>
-        <item>Duże</item>
-        <item>Bardzo duży</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7adefa1103..166da0fb33 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1590,12 +1590,6 @@
         <item>Ir para conversa anterior</item>
         <item>Ir para a próxima conversa</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Pequeno</item>
-        <item>Médio</item>
-        <item>Grande</item>
-        <item>Muito grande</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 40825a55a3..f3ba556415 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -2,14 +2,14 @@
 <resources>
     <string name="app_search">Pesquisa do FairEmail</string>
     <string name="app_changelog">Registo de alterações</string>
-    <string name="app_welcome">O FairEmail é uma aplicação de email de código aberto focada na privacidade e na segurança. Por esta razão, algumas funções podem funcionar de forma diferente do que estás acostumado.</string>
-    <string name="app_limitations">Por exemplo, as mensagens são reformatadas por defeito para remover elementos inseguros e melhorar a legibilidade, e a abertura de links precisa de ser confirmada para segurança. Ambos podem ser desativados caso pretendam.</string>
+    <string name="app_welcome">O FairEmail é uma aplicação de correio electrónico de código aberto focada na privacidade e na segurança. Por esta razão, algumas funções podem funcionar de forma diferente do que está acostumado.</string>
+    <string name="app_limitations">Por exemplo, na configuração padrão as mensagens são reformatadas para remover elementos inseguros e melhorar a legibilidade, como a abertura de hiperligações precisa de ser confirmada por motivos de segurança. Ambas as opções podem ser desactivadas caso pretenda.</string>
     <string name="app_unsupported">Bugs na versão Android deste dispositivo em específico causam encerramentos inesperados</string>
     <string name="app_continue">Continuar mesmo assim</string>
-    <string name="app_exit">Vá \'voltar\' novamente para sair</string>
+    <string name="app_exit">Pressione novamente \'voltar\' para sair</string>
     <string name="app_cake">Espaço insuficiente</string>
     <string name="app_updated">Última atualização: %1$s</string>
-    <string name="app_download">Descarregado de: %1$s</string>
+    <string name="app_download">Descarregada via: %1$s</string>
     <string name="channel_service">Receber</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">E-mail</string>
@@ -152,7 +152,7 @@
     <string name="title_setup_gmail_rationale">Por favor, conceda permissões para selecionar uma conta e ler o seu nome</string>
     <string name="title_setup_gmail_permissions">O Google pedirá permissões para ler, compor, enviar e eliminar permanentemente todos os seus e-mails. O FairEmail nunca apagará as suas mensagens sem o seu consentimento explícito.</string>
     <string name="title_setup_gmail_drafts">Se a pasta de rascunhos não estiver acessível pelo IMAP, isso poderá ser corrigido nas configurações de etiquetas do Gmail</string>
-    <string name="title_setup_gmail_password">Quero autorizar uma conta com uma senha</string>
+    <string name="title_setup_gmail_password">Quero autorizar uma conta com uma palavra-passe</string>
     <string name="title_setup_office_auth">O erro \'AUTHENTICATE falhou\' pode ser causado por IMAP/SMTP estar desativado pelo administrador do sistema</string>
     <string name="title_setup_oauth_rationale">Autorizar o acesso à sua conta %1$s</string>
     <string name="title_setup_oauth_update">Autorizar conta existente novamente</string>
@@ -162,8 +162,8 @@
     <string name="title_setup_instructions">Instruções de configuração</string>
     <string name="title_setup_no_settings">Nenhuma configuração encontrada para o domínio \'%1$s\'</string>
     <string name="title_setup_no_settings_hint">Tente configurar manualmente a conta, utilizando as configurações fornecidas pelo seu provedor de e-mail</string>
-    <string name="title_setup_no_auth_hint">Por favor, verifique o seu endereço de e-mail e senha e certifique-se que o acesso externo (IMAP/SMTP) está ativado para a sua conta</string>
-    <string name="title_setup_app_password_hint">Este provedor requer uma senha de aplicação em vez da senha da conta, por favor verifique as instruções do seu provedor</string>
+    <string name="title_setup_no_auth_hint">Por favor, verifique novamente o seu endereço de correio electrónico e a palavra-passe, e confirme se o acesso externo (IMAP/SMTP) está activado para a sua conta</string>
+    <string name="title_setup_app_password_hint">Este fornecedor requer uma palavra-passe de aplicação em vez da palavra-passe da conta, por favor verifique as instruções do seu fornecedor</string>
     <string name="title_setup_no_inbox">Caixa de entrada não encontrada</string>
     <string name="title_setup_advanced_protection">Quando inscrito no programa avançado de proteção não é possível usar uma aplicação de e-mail de terceiros. Esta é uma restrição imposta pelo Google.</string>
     <string name="title_setup_quick_success">Uma conta foi adicionada com sucesso</string>
@@ -202,7 +202,7 @@
     <string name="title_setup_still">Ainda por fazer</string>
     <string name="title_setup_error">Erro</string>
     <string name="title_setup_configuring">A configurar conta &#8230;</string>
-    <string name="title_setup_app_password">Talvez seja necessário usar uma senha da app</string>
+    <string name="title_setup_app_password">Talvez seja necessário usar uma palavra-passe de aplicação</string>
     <string name="title_setup_extra">Extra</string>
     <string name="title_setup_close">Fechar configurações</string>
     <string name="title_setup_export">Exportar definições</string>
@@ -212,10 +212,10 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_setup_export_do">O ficheiro de exportação conterá todas as configurações e dados, mas nenhuma mensagem ou imagem referenciada nas assinaturas</string>
     <string name="title_setup_import_do">Contas importadas serão adicionadas sem sobrescrever as já existentes</string>
     <string name="title_setup_password">Palavra-passe</string>
-    <string name="title_setup_password_chars">A senha contém caractéres de controle ou espaços em branco</string>
+    <string name="title_setup_password_chars">A palavra-passe contém caracteres de controlo ou espaços em branco</string>
     <string name="title_setup_password_repeat">Repita a palavra-passe</string>
-    <string name="title_setup_password_missing">Palavra-passe ausente</string>
-    <string name="title_setup_password_different">As palavras-passe não correspondem</string>
+    <string name="title_setup_password_missing">Palavra-passe em falta</string>
+    <string name="title_setup_password_different">As palavras-passe não coincidem</string>
     <string name="title_setup_password_invalid">Palavra-passe inválida</string>
     <string name="title_setup_import_accounts">Importar contas e identidades</string>
     <string name="title_setup_import_rules">Importar regras de filtragem</string>
@@ -310,7 +310,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_suggest_frequently">Ordenar endereços sugeridos por frequência de uso</string>
     <string name="title_advanced_send_reminders">Mostrar lembretes</string>
     <string name="title_advanced_send_delayed">Atrasar envio de mensagens</string>
-    <string name="title_advanced_attach_new">Adicionar arquivos partilhados a um novo rascunho</string>
+    <string name="title_advanced_attach_new">Adicionar ficheiros partilhados a um novo rascunho</string>
     <string name="title_advanced_answer_action">Pressionar e segurar o botão de resposta irá:</string>
     <string name="title_advanced_send_pending">Mostrar ícone não-intrusivo de envio atrasado</string>
     <string name="title_advanced_compose_font">Letra predefinida</string>
@@ -336,7 +336,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_metered">Usar conexões limitadas</string>
     <string name="title_advanced_download">Descarregar automaticamente mensagens e anexos numa conexão limitada</string>
     <string name="title_advanced_roaming">Descarregar mensagens e anexos em roaming</string>
-    <string name="title_advanced_rlah">Faça roaming como no país de origem</string>
+    <string name="title_advanced_rlah">Assumir ligação em roaming como no país de origem</string>
     <string name="title_advanced_download_headers">Transferir todos os cabeçalhos das mensagens</string>
     <string name="title_advanced_download_eml">Transferir ficheiros de mensagem em bruto</string>
     <string name="title_advanced_validated">Exigir uma conexão validada (verificada)</string>
@@ -536,6 +536,8 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_cleanup">Limpeza</string>
     <string name="title_advanced_app">Definições da aplicação</string>
     <string name="title_advanced_more">Mais opções</string>
+    <string name="title_advanced_protocol">Registo do protocolo</string>
+    <string name="title_advanced_log_info">Registo de depuração</string>
     <string name="title_advanced_debug">Modo de Depuração</string>
     <string name="title_advanced_manual_hint">Se a recepção de mensagens estiver desactivada, continua a ser possível receber mensagens manualmente, deslizando a lista de mensagens para baixo</string>
     <string name="title_advanced_poll_battery">Isto pode causar elevado uso de bateria!</string>
@@ -546,7 +548,9 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_subject_threading_hint">Apenas mensagens recebidas nas últimas %1$d horas</string>
     <string name="title_advanced_poll_folders_hint">Sincronizar periodicamente a lista de pastas, além de se conectar a uma conta</string>
     <string name="title_advanced_lookup_mx_hint">Faz a verificação se existem registos DNS MX</string>
-    <string name="title_advanced_metered_warning">Desactivar esta opção fará com que não sejam recebidas e enviadas mensagens em ligações de Internet móveis</string>
+    <string name="title_advanced_suggest_names_hint">Caso esteja desactivada, apenas se utilizará os endereços de correio electrónico ao seleccionar contactos</string>
+    <string name="title_advanced_metered_warning">Desactivar esta opção fará com que não sejam recebidas e enviadas mensagens em ligações móveis de Internet</string>
+    <string name="title_advanced_rlah_hint">Presume que não há roaming dentro da UE</string>
     <string name="title_advanced_roaming_hint">Os cabeçalhos de mensagens serão sempre obtidos em roaming. Pode usar a configuração de roaming do dispositivo para desactivar a internet em roaming.</string>
     <string name="title_advanced_layout_hint">Pode mudar para um layout mais compacto e alterar o tamanho do texto da mensagem no menu da barra de acção presente na parte superior da vista de mensagens</string>
     <string name="title_advanced_navbar_colorize_hint">O funcionamento disto depende da versão e variante do Android</string>
@@ -558,6 +562,8 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_notify_action_hint">No máximo três acções serão mostradas</string>
     <string name="title_advanced_fts_hint">Activar esta função melhora o desempenho da pesquisa, porém aumenta o consumo de bateria e a utilização de espaço do armazenamento</string>
     <string name="title_advanced_english_hint">Mudar esta definição reiniciará a aplicação</string>
+    <string name="title_advanced_cleanup_attachments_hint">Quando houver uma limpeza manual, isto fará com que os anexos, das mensagens que já não são sincronizadas, sejam removidos</string>
+    <string name="title_advanced_cleanup_hint">Isto irá eliminar todos os ficheiros temporários</string>
     <string name="title_advanced_never_favorite">Nunca colocar como favorito</string>
     <string name="title_select">Seleccionar &#8230;</string>
     <string name="title_identity_name">Seu Nome</string>
@@ -575,11 +581,13 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_encryption_none">Nenhum</string>
     <string name="title_user">Nome de utilizador</string>
     <string name="title_password">Palavra-passe</string>
+    <string name="title_password_storage">Como são armazenadas as palavras-passe?</string>
+    <string name="title_case_sensitive">Nomes de utilizador e palavras-passe habitualmente diferenciam maiúsculas de minúsculas</string>
     <string name="title_primary">Principal</string>
     <string name="title_check">Verificar</string>
     <string name="title_no_email">Endereço de correio eletrónico ausente</string>
     <string name="title_email_invalid">Endereço de correio eletrónico inválido: \'%1$s\'</string>
-    <string name="title_no_password">Palavra-passe ausente</string>
+    <string name="title_no_password">Palavra-passe em falta</string>
     <string name="title_no_inbox">Caixa de entrada não encontrada</string>
     <string name="title_account_auth_update">Atualizar autorização</string>
     <string name="title_account_auth_password">Mudar para autenticação de palavra-passe</string>
@@ -721,6 +729,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_attachment_audio">Gravar áudio</string>
     <string name="title_show_addresses">Mostrar CC/BCC</string>
     <string name="title_manage_local_contacts">Gerir contactos locais</string>
+    <string name="title_translate_key">Introduzir chave de acesso</string>
     <string name="title_translate_formal">Utilizar o formulário formal</string>
     <string name="title_noreply_reminder">A enviar para um endereço \'no-reply\'</string>
     <string name="title_sign">Assinar</string>
@@ -1131,12 +1140,6 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
         <item>Ir para a conversa anterior</item>
         <item>Ir para a próxima conversa</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Pequeno</item>
-        <item>Médio</item>
-        <item>Grande</item>
-        <item>Muito grande</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 4f83cc845a..36aefa9bd0 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -323,6 +323,7 @@
     <string name="title_advanced_suggest_received">Sugerează adrese găsite în mesajele primite</string>
     <string name="title_advanced_suggest_frequently">Sortați adresele sugerate în funcție de frecvența de utilizare</string>
     <string name="title_advanced_alt_re_fwd">Prefix alternativ de răspuns/întârziere</string>
+    <string name="title_advanced_send_chips">Afișați bule de adrese</string>
     <string name="title_advanced_send_reminders">Arată mementouri</string>
     <string name="title_advanced_send_delayed">Amână trimiterea mesajelor</string>
     <string name="title_advanced_attach_new">Adăugați fișierele partajate la o nouă ciornă</string>
@@ -1718,12 +1719,6 @@
         <item>Mergi la conversația anterioară</item>
         <item>Mergi la conversația următoare</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Mic</item>
-        <item>Mediu</item>
-        <item>Mare</item>
-        <item>Foarte mare</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 32a6c5bbbf..618c15fd3b 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -333,6 +333,7 @@
     <string name="title_advanced_suggest_received">Предлагать адреса, найденные в полученных сообщениях</string>
     <string name="title_advanced_suggest_frequently">Сортировать предложенные адреса по частоте использования</string>
     <string name="title_advanced_alt_re_fwd">Альтернативный префикс ответа/пересылки</string>
+    <string name="title_advanced_send_chips">Показывать пузыри адреса</string>
     <string name="title_advanced_send_reminders">Показывать напоминания</string>
     <string name="title_advanced_send_delayed">Задержка отправки сообщений</string>
     <string name="title_advanced_attach_new">Создавать новый черновик для файлов, которыми поделились</string>
@@ -1733,12 +1734,6 @@
         <item>Перейти к предыдущему диалогу</item>
         <item>Перейти к следующему диалогу</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Маленький</item>
-        <item>Средний</item>
-        <item>Большой</item>
-        <item>Очень большой</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index e942699c33..8d20038224 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1725,12 +1725,6 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
         <item>Prejsť na predchádzajúcu konverzáciu</item>
         <item>Prejsť na nasledujúcu konverzáciu</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Malá</item>
-        <item>Stredná</item>
-        <item>Veľká</item>
-        <item>Veľmi veľká</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index 1ed8b98564..7fc04040ff 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -1128,12 +1128,6 @@
         <item>Pojdi na prejšnji pogovor</item>
         <item>Pojdi na naslednji pogovor</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Majhna</item>
-        <item>Srednja</item>
-        <item>Velika</item>
-        <item>Zelo velika</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index adc0967f14..1a1a1068aa 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -975,12 +975,6 @@
         <item>Иди на претходни разговор</item>
         <item>Иди на следећи разговор</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Мала</item>
-        <item>Средња</item>
-        <item>Велика</item>
-        <item>Веома велика</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 72e26cbef3..accf485efc 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -310,7 +310,7 @@
     <string name="title_advanced_suggest_received">Föreslå adresser som finns i mottagna meddelanden</string>
     <string name="title_advanced_suggest_frequently">Sortera föreslagna adresser vid användningsfrekvens</string>
     <string name="title_advanced_alt_re_fwd">Alternativt svar-/vidarebefordringsprefix</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Visa adressbubblor</string>
+    <string name="title_advanced_send_chips">Visa adressbubblor</string>
     <string name="title_advanced_send_reminders">Visa påminnelser</string>
     <string name="title_advanced_send_delayed">Fördröj sändning av meddelanden</string>
     <string name="title_advanced_attach_new">Lägg till delade filer till ett nytt utkast</string>
@@ -1705,12 +1705,6 @@
         <item>Gå till föregående konversation</item>
         <item>Gå till nästa konversation</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Liten</item>
-        <item>Mellan</item>
-        <item>Stor</item>
-        <item>Extra stor</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 7c9a61ef52..5d6bc81c99 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -312,7 +312,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_suggest_received">Alınmış iletilerde bulunan adresleri öner</string>
     <string name="title_advanced_suggest_frequently">Önerilen adresleri kullanım sıklığına göre sıralayın</string>
     <string name="title_advanced_alt_re_fwd">Alternatif yanıt/iletme öneki</string>
-    <string name="title_advanced_send_chips" comment="title_advanced_send_chips&#10;Please see here for what &quot;bubbles&quot; are:&#10;&#10;https://forum.xda-developers.com/t/app-5-0-fairemail-fully-featured-open-source-privacy-oriented-email-app.3824168/post-86457849&#10;&#10;&quot;Balloon&quot; might be an option for translation">Adres balonlarını göster</string>
+    <string name="title_advanced_send_chips">Adres balonlarını göster</string>
     <string name="title_advanced_send_reminders">Hatırlatıcıları göster</string>
     <string name="title_advanced_send_delayed">Mesaj göndermede gecikme</string>
     <string name="title_advanced_attach_new">Yeni bir taslağa paylaşılan dosyalar ekleyin</string>
@@ -1706,12 +1706,6 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
         <item>Önceki konuşmaya git</item>
         <item>Sonraki konuşmaya git</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Küçük</item>
-        <item>Orta</item>
-        <item>Büyük</item>
-        <item>Ekstra büyük</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index be04a7a799..f435678693 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -264,6 +264,7 @@
     <string name="title_setup_theme_grey">Сіра</string>
     <string name="title_setup_theme_black">Чорна</string>
     <string name="title_setup_theme_white">Світла</string>
+    <string name="title_setup_theme_black_or_white">Чорна чи біла</string>
     <string name="title_setup_theme_black_and_white">Чорно-біла</string>
     <string name="title_setup_theme_reverse">Поміняти кольори</string>
     <string name="title_setup_theme_light">Світла</string>
@@ -501,6 +502,7 @@
     <string name="title_advanced_undo">Час для відміни дії</string>
     <string name="title_advanced_quick_filter">Показувати ненав\'язливі піктограми швидкого фільтру</string>
     <string name="title_advanced_quick_scroll">Показати не нав\'язливі піктограми швидкого прокручування вгору/вниз</string>
+    <string name="title_advanced_folder_nav">Завжди повертатися зі списку повідомлень до списку тек</string>
     <string name="title_advanced_autoread">Автоматично відзначати повідомлення прочитаними при їх переміщенні</string>
     <string name="title_advanced_star_snoozed">Автоматично додавати відкладені повідомлення до обраних</string>
     <string name="title_advanced_autounstar">Автоматично прибирати повідомлення з обраних при їх переміщенні</string>
@@ -1728,12 +1730,6 @@
         <item>Перейти до попередньої розмови</item>
         <item>Перейти до наступної розмови</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Малий</item>
-        <item>Середній</item>
-        <item>Великий</item>
-        <item>Дуже великий</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index ae52d0691b..3e6d83f252 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1690,12 +1690,6 @@
         <item>Đi đến cuộc hội thoại trước</item>
         <item>Đi đến cuộc hội thoại sau</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>Nhỏ</item>
-        <item>Vừa</item>
-        <item>Lớn</item>
-        <item>Rất lớn</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b4fa02218e..aee002c6f6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -303,6 +303,7 @@
     <string name="title_advanced_suggest_received">建议在已收到消息中找到的地址</string>
     <string name="title_advanced_suggest_frequently">按使用频率来排序建议地址</string>
     <string name="title_advanced_alt_re_fwd">替代回复/转发前缀</string>
+    <string name="title_advanced_send_chips">显示地址气泡</string>
     <string name="title_advanced_send_reminders">显示提醒</string>
     <string name="title_advanced_send_delayed">延迟发送消息</string>
     <string name="title_advanced_attach_new">将共享文件添加到新草稿</string>
@@ -1693,12 +1694,6 @@
         <item>转到上一个会话</item>
         <item>转到下一个会话</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>小</item>
-        <item>中等</item>
-        <item>大</item>
-        <item>特大</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ea0354c208..53a431b7b2 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1665,12 +1665,6 @@
         <item>前往上一個會話</item>
         <item>前往下一個會話</item>
     </string-array>
-    <string-array name="resizeNames">
-        <item>小</item>
-        <item>中</item>
-        <item>大</item>
-        <item>超大</item>
-    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <string-array name="targetNames">