diff --git a/app/src/main/assets/SETUP-pt-rPT.md b/app/src/main/assets/SETUP-pt-rPT.md
index 665eebcf64..ff2b13fc33 100644
--- a/app/src/main/assets/SETUP-pt-rPT.md
+++ b/app/src/main/assets/SETUP-pt-rPT.md
@@ -1,6 +1,6 @@
 # Ajuda de configuração
 
-Configurar o FairMail é bastante simples. Irá precisar de pelo menos uma conta para receber email e pelo menos uma identidade se quiser enviar email. A configuração rápida irá adicionar uma conta e uma identidade de uma só vez para a maioria dos principais provedores.
+Configurar o FairMail é bastante simples. Irá precisar de pelo menos uma conta para receber email e pelo menos uma identidade se quiser enviar email. A Configuração Rápida irá adicionar uma conta de receção com uma identidade de envio para a maioria dos principais provedores.
 
 ## Requisitos
 
@@ -8,7 +8,7 @@ Uma ligação à internet é obrigatória para configurar contas e identidades.
 
 ## Configurador rápido
 
-Basta seleccionar o fornecedor adequado ou *Outro fornecedor* e inserir o seu nome, endereço de e-mail e palavra-passe e tocar em *Verificar*.
+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*.
 
 Isto funcionará para a maioria dos provedores de e-mail.
 
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 7dbf817f80..2d0c7fa1b3 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_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>
     <string name="title_setup_theme_light">Světlý</string>
@@ -331,6 +332,7 @@
     <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_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>
@@ -497,6 +499,7 @@
     <string name="title_advanced_undo">Časový limit vrácení zpět</string>
     <string name="title_advanced_quick_filter">Zobrazit neobtěžující ikony pro rychlé filtrování</string>
     <string name="title_advanced_quick_scroll">Zobrazit neobtěžující ikony pro rychlý posun nahoru/dolů</string>
+    <string name="title_advanced_folder_nav">Vždy se vrátit do seznamu složek ze seznamu zpráv</string>
     <string name="title_advanced_autoread">Při přesunu označit zprávy jako přečtené automaticky</string>
     <string name="title_advanced_star_snoozed">Při odložení zpráv přidat hvězdičku automaticky</string>
     <string name="title_advanced_autounstar">Při přesunu odebrat zprávám hvězdičku automaticky</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 6f62942106..a5000d5c4b 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -243,6 +243,7 @@
     <string name="title_setup_theme_grey">Gråt</string>
     <string name="title_setup_theme_black">Sort</string>
     <string name="title_setup_theme_white">Hvidt</string>
+    <string name="title_setup_theme_black_or_white">Sort eller hvidt</string>
     <string name="title_setup_theme_black_and_white">Sort og hvid</string>
     <string name="title_setup_theme_reverse">Omvendte farver</string>
     <string name="title_setup_theme_light">Lyst</string>
@@ -313,6 +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_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>
@@ -481,6 +483,7 @@
     <string name="title_advanced_undo">Fortryd timeout</string>
     <string name="title_advanced_quick_filter">Vis ikke-påtrængende hurtige filterikoner</string>
     <string name="title_advanced_quick_scroll">Vis ikke-påtrængende hurtige rul op/ned ikoner</string>
+    <string name="title_advanced_folder_nav">Returnér altid til mappelisten fra en beskedliste</string>
     <string name="title_advanced_autoread">Auto-markér beskeder som læst, når de flyttes</string>
     <string name="title_advanced_star_snoozed">Auto-tilføj stjerne på udsatte beskeder</string>
     <string name="title_advanced_autounstar">Fjern automatisk stjerner fra beskeder, når de flyttes</string>
@@ -809,6 +812,9 @@
     <string name="title_synchronize_subfolders">Undermapper</string>
     <string name="title_synchronize_more">Hent flere beskeder</string>
     <string name="title_synchronize_more_hint">Dette vil resultere i en enkelt download af ældre beskeder uden større strømforbrug end alm. hverdagsbrug</string>
+    <string name="title_synchronize_more_hint2">        Beskeder vil blive hentet så hurtigt som e-mail-serveren kan levere dem og gemt så hurtigt som enheden kan gemme og indeksere dem.
+        Den begrænsende faktor er normalt hastigheden af enhedens interne lagerplads.
+    </string>
     <string name="title_synchronize_enabled">Synkroniserer</string>
     <string name="title_synchronize_batch_enable">Aktivér synkronisering</string>
     <string name="title_synchronize_batch_disable">Deaktivér synkronisering</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 25917684f1..a946330490 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -242,7 +242,7 @@
     <string name="title_setup_theme_grey">Grau</string>
     <string name="title_setup_theme_black">Schwarz</string>
     <string name="title_setup_theme_white">Weiß</string>
-    <string name="title_setup_theme_black_or_white" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">Schwarz oder weiß</string>
+    <string name="title_setup_theme_black_or_white">Schwarz oder Weiß</string>
     <string name="title_setup_theme_black_and_white">Schwarzweiß</string>
     <string name="title_setup_theme_reverse">Farben invertieren</string>
     <string name="title_setup_theme_light">Hell</string>
@@ -312,6 +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_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>
@@ -480,6 +481,7 @@
     <string name="title_advanced_undo">Anzeigedauer von »Rückgängig«</string>
     <string name="title_advanced_quick_filter">Unaufdringliche Schnellfiltersymbole anzeigen</string>
     <string name="title_advanced_quick_scroll">Nicht aufdringliche Symbole für schnellen Bildlauf nach oben oder unten anzeigen</string>
+    <string name="title_advanced_folder_nav">Von einer Nachrichtenliste immer zur Ordnerliste zurückkehren</string>
     <string name="title_advanced_autoread">Nachrichten beim Verschieben automatisch als gelesen kennzeichnen</string>
     <string name="title_advanced_star_snoozed">Zurückgestellte Nachrichten automatisch kennzeichnen</string>
     <string name="title_advanced_autounstar">Markierungen automatisch von Nachrichten entfernen, wenn sie verschoben werden</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index c76b2b67b0..50256388cb 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -243,6 +243,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>
