diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index cf2f27ab..bf8103fb 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -115,6 +115,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -183,6 +184,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index cf2f27ab..bf8103fb 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -115,6 +115,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -183,6 +184,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index cf2f27ab..bf8103fb 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -115,6 +115,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -183,6 +184,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index cf2f27ab..bf8103fb 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -115,6 +115,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -183,6 +184,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cf2f27ab..bf8103fb 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -115,6 +115,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -183,6 +184,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 30b0cd28..5fa9360e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -107,6 +107,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -175,6 +176,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b45efec8..d3baee5d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Slet denne konto permanent?</string>
   <string name="title_identity_delete">Slet denne identitet permanent?</string>
   <string name="title_synchronize_folder">Synkronisér (modtag meddelelser)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synkronisér (dage)</string>
   <string name="title_folder_unified">Samlet indbakke</string>
   <string name="title_folder_inbox">Indbakke</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synkronisér</string>
   <string name="title_legend_primary">Primær</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Afbrudt</string>
   <string name="title_legend_connecting">Tilslutter</string>
   <string name="title_legend_connected">Tilsluttet</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7cdc4fac..6aca340d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
   <string name="title_identity_delete">Möchten Sie diese Identität unwiderruflich löschen?</string>
   <string name="title_synchronize_folder">Synchronisiere (empfange E-Mails)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronisiere (Tage)</string>
   <string name="title_folder_unified">Gemeinsamer Posteingang</string>
   <string name="title_folder_inbox">Posteingang</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Unterhaltung</string>
   <string name="title_legend_synchronize">Synchronisieren</string>
   <string name="title_legend_primary">Primär</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Keine Verbindung</string>
   <string name="title_legend_connecting">Verbinde</string>
   <string name="title_legend_connected">Verbunden</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 56c2e646..eb27d1ac 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Supprimer définitivement ce compte ?</string>
   <string name="title_identity_delete">Supprimer définitivement cette identité ?</string>
   <string name="title_synchronize_folder">Synchroniser (recevoir des messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchroniser (jours)</string>
   <string name="title_folder_unified">Boite de réception unifiée</string>
   <string name="title_folder_inbox">Boîte de réception</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Fil de discussion</string>
   <string name="title_legend_synchronize">Synchroniser</string>
   <string name="title_legend_primary">Principal</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Déconnecté</string>
   <string name="title_legend_connecting">Connexion en cours</string>
   <string name="title_legend_connected">Connecté</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index f48160f3..99ded4c5 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -107,6 +107,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -175,6 +176,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 39f26613..d1d8099c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Cancellare questo account permanentemente?</string>
   <string name="title_identity_delete">Cancellare questa identità permanentemente?</string>
   <string name="title_synchronize_folder">Sincronizza (ricevi messaggi)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Sincronizza (giorni)</string>
   <string name="title_folder_unified">Posta in arrivo unificata</string>
   <string name="title_folder_inbox">Posta in arrivo</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Sincronizza</string>
   <string name="title_legend_primary">Principale</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnesso</string>
   <string name="title_legend_connecting">Connessione in corso</string>
   <string name="title_legend_connected">Connesso</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f48160f3..99ded4c5 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -107,6 +107,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -175,6 +176,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 62c5221f..c52e74a6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -95,6 +95,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -163,6 +164,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 62c5221f..c52e74a6 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -95,6 +95,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -163,6 +164,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index eba7c39d..f21fdc82 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -53,10 +53,10 @@
   <string name="title_setup_account_remark">Do odebrania poczty</string>
   <string name="title_setup_identity">Zarządzaj tożsamościami</string>
   <string name="title_setup_identity_remark">Do wysłania poczty</string>
-  <string name="title_setup_doze">Disable battery optimizations</string>
-  <string name="title_setup_doze_remark">To continuously receive email (optional)</string>
-  <string name="title_setup_doze_instructions">In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\"</string>
-  <string name="title_setup_data">Disable data saving</string>
+  <string name="title_setup_doze">Wyłącz optymalizację baterii</string>
+  <string name="title_setup_doze_remark">Do ciągłego sprawdzania e-mail (opcjonalnie)</string>
+  <string name="title_setup_doze_instructions">W następnym oknie dialogowym, na górze wybierz \"Wszystkie aplikacje\", odszukaj i dotknij FairEmail, wybierz \"Nie optymalizuj\"</string>
+  <string name="title_setup_data">Wyłącz oszczędzanie danych</string>
   <string name="title_setup_permissions">Przyznaj uprawnienia</string>
   <string name="title_setup_permissions_remark">Do auto-uzupełniania adresów (opcjonalnie)</string>
   <string name="title_setup_to_do">Do zrobienia</string>
@@ -107,6 +107,7 @@
   <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
   <string name="title_identity_delete">Usunąć tożsamość bezpowrotnie?</string>
   <string name="title_synchronize_folder">Synchronizuj (odbierz wiadomości)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronizuj (dni)</string>
   <string name="title_folder_unified">Wspólna skrzynka odbiorcza</string>
   <string name="title_folder_inbox">Odebrane</string>
@@ -130,7 +131,7 @@
   <string name="title_unseen">Oznacz jako nieprzeczytane</string>
   <string name="title_forward">Prześlij dalej</string>
   <string name="title_reply_all">Odpowiedz wszystkim</string>
-  <string name="title_show_headers">Show headers</string>
+  <string name="title_show_headers">Pokaż nagłówki</string>
   <string name="title_show_html">Pokaż oryginał</string>
   <string name="title_trash">Kosz</string>
   <string name="title_spam">Spam</string>
@@ -175,6 +176,7 @@
   <string name="title_legend_thread">Konwersacja</string>
   <string name="title_legend_synchronize">Synchronizuj</string>
   <string name="title_legend_primary">Podstawowe</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Rozłączony</string>
   <string name="title_legend_connecting">‎Łączenie</string>
   <string name="title_legend_connected">Połączony</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fe4cd40a..b37bd1bc 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Sincronizar (receber mensagens)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Sincronizar (dias)</string>
   <string name="title_folder_unified">Caixa de entrada unificada</string>
   <string name="title_folder_inbox">Caixa de entrada</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ed582cd3..d2612dc5 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -103,6 +103,7 @@
   <string name="title_account_delete">Ștergeți definitiv acest cont?</string>
   <string name="title_identity_delete">Ștergeți definitiv această identitate?</string>
   <string name="title_synchronize_folder">Sincronizare (primire mesaje)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Sincronizare (zile)</string>
   <string name="title_folder_unified">Căsuță poștală comună</string>
   <string name="title_folder_inbox">Mesaje primite</string>
@@ -171,6 +172,7 @@
   <string name="title_legend_thread">Conversație</string>
   <string name="title_legend_synchronize">Sincronizare</string>
   <string name="title_legend_primary">Primar</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Deconectat</string>
   <string name="title_legend_connecting">Conectare</string>
   <string name="title_legend_connected">Conectat</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 30b0cd28..5fa9360e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -107,6 +107,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -175,6 +176,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 832f7f7c..7c4550bf 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -103,6 +103,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -171,6 +172,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index af36ea43..f7bd122a 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 38b35db2..8181bafe 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -99,6 +99,7 @@
   <string name="title_account_delete">Bu hesabı kalıcı olarak sil?</string>
   <string name="title_identity_delete">Bu kimliği kalıcı olarak sil?</string>
   <string name="title_synchronize_folder">Senkronize et (iletileri al)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Senkronize (günler)</string>
   <string name="title_folder_unified">Birleştirilmiş gelen kutusu</string>
   <string name="title_folder_inbox">Gelen kutusu</string>
@@ -167,6 +168,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Senkronize et</string>
   <string name="title_legend_primary">Birincil</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Bağlantı kesildi</string>
   <string name="title_legend_connecting">Bağlanıyor</string>
   <string name="title_legend_connected">Bağlandı</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 30b0cd28..5fa9360e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -107,6 +107,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -175,6 +176,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 62c5221f..c52e74a6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -95,6 +95,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -163,6 +164,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 65cd3b87..09c2b2f7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -95,6 +95,7 @@
   <string name="title_account_delete">确定永久删除这个账户吗？</string>
   <string name="title_identity_delete">确定永久删除这个身份吗？</string>
   <string name="title_synchronize_folder">同步文件夹（接收）</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">同步天数</string>
   <string name="title_folder_unified">聚合收件箱</string>
   <string name="title_folder_inbox">收件箱</string>
@@ -163,6 +164,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">同步</string>
   <string name="title_legend_primary">首选</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">未连接</string>
   <string name="title_legend_connecting">正在连接</string>
   <string name="title_legend_connected">已连接</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 62c5221f..c52e74a6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -95,6 +95,7 @@
   <string name="title_account_delete">Delete this account permanently?</string>
   <string name="title_identity_delete">Delete this identity permanently?</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
+  <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
@@ -163,6 +164,7 @@
   <string name="title_legend_thread">Conversation</string>
   <string name="title_legend_synchronize">Synchronize</string>
   <string name="title_legend_primary">Primary</string>
+  <string name="title_legend_unified">Unified inbox</string>
   <string name="title_legend_disconnected">Disconnected</string>
   <string name="title_legend_connecting">Connecting</string>
   <string name="title_legend_connected">Connected</string>