@@ -312,6 +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_reminders">Εμφάνιση υπενθυμίσεων</string>
     <string name="title_advanced_send_delayed">Καθυστέρηση στην αποστολή μηνυμάτων</string>
     <string name="title_advanced_attach_new">Προσθήκη κοινόχρηστων αρχείων σε ένα νέο προσχέδιο</string>
@@ -480,6 +482,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>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index d27fde5d25..63f4cfb750 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -243,7 +243,7 @@
     <string name="title_setup_theme_grey">Harmaa</string>
     <string name="title_setup_theme_black">Musta</string>
     <string name="title_setup_theme_white">Valkoinen</string>
-    <string name="title_setup_theme_black_or_white" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">Musta tai valkoinen</string>
+    <string name="title_setup_theme_black_or_white">Musta tai valkoinen</string>
     <string name="title_setup_theme_black_and_white">Musta ja valkoinen</string>
     <string name="title_setup_theme_reverse">Käänteiset värit</string>
     <string name="title_setup_theme_light">Vaalea</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index b291b7a4f6..6fd7dea235 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -243,7 +243,7 @@
     <string name="title_setup_theme_grey">Gris</string>
     <string name="title_setup_theme_black">Noir</string>
     <string name="title_setup_theme_white">Blanc</string>
-    <string name="title_setup_theme_black_or_white" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">Noir ou blanc</string>
+    <string name="title_setup_theme_black_or_white">Noir ou blanc</string>
     <string name="title_setup_theme_black_and_white">Noir et blanc</string>
     <string name="title_setup_theme_reverse">Inverser les couleurs</string>
     <string name="title_setup_theme_light">Clair</string>
@@ -314,6 +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_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>
@@ -482,7 +483,7 @@
     <string name="title_advanced_undo">Délai d’expiration de l’annulation</string>
     <string name="title_advanced_quick_filter">Afficher les icônes discrètes de filtrage rapide</string>
     <string name="title_advanced_quick_scroll">Afficher les icônes discrètes de défilement rapide vers le haut/bas</string>
-    <string name="title_advanced_folder_nav" comment="title_advanced_folder_nav&#10;Option title to change the way of navigating.&#10;&#10;'back' from a list of messages will always return to the folder list of the related account with this option enabled.">Toujours revenir à la liste des dossiers à partir d\'une liste de messages</string>
+    <string name="title_advanced_folder_nav">Toujours revenir à la liste des dossiers à partir d\'une liste de messages</string>
     <string name="title_advanced_autoread">Marquer automatiquement les messages comme lus lors de leur déplacement</string>
     <string name="title_advanced_star_snoozed">Marquer automatiquement les messages comme suivis lors de leur report</string>
     <string name="title_advanced_autounstar">Retirer automatiquement l’étoile de suivi des messages lors de leur déplacement</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 19c2d6ba70..37eab74529 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -243,7 +243,7 @@
     <string name="title_setup_theme_grey">Gris</string>
     <string name="title_setup_theme_black">Noir</string>
     <string name="title_setup_theme_white">Blanc</string>
-    <string name="title_setup_theme_black_or_white" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">Noir ou blanc</string>
+    <string name="title_setup_theme_black_or_white">Noir ou blanc</string>
     <string name="title_setup_theme_black_and_white">Noir et blanc</string>
     <string name="title_setup_theme_reverse">Permuter les couleurs</string>
     <string name="title_setup_theme_light">Clair</string>
@@ -314,6 +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_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>
@@ -482,7 +483,7 @@
     <string name="title_advanced_undo">Délai d\'expiration de l\'annulation</string>
     <string name="title_advanced_quick_filter">Afficher les icônes discrètes de filtrage rapide</string>
     <string name="title_advanced_quick_scroll">Afficher les icônes discrètes de défilement rapide vers le haut/bas</string>
-    <string name="title_advanced_folder_nav" comment="title_advanced_folder_nav&#10;Option title to change the way of navigating.&#10;&#10;'back' from a list of messages will always return to the folder list of the related account with this option enabled.">Toujours revenir à la liste des dossiers à partir d\'une liste de messages</string>
+    <string name="title_advanced_folder_nav">Toujours revenir à la liste des dossiers à partir d\'une liste de messages</string>
     <string name="title_advanced_autoread">Marquer automatiquement les messages comme lus lors de leur déplacement</string>
     <string name="title_advanced_star_snoozed">Marquer automatiquement les messages comme suivis lors de leur report</string>
     <string name="title_advanced_autounstar">Retirer automatiquement l\'étoile de suivi des messages lors de leur déplacement</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 79f02d6994..48409bf8c8 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -242,6 +242,8 @@
     <string name="title_setup_theme_red_green">Rosso/verde</string>
     <string name="title_setup_theme_grey">Grigio</string>
     <string name="title_setup_theme_black">Nero</string>
+    <string name="title_setup_theme_white">Bianco</string>
+    <string name="title_setup_theme_black_or_white">Bianco o nero</string>
     <string name="title_setup_theme_black_and_white">Bianco e nero</string>
     <string name="title_setup_theme_reverse">Inverti colori</string>
     <string name="title_setup_theme_light">Chiaro</string>
@@ -312,6 +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_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>
@@ -480,6 +483,7 @@
     <string name="title_advanced_undo">Annulla timeout</string>
     <string name="title_advanced_quick_filter">Mostra icone rapide del filtro non vistose</string>
     <string name="title_advanced_quick_scroll">Mostra icone di scorrimento rapido in su/giù non vistose</string>
+    <string name="title_advanced_folder_nav">Torna sempre all\'elenco delle cartelle da un elenco di messaggi</string>
     <string name="title_advanced_autoread">Contrassegna automaticamente i messaggi come letti allo spostamento</string>
     <string name="title_advanced_star_snoozed">Aggiungi automaticamente la stella posticipando i messaggi</string>
     <string name="title_advanced_autounstar">Rimuovi automaticamente le stelle dai messaggi al loro spostamento</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 4b615beb16..956ca5b200 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -263,7 +263,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" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">שחור או לבן</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>
@@ -334,6 +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_reminders">הצגת תזכורות</string>
     <string name="title_advanced_send_delayed">השהיית שליחת הודעות</string>
     <string name="title_advanced_attach_new">הוספת קבצים משותפים לטיוטה חדשה</string>
@@ -502,7 +503,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" comment="title_advanced_folder_nav&#10;Option title to change the way of navigating.&#10;&#10;'back' from a list of messages will always return to the folder list of the related account with this option enabled.">תמיד לחזור אחורה לרשימת התיקיות מרשימת ההודעות</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>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index e4ce294489..ad5d8e78c5 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -186,6 +186,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>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 53a6fbf9b5..f5000aeeff 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -242,7 +242,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_setup_theme_grey">Grijs</string>
     <string name="title_setup_theme_black">Zwart</string>
     <string name="title_setup_theme_white">Wit</string>
-    <string name="title_setup_theme_black_or_white" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">Zwart of wit</string>
+    <string name="title_setup_theme_black_or_white">Zwart of wit</string>
     <string name="title_setup_theme_black_and_white">Zwart-wit</string>
     <string name="title_setup_theme_reverse">Kleuren omkeren</string>
     <string name="title_setup_theme_light">Licht</string>
@@ -312,6 +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_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>
@@ -480,7 +481,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_undo">Herstel time-out</string>
     <string name="title_advanced_quick_filter">Toon niet-opdringerige snelle filterpictogrammen</string>
     <string name="title_advanced_quick_scroll">Toon niet-opdringerige snelle scroll omhoog/omlaag pictogrammen</string>
-    <string name="title_advanced_folder_nav" comment="title_advanced_folder_nav&#10;Option title to change the way of navigating.&#10;&#10;'back' from a list of messages will always return to the folder list of the related account with this option enabled.">Ga altijd terug naar de mappenlijst vanuit een berichtenlijst</string>
+    <string name="title_advanced_folder_nav">Ga altijd terug naar de mappenlijst vanuit een berichtenlijst</string>
     <string name="title_advanced_autoread">Markeer berichten automatisch als gelezen bij het verplaatsen van berichten</string>
     <string name="title_advanced_star_snoozed">Voeg automatisch ster toe bij het sluimeren van berichten</string>
     <string name="title_advanced_autounstar">Automatisch ster verwijderen van berichten bij verplaatsende berichten</string>
diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
index 7e05522555..6500d233c7 100644
--- a/app/src/main/res/values-or-rIN/strings.xml
+++ b/app/src/main/res/values-or-rIN/strings.xml
@@ -133,7 +133,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" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">କଳା ବା ଧଳା</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>
@@ -216,7 +216,7 @@
     <string name="title_advanced_sync_on_launch">ଆରମ୍ଭରେ ସିଙ୍କ୍ରୋନାଇଜ୍ କରନ୍ତୁ</string>
     <string name="title_advanced_pull_refresh">ସତେଜ କରିବାକୁ ତଳକୁ ଟାଣନ୍ତୁ</string>
     <string name="title_advanced_undo">ପୂର୍ବବତ୍ ସମୟ ଶେଷ</string>
-    <string name="title_advanced_folder_nav" comment="title_advanced_folder_nav&#10;Option title to change the way of navigating.&#10;&#10;'back' from a list of messages will always return to the folder list of the related account with this option enabled.">ଏକ ବାର୍ତ୍ତା ତାଲିକାରୁ ସର୍ବଦା ଫୋଲ୍ଡର ତାଲିକାକୁ ଫେରିବା</string>
+    <string name="title_advanced_folder_nav">ଏକ ବାର୍ତ୍ତା ତାଲିକାରୁ ସର୍ବଦା ଫୋଲ୍ଡର ତାଲିକାକୁ ଫେରିବା</string>
     <string name="title_advanced_swipe_reply">ପ୍ରତ୍ୟୁତ୍ତର ଦେବା ପାଇଁ ସମ୍ପ୍ରସାରିତ ବାର୍ତ୍ତାଗୁଡ଼ିକ ଡାହାଣକୁ ସ୍ଵାଇପ୍ କରନ୍ତୁ</string>
     <string name="title_advanced_default_snooze">ଡିଫଲ୍ଟ ସ୍ନୁଜ୍/ବିଳମ୍ବ ସମୟ</string>
     <string name="title_advanced_notify_preview_all">ସମସ୍ତ ପାଠ୍ୟକୁ ପୂର୍ବାବଲୋକନ କରନ୍ତୁ</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 9680cc45af..1e3378331b 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -262,6 +262,7 @@
     <string name="title_setup_theme_red_green">Czerwony/zielony</string>
     <string name="title_setup_theme_grey">Szary</string>
     <string name="title_setup_theme_black">Czarny</string>
+    <string name="title_setup_theme_white">Biały</string>
     <string name="title_setup_theme_black_and_white">Czarno-biały</string>
     <string name="title_setup_theme_reverse">Odwróć kolory</string>
     <string name="title_setup_theme_light">Jasny</string>
@@ -499,6 +500,7 @@
     <string name="title_advanced_undo">Ustaw limit czasu dla \"Cofnij\"</string>
     <string name="title_advanced_quick_filter">Pokaż nienatarczywe ikony szybkiego filtrowania</string>
     <string name="title_advanced_quick_scroll">Pokaż nienatarczywe ikony szybkiego przewijania w górę/w dół</string>
+    <string name="title_advanced_folder_nav">Zawsze wracaj do listy folderów z listy wiadomości</string>
     <string name="title_advanced_autoread">Automatycznie oznacz wiadomość jako przeczytaną przy przenoszeniu</string>
     <string name="title_advanced_star_snoozed">Automatycznie dodawaj gwiazdkę przy usypianiu wiadomości</string>
     <string name="title_advanced_autounstar">Automatycznie usuwaj gwiazdki z wiadomości przy ich przenoszeniu</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 3fd8af2b5c..40825a55a3 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -14,7 +14,7 @@
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">E-mail</string>
     <string name="channel_progress">Progresso</string>
-    <string name="channel_update">Atualizações</string>
+    <string name="channel_update">Actualizações</string>
     <string name="channel_warning">Avisos</string>
     <string name="channel_error">Erros</string>
     <string name="channel_alert">Alertas do servidor</string>
@@ -101,7 +101,7 @@
     <string name="menu_test">Programa de teste</string>
     <string name="menu_faq">Suporte</string>
     <string name="menu_translate">Ajude a traduzir</string>
-    <string name="menu_issue">Reportar problema</string>
+    <string name="menu_issue">Comunicar um problema</string>
     <string name="menu_attribution">Atribuição</string>
     <string name="menu_privacy">Privacidade</string>
     <string name="menu_about">Sobre</string>
@@ -126,7 +126,7 @@
     <string name="title_setup_intro">A configuração de uma conta consiste em três passos podendo, logo após isso, enviar e receber e-mails</string>
     <string name="title_setup_simple">Não há necessidade de alterar outras opções</string>
     <string name="title_setup_issue">O FairEmail foi desenvolvido para ajudar a proteger a sua privacidade e representa, literalmente, milhares de horas de trabalho. Se tiver algum problema, por favor contacte-me primeiro para assistência antes de deixar uma avaliação negativa. Tenho todo o gosto em ajudar!</string>
-    <string name="title_setup_analytics">O FairEmail não exibe anúncios e não rastreia ou analisa o seu comportamento. O Bugsnag é usado para reportar erros e está desativado por defeito.</string>
+    <string name="title_setup_analytics">O FairEmail não exibe anúncios e não monitoriza ou analisa o seu comportamento. O Bugsnag é usado para comunicar erros e está desactivado por defeito.</string>
     <string name="title_setup_quick_accounts">Adicionar ou alterar contas</string>
     <string name="title_setup_quick_support">Alguns provedores tornam difícil adicionar uma conta. Por favor, não culpe o FairEmail por isso, peça-lhes suporte.</string>
     <string name="title_setup_quick_hint">A configuração rápida irá obter informações de configuração a partir de autoconfig.thunderbird.net</string>
@@ -183,7 +183,9 @@
     <string name="title_setup_doze_remark">Para enviar e receber e-mail corretamente</string>
     <string name="title_setup_doze_explanation">As otimizações da bateria devem ser desativadas para assegurar o envio e a recepção de mensagens confiáveis em segundo plano</string>
     <string name="title_setup_doze_hint">Embora isto possa parecer contraditório, desligar as otimizações de bateria para esta aplicação resultará em menos utilização de bateria</string>
-    <string name="title_setup_doze_instructions">No próximo dialogo do sistema Android: Altere de \"Não optimizado\" para \"Todas as aplicações\" » Seleccione esta aplicação e escolha \"Não optimizar\"</string>
+    <string name="title_setup_doze_instructions">No próximo dialogo do sistema Android:
+- Altere de \"Não optimizado\" para \"Todas as aplicações\";
+- Seleccione esta aplicação e escolha \"Não optimizar\";</string>
     <string name="title_setup_doze_battery">Utilização elevada de bateria?</string>
     <string name="title_setup_doze_stopped">A sincronização parou?</string>
     <string name="title_setup_doze_device">Isto é provavelmente necessário para este dispositivo</string>
@@ -241,6 +243,8 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_setup_theme_red_green">Vermelho/verde</string>
     <string name="title_setup_theme_grey">Cinzento</string>
     <string name="title_setup_theme_black">Preto</string>
+    <string name="title_setup_theme_white">Branco</string>
+    <string name="title_setup_theme_black_or_white">Preto ou branco</string>
     <string name="title_setup_theme_black_and_white">Preto e Branco</string>
     <string name="title_setup_theme_reverse">Inverter cores</string>
     <string name="title_setup_theme_light">Claro</string>
@@ -259,7 +263,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_setup_reset_general">Perguntas gerais</string>
     <string name="title_setup_reset_full">Mostrar mensagem originais</string>
     <string name="title_setup_reset_images">Mostrar imagens</string>
-    <string name="title_setup_reset_links">Confirmar links</string>
+    <string name="title_setup_reset_links">Confirmar hiperligações</string>
     <string name="title_advanced_hint_title">Mais opções avançadas</string>
     <string name="title_advanced_hint_message">Está a navegar para as opções mais avançadas.        Todas as opções têm valores padrão geralmente utilizados que podem ser alterados se tiver uma preferência diferente.
     </string>
@@ -296,9 +300,9 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_check_authentication">Verificar autenticação da mensagem</string>
     <string name="title_advanced_check_reply_domain">Verificar endereço de resposta ao sincronizar mensagens</string>
     <string name="title_advanced_check_mx">Verificar endereços de e-mail do remetente ao sincronizar mensagens</string>
-    <string name="title_advanced_tune_keep_alive">Ajustar automaticamente o intervalo de manutenção de connexão</string>
+    <string name="title_advanced_tune_keep_alive">Ajustar automaticamente o intervalo de ligação \'keep-alive\'</string>
     <string name="title_advanced_keyboard">Mostrar teclado por padrão</string>
-    <string name="title_advanced_keyboard_no_fullscreen">Prevenir teclado em tela cheia</string>
+    <string name="title_advanced_keyboard_no_fullscreen">Prevenir teclado em modo ecrã inteiro</string>
     <string name="title_advanced_suggest_names">Usar nomes e endereços de e-mail</string>
     <string name="title_advanced_suggest_local">Sugerir contactos armazenados localmente</string>
     <string name="title_advanced_suggest_sent">Sugerir endereços encontrados nas mensagens enviadas</string>
@@ -323,7 +327,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_signature_forward">Usar assinatura quando encaminhar</string>
     <string name="title_advanced_discard_delete">Ao discartar rascunho, apagar permanentemente</string>
     <string name="title_advanced_reply_move">Ao responder uma mensagem em uma pasta do usuário, guarde a resposta na mesma pasta</string>
-    <string name="title_advanced_auto_link">Criar links automaticamente</string>
+    <string name="title_advanced_auto_link">Criar ligações automaticamente</string>
     <string name="title_advanced_plain_only">Enviar texto simples por omissão</string>
     <string name="title_advanced_usenet_signature">Seguir a convenção de assinatura Usenet</string>
     <string name="title_advanced_remove_signatures">Remover assinaturas reconhecidas</string>
@@ -334,6 +338,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <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_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>
     <string name="title_advanced_vpn_only">Conecte-se apenas através de uma VPN</string>
     <string name="title_advanced_timeout">Conexão expira em (segundos)</string>
@@ -347,7 +352,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_caption_message">Mensagem</string>
     <string name="title_advanced_caption_message_header">Cabeçalho da mensagem</string>
     <string name="title_advanced_caption_message_body">Corpo da mensagem</string>
-    <string name="title_advanced_portrait">Modo Retrato</string>
+    <string name="title_advanced_portrait">Modo retrato</string>
     <string name="title_advanced_landscape">Modo paisagem</string>
     <string name="title_advanced_two_row">Use duas linhas</string>
     <string name="title_advanced_two_col">Use duas colunas</string>
@@ -479,18 +484,23 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_biometrics_notify">Mostrar conteúdo de notificação ao usar autenticação biométrica</string>
     <string name="title_advanced_light">Usar luz de notificações</string>
     <string name="title_advanced_sound">Selecionar som de notificação</string>
-    <string name="title_advanced_confirm_links">Confirmar abertura de links</string>
+    <string name="title_advanced_confirm_links">Pedir confirmação ao abrir hiperligações</string>
     <string name="title_advanced_browse_links">Delegar abertura de links para o Android</string>
     <string name="title_advanced_ask_images">Confirmar a exibição de imagens</string>
     <string name="title_advanced_confirm_html">Mostrar mensagens reformatadas por padrão</string>
+    <string name="title_advanced_tracking">Tentativa de reconhecer e desactivar mensagens de monitorização</string>
     <string name="title_advanced_hide_timezone">Enviar mensagens sem dados de fuso horário</string>
     <string name="title_advanced_display_hidden">Mostrar texto oculto de mensagens</string>
+    <string name="title_advanced_incognito_keyboard">Utilizar teclado incógnito (Android 8+)</string>
     <string name="title_advanced_secure">Esconder do ecrã de aplicações recentes e impedir captura de ecrã</string>
     <string name="title_advanced_pin">PIN</string>
     <string name="title_advanced_biometrics_timeout">Tempo limite para autenticação biométrica</string>
     <string name="title_advanced_autolock">Bloquear quando o ecrã se desligar</string>
     <string name="title_advanced_generic_user_agent">Utilizar \'user agent\' de navegador genérico</string>
     <string name="title_advanced_load_emoji">Carregar emoji atualizado do Google Play Services</string>
+    <string name="title_advanced_disconnect_auto_update">Actualizar automaticamente as listas semanalmente</string>
+    <string name="title_advanced_disconnect_links">Utilizar listas para avisar sobre hiperligações que monitorizam</string>
+    <string name="title_advanced_disconnect_images">Utilizar listas para reconhecer imagens de monitorização</string>
     <string name="title_advanced_sign_default">Assinar por padrão</string>
     <string name="title_advanced_encrypt_default">Encriptar por padrão</string>
     <string name="title_advanced_auto_decrypt">Desencriptar mensagens automaticamente</string>
@@ -507,6 +517,9 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_import_key">Importar chave privada</string>
     <string name="title_advanced_manage_keys">Gerir chaves privadas</string>
     <string name="title_advanced_ca">Certificados CA instalados</string>
+    <string name="title_advanced_manage_keys_hint">        Isto abrirá as configurações de segurança do Android.
+        As chaves e os certificados geralmente podem ser encontrados em Dados biométricos e segurança > Outras definições de segurança.
+    </string>
     <string name="title_advanced_external_search">Permitir procura de mensagens por outras aplicações</string>
     <string name="title_advanced_shortcuts">Mostrar contactos usados com frequência no menu de partilha do Android</string>
     <string name="title_advanced_fts">Construir índice de pesquisa</string>
@@ -515,6 +528,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_language_system">Sistema</string>
     <string name="title_advanced_watchdog">Verificar periodicamente se o FairEmail ainda está ativo</string>
     <string name="title_advanced_updates">Verificar atualizações do GitHub</string>
+    <string name="title_advanced_check_weekly">Verificar semanalmente em vez de diariamente</string>
     <string name="title_advanced_changelog">Mostrar changelog após atualização</string>
     <string name="title_advanced_experiments">Ativar funcionalidades experimentais</string>
     <string name="title_advanced_crash_reports">Enviar relatórios de erro</string>
@@ -531,21 +545,35 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_advanced_unseen_hint">Alguns provedores não têm o suporte correto, o que pode causar a sincronização de nenhuma ou de todas as mensagens</string>
     <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_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>
+    <string name="title_advanced_split_hint">Esta opção divide o ecrã em partes</string>
     <string name="title_advanced_override_width_hint">Isto pode tornar as mensagens mais estreitas, mas também pode parecer estranho</string>
     <string name="title_advanced_monospaced_pre_hint">Mensagens de texto simples serão consideradas como pré-formatadas</string>
     <string name="title_advanced_display_harmful_hint">A desactivação desta opção pode ser lesiva para a sua privacidade</string>
     <string name="title_advanced_safe_browsing_hint">O servidor do Google reconhece quais endereços estão a ser visitados</string>
     <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">Isto irá reiniciar a aplicação</string>
+    <string name="title_advanced_english_hint">Mudar esta definição reiniciará a aplicação</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>
     <string name="title_identity_email">Seu endereço de e-mail</string>
     <string name="title_identity_tenant_hint">Este campo deve estar vazio na maioria dos casos</string>
+    <string name="title_account_name">Nome da conta</string>
+    <string name="title_account_category">Categoria</string>
+    <string name="title_color">Cor</string>
+    <string name="title_background">Fundo</string>
+    <string name="title_transparent">Transparente</string>
+    <string name="title_account_ondemand">Sincronizar manualmente</string>
+    <string name="title_account_left">Deslizar para a esquerda</string>
+    <string name="title_account_right">Deslizar para a direita</string>
     <string name="title_encryption">Encriptação</string>
     <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_primary">Principal</string>
     <string name="title_check">Verificar</string>
@@ -556,11 +584,27 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_account_auth_update">Atualizar autorização</string>
     <string name="title_account_auth_password">Mudar para autenticação de palavra-passe</string>
     <string name="title_delete_account">Eliminar conta</string>
+    <string name="title_account_delete">Eliminar esta conta permanentemente?</string>
+    <string name="title_identity_delete">Eliminar esta identidade permanentemente?</string>
+    <string name="title_edit_html">Editar como HTML</string>
+    <string name="title_sign_key">Chave de assinatura: %1$s</string>
+    <string name="title_last_connected">Última vez ligado: %1$s</string>
     <string name="title_hint_accounts">Toque e mantenha premido numa conta para ver as opções, por exemplo, para desactivar ou eliminar uma conta</string>
     <string name="title_synchronize_more">Obter mais mensagens</string>
+    <string name="title_synchronize_more_hint">Trata-se de uma transferência isolada de antigas mensagens, ou seja, não irá provocar uma utilização mais elevada de bateria no dia-a-dia</string>
+    <string name="title_synchronize_more_hint2">        As mensagens serão obtidas tão rapidamente quanto o servidor de correio electrónico possa entregá-las e armazenadas tão rapidamente quanto o dispositivo possa armazená-las.
+        Habitualmente a limitação advém da velocidade do espaço de armazenamento interno do dispositivo.
+    </string>
     <string name="title_synchronize_enabled">Sincronizar</string>
     <string name="title_expunge">Esponja</string>
     <string name="title_expunge_remark">Isto irá apagar permanentemente todas as mensagens marcadas para exclusão</string>
+    <string name="title_empty_trash">Esvaziar lixo</string>
+    <string name="title_empty_spam">Esvaziar spam</string>
+    <string name="title_edit_properties">Editar propriedades</string>
+    <string name="title_edit_rules">Editar regras</string>
+    <string name="title_execute_rules">Executar regras</string>
+    <string name="title_insert_contact">Adicionar contacto</string>
+    <string name="title_edit_contact">Editar contacto</string>
     <string name="title_import_contacts">Importar vCards</string>
     <string name="title_show_flagged">Mostrar n⁰ de msg. favoritas</string>
     <string name="title_sort_unread_atop">Ordenar as não lidas no topo</string>
@@ -574,6 +618,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_auto_delete_hint">Mensagens antigas são as mensagens que deixam de estar guardadas no dispositivo</string>
     <string name="title_inbox_root_hint">        Some providers require new folders to be created below the inbox.        In this case, you can long press the inbox in the folder list and select \'Create sub folder\'.
     </string>
+    <string name="title_months">Meses</string>
     <string name="title_months_all">Todos</string>
     <string name="title_folder_unified">Caixa de entrada unificada</string>
     <string name="title_folder_inbox">Caixa de entrada</string>
@@ -594,6 +639,9 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_importance_high">Alta</string>
     <string name="title_resend">Reenviar</string>
     <string name="title_fetching_headers">A transferir cabeçalhos de mensagem &#8230;</string>
+    <string name="title_print">Imprimir</string>
+    <string name="title_print_header">Imprimir cabeçalho</string>
+    <string name="title_print_images">Imprimir imagens</string>
     <string name="title_raw_send_message">Mensagem</string>
     <string name="title_raw_send_thread">Conversa</string>
     <string name="title_eml_remark">Para encaminhar mensagens, as mensagens (originais) precisam de ser descarregadas do servidor de e-mail. Requer uma ligação à internet e as mensagens devem ser armazenadas no servidor de e-mail.</string>
@@ -601,12 +649,21 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_eml_downloaded">Download de mensagens originais: %1$s</string>
     <string name="title_buttons_hint">As acções actualmente disponíveis dependem do tipo de conta e da configuração</string>
     <string name="title_trash">Lixo</string>
+    <string name="title_subscribe">Subscrever</string>
     <string name="title_delete">Eliminar</string>
     <string name="title_delete_all">Apagar tudo</string>
+    <string name="title_more">Mais</string>
+    <string name="title_less">Menos</string>
     <string name="title_spam">Spam</string>
     <string name="title_move">Mover</string>
     <string name="title_copy_btn">Copiar</string>
+    <string name="title_keywords_btn">Palavras-chave</string>
+    <string name="title_unsubscribe">Cancelar Subscrição</string>
     <string name="title_message_rule">Criar regra</string>
+    <string name="title_no_junk">Não é spam</string>
+    <string name="title_move_to">Mover para &#8230;</string>
+    <string name="title_move_to_folder">Mover para &#8230;</string>
+    <string name="title_move_to_account">Mover para %1$s &#8230;</string>
     <string name="title_report_spam">Tratar como spam</string>
     <string name="title_delete_permanently">Eliminar permanentemente</string>
     <string name="title_archive">Arquivar</string>
@@ -614,11 +671,13 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_open_with">Abrir com</string>
     <string name="title_no_viewer_name">Nome do conteúdo</string>
     <string name="title_no_viewer_type">Tipo de conteúdo</string>
+    <string name="title_no_viewer_search">Procurar aplicação</string>
     <string name="title_insufficient_memory">Mensagem muito grande para a memória disponível (%1$d)</string>
     <string name="title_fullscreen">Mostrar ecrã completo</string>
     <string name="title_fit_width">Ajustar à largura</string>
     <string name="title_disable_widths">Desativar larguras</string>
     <string name="title_monospaced_pre">Monosespaçado &lt;pre&gt;</string>
+    <string name="title_ask_show_image_hint">Imagens reconhecidas como imagens de monitorização não serão mostradas</string>
     <string name="title_ask_show_amp">Mostrar a variante AMP da mensagem?</string>
     <string name="title_ask_show_amp_hint">As mensagens AMP são concebidas para serem dinâmicas e para interagirem com a internet e, portanto, podem ser usadas por definição para o acompanhar</string>
     <string name="title_ask_reporting">Enviar relatórios de erro?</string>
@@ -631,20 +690,32 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_to">Para:</string>
     <string name="title_sent">Enviados:</string>
     <string name="title_date">Data:</string>
+    <string name="title_size">Tamanho:</string>
     <string name="title_language">Idioma:</string>
     <string name="title_subject">Assunto:</string>
     <string name="title_attachment">Anexo:</string>
     <string name="title_save">Guardar</string>
     <string name="title_send">Enviar</string>
+    <string name="title_send_now">Enviar agora</string>
+    <string name="title_send_via">Enviar via</string>
     <string name="title_send_encryption">Encriptação</string>
     <string name="title_send_sensitivity">Sensibilidade</string>
+    <string name="title_style">Estilo</string>
+    <string name="title_style_bold">Negrito</string>
+    <string name="title_style_italic">Itálico</string>
+    <string name="title_style_underline">Sublinhado</string>
+    <string name="title_style_size">Tamanho</string>
     <string name="title_style_size_small">Pequeno</string>
     <string name="title_style_size_medium">Médio</string>
     <string name="title_style_size_large">Grande</string>
+    <string name="title_style_align">Alinhamento</string>
     <string name="title_style_align_start">Iniciar</string>
+    <string name="title_style_align_center">Centrado</string>
     <string name="title_style_list">Lista</string>
+    <string name="title_style_list_numbered">Numerado</string>
     <string name="title_style_font_default">Predefinido</string>
     <string name="title_style_link">Inserir hiperligação</string>
+    <string name="title_add_image_resize">Redimensionar</string>
     <string name="title_attachment_file">Anexar ficheiro</string>
     <string name="title_attachment_photo">Tirar foto</string>
     <string name="title_attachment_audio">Gravar áudio</string>
@@ -652,12 +723,19 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_manage_local_contacts">Gerir contactos locais</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>
+    <string name="title_verify">Verificar</string>
+    <string name="title_encrypt">Cifrar</string>
+    <string name="title_decrypt">Decifrar</string>
+    <string name="title_resync">Ressincronizar</string>
     <string name="title_alternative_text">Mostrar texto simples</string>
     <string name="title_alternative_html">Mostrar HTML</string>
     <string name="title_signature_mismatch">O endereço de correio eletrónico do remetente e assinatura não corresponde</string>
     <string name="title_signature_algorithm">Algoritmo</string>
     <string name="title_signature_subject">Assunto</string>
+    <string name="title_signature_store">Guardar</string>
     <string name="title_search">Pesquisar</string>
+    <string name="title_search_for_hint">Introduzir texto</string>
     <string name="title_search_hint">        Inicialmente, a procura é efetuada no dispositivo.
         Para procurar também no servidor, clique no botão \'procurar novamente\'.
     </string>
@@ -666,17 +744,30 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_search_more">Mais opções</string>
     <string name="title_search_with_unseen">Não lida</string>
     <string name="title_search_with_flagged">Com estrela</string>
+    <string name="title_search_in_trash">No lixo</string>
+    <string name="title_search_in_junk">No spam</string>
+    <string name="title_search_with_before">Anterior a</string>
+    <string name="title_search_with_after">Depois de</string>
     <string name="title_search_flag_unseen">não lida</string>
     <string name="title_search_flag_flagged">com estrela</string>
+    <string name="title_search_flag_hidden">oculta</string>
+    <string name="title_search_flag_encrypted">cifrada</string>
+    <string name="title_search_flag_attachments">anexos</string>
+    <string name="title_search_flag_notes">notas</string>
+    <string name="title_search_flag_invite">convite</string>
+    <string name="title_search_flag_size">tamanho &gt; %1$s</string>
     <string name="title_sort_on_unread">Não lida</string>
     <string name="title_sort_on_starred">Com estrela</string>
     <string name="title_sort_on_sender">Remetente</string>
     <string name="title_sort_on_subject">Assunto</string>
+    <string name="title_sort_on_size">Tamanho</string>
     <string name="title_filter_seen">Lida</string>
     <string name="title_filter_unflagged">Sem estrela</string>
     <string name="title_filter_duplicates">Duplicados</string>
     <string name="title_zoom">Tamanho do texto</string>
     <string name="title_padding">Tamanho do espaçamento</string>
+    <string name="title_select_language">Seleccionar idioma</string>
+    <string name="title_select_all">Seleccionar todas</string>
     <string name="title_select_found">Seleccionar encontradas</string>
     <string name="title_language_all">Todos</string>
     <string name="title_previous">Anterior</string>
@@ -838,6 +929,7 @@ Esta palavra-passe é necessária para importar novamente as definições, por i
     <string name="title_hint_support">Se tiver alguma questão ou um problema, por favor utilize o menu de suporte para obter ajuda</string>
     <string name="title_hint_message_selection">Pressione e segure uma mensagem para começar a seleccionar múltiplas mensagens; Segure e deslize para cima ou para baixo para seleccionar mais mensagens</string>
     <string name="title_hint_important">Importante</string>
+    <string name="title_hint_sync_note">Por padrão, nem todas as mensagens serão transferidas para limitar a utilização de espaço de armazenamento, de bateria e de dados. Pode alterar isto pressionando e segurando numa pasta na lista de pastas e seleccionando \"Sincronizar mais\".</string>
     <string name="title_hint_contact_actions">Pressione longo para opções</string>
     <string name="title_hint_eml">Este é um resumo do conteúdo de um ficheiro de mensagem em bruto. Guarde a mensagem em bruto com o ícone \'guardar\' na barra de acção para visualizar todo o conteúdo.</string>
     <string name="title_open_link">Abrir ligação</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5ba63b88ef..4f83cc845a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -252,6 +252,8 @@
     <string name="title_setup_theme_red_green">Roșu/verde</string>
     <string name="title_setup_theme_grey">Gri</string>
     <string name="title_setup_theme_black">Negru</string>
+    <string name="title_setup_theme_white">Alb</string>
+    <string name="title_setup_theme_black_or_white">Negru sau alb</string>
     <string name="title_setup_theme_black_and_white">Alb și negru</string>
     <string name="title_setup_theme_reverse">Inversează culorile</string>
     <string name="title_setup_theme_light">Luminoasă</string>
@@ -489,6 +491,7 @@
     <string name="title_advanced_undo">Expirare anulare</string>
     <string name="title_advanced_quick_filter">Arată iconițele de filtrare rapidă</string>
     <string name="title_advanced_quick_scroll">Arată iconițele de derulare sus/jos rapidă</string>
+    <string name="title_advanced_folder_nav">Reveniți întotdeauna la lista de dosare dintr-o listă de mesaje</string>
     <string name="title_advanced_autoread">Marchează automat mesajele mutate ca citite</string>
     <string name="title_advanced_star_snoozed">Adaugă automat stea la mesajele amânate</string>
     <string name="title_advanced_autounstar">Elimină automat steaua mesajelor mutate</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 5eeb0ebe5a..32a6c5bbbf 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -263,7 +263,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" comment="title_setup_theme_black_or_white&#10;Black or white (theme)&#10;&#10;Note that this is explicitly NOT [black AND white] because the theme can be both, also system selectable.">Чёрная или белая</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,7 +501,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" comment="title_advanced_folder_nav&#10;Option title to change the way of navigating.&#10;&#10;'back' from a list of messages will always return to the folder list of the related account with this option enabled.">Всегда возвращаться к списку папок из списка сообщений</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>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 206d950e45..72e26cbef3 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -240,6 +240,8 @@
     <string name="title_setup_theme_red_green">Röd/grön</string>
     <string name="title_setup_theme_grey">Grå</string>
     <string name="title_setup_theme_black">Svart</string>
+    <string name="title_setup_theme_white">Vit</string>
+    <string name="title_setup_theme_black_or_white">Svart eller vitt</string>
     <string name="title_setup_theme_black_and_white">Svart och vitt</string>
     <string name="title_setup_theme_reverse">Omvända färger</string>
     <string name="title_setup_theme_light">Ljus</string>
@@ -308,9 +310,11 @@
     <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_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>
+    <string name="title_advanced_answer_action">Långtryck på svarsknappen kommer:</string>
     <string name="title_advanced_send_pending">Visa icke-påträngande försenad leveransikon</string>
     <string name="title_advanced_compose_font">Standardtypsnitt</string>
     <string name="title_advanced_prefix_once">Prefix i ämnet endast när du svarar eller vidarebefordrar</string>
@@ -391,6 +395,7 @@
     <string name="title_advanced_bimi_unverified">Overifierad avsändare</string>
     <string name="title_advanced_bimi_verified">Verifierad avsändare</string>
     <string name="title_advanced_favicons">Visa favicons</string>
+    <string name="title_advanced_favicons_partial">Skanna bara den första %1$s av webbsidan</string>
     <string name="title_advanced_generated_icons">Visa genererade ikoner</string>
     <string name="title_advanced_identicons">Visa identicons</string>
     <string name="title_advanced_circular">Visa runda ikoner</string>
@@ -474,6 +479,7 @@
     <string name="title_advanced_undo">Ångra timeout</string>
     <string name="title_advanced_quick_filter">Visa icke-påträngande snabbfilter-ikoner</string>
     <string name="title_advanced_quick_scroll">Visa icke-påträngande snabba scrolla upp/ner ikoner</string>
+    <string name="title_advanced_folder_nav">Gå alltid tillbaka till mapplistan från en meddelandelista</string>
     <string name="title_advanced_autoread">Märk automatiskt meddelanden som lästa vid flyttning av meddelanden</string>
     <string name="title_advanced_star_snoozed">Stjärnmarkera automatiskt vid slumring av meddelanden</string>
     <string name="title_advanced_autounstar">Ta automatiskt bort stjärnmarkeringar från meddelanden när meddelanden flyttas</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 9d0f3f7c66..7c9a61ef52 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -241,6 +241,8 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_setup_theme_red_green">Kırmızı/yeşil</string>
     <string name="title_setup_theme_grey">Gri</string>
     <string name="title_setup_theme_black">Siyah</string>
+    <string name="title_setup_theme_white">Beyaz</string>
+    <string name="title_setup_theme_black_or_white">Siyah ya da beyaz</string>
     <string name="title_setup_theme_black_and_white">Siyah-beyaz</string>
     <string name="title_setup_theme_reverse">Renkleri ters çevir</string>
     <string name="title_setup_theme_light">Açık</string>
@@ -310,6 +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_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>
@@ -478,6 +481,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_undo">Zaman aşımını geri al</string>
     <string name="title_advanced_quick_filter">Rahatsız edici olmayan hızlı filtre simgelerini göster</string>
     <string name="title_advanced_quick_scroll">Rahatsız edici olmayan hızlı yukarı/aşağı kaydırma simgelerini göster</string>
+    <string name="title_advanced_folder_nav">Her zaman bir mesaj listesinden klasör listesine geri dön</string>
     <string name="title_advanced_autoread">İleti taşındığında otomatik olarak okundu diye işaretle</string>
     <string name="title_advanced_star_snoozed">Ertelenen mesajlara otomatik olarak yıldız ekle</string>
     <string name="title_advanced_autounstar">Mesajları taşırken otomatik olarak yıldızı kaldır</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0c82816f1e..b4fa02218e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -233,6 +233,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>
@@ -470,6 +471,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>