diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 21f8bb1b76..f45c54606d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -328,7 +328,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
                         EntityFolder archive = db.folder().getPrimaryArchive();
                         if (archive == null)
-                            throw new IllegalArgumentException(getString(R.string.title_no_archive));
+                            throw new IllegalArgumentException(getString(R.string.title_no_primary_archive));
 
                         db.message().deleteFoundMessages();
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index e04bd72533..ab909409eb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -137,7 +137,7 @@ public class FragmentAbout extends FragmentEx {
 
                             EntityFolder drafts = db.folder().getPrimaryDrafts();
                             if (drafts == null)
-                                throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));
+                                throw new IllegalArgumentException(context.getString(R.string.title_no_primary_drafts));
 
                             draft = new EntityMessage();
                             draft.account = drafts.account;
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index dd3525e83c..b188add91f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -628,6 +628,8 @@ public class FragmentAccount extends FragmentEx {
                             interval = "9";
                         if (synchronize && drafts == null)
                             throw new Throwable(getContext().getString(R.string.title_no_drafts));
+                        if (synchronize && trash == null)
+                            throw new Throwable(getContext().getString(R.string.title_no_trash));
                         if (Color.TRANSPARENT == color)
                             color = null;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 085f27853e..ae942d705b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -850,7 +850,7 @@ public class FragmentCompose extends FragmentEx {
                 if (drafts == null)
                     drafts = db.folder().getPrimaryDrafts();
                 if (drafts == null)
-                    throw new IllegalArgumentException(getString(R.string.title_no_drafts));
+                    throw new IllegalArgumentException(getString(R.string.title_no_primary_drafts));
 
                 String body = "";
 
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 32468c3c19..46c2cffa56 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -125,9 +125,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -218,7 +219,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 32468c3c19..46c2cffa56 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -125,9 +125,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -218,7 +219,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 32468c3c19..46c2cffa56 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -125,9 +125,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -218,7 +219,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 32468c3c19..46c2cffa56 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -125,9 +125,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -218,7 +219,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 32468c3c19..46c2cffa56 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -125,9 +125,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -218,7 +219,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 77269bd685..ef2e8c9b1c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Falta nom de servidor</string>
   <string name="title_no_user">Falta nom de d\'usuari</string>
   <string name="title_no_password">Falta la contrasenya</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Aquest proveïdor no suporta missatges push. La recepció de nous missatges pot sofrir retards.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS no està suportat, per favor consulta les preguntes freqüents</string>
   <string name="title_account_delete">Esborrar aquest compte per sempre?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Data</string>
   <string name="title_sort_on_unread">Sense llegir</string>
   <string name="title_sort_on_starred">Destacats</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Anterior</string>
   <string name="title_next">Següent</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 44008e20d0..dc7a114451 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -117,9 +117,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -210,7 +211,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index dd6c4be9bd..34399b3d4d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Værtsnavn mangler</string>
   <string name="title_no_user">Brugernavn mangler</string>
   <string name="title_no_password">Adgangskode mangler</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Slet denne konto permanent?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 784eb7b7ce..91184078dd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Hostname fehlt</string>
   <string name="title_no_user">Benutzername fehlt</string>
   <string name="title_no_password">Passwort fehlt</string>
-  <string name="title_no_drafts">Kein Hauptkonto oder kein Entwürfeordner</string>
-  <string name="title_no_archive">Kein Hauptkonto oder kein Archivordner</string>
-  <string name="title_no_target">Ein Zielordner wurde nicht festgelegt oder fehlt</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Dieser Anbieter unterstützt keine Push-Nachrichten. Der Empfang von neuen Nachrichten kann sich verzögern.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS wird nicht unterstützt, lesen Sie die FAQ</string>
   <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Uhrzeit</string>
   <string name="title_sort_on_unread">Ungelesen</string>
   <string name="title_sort_on_starred">Favoriten</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Vorherige</string>
   <string name="title_next">Nächste</string>
   <string name="title_answer_reply">Antwortvorlage</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b1819ed901..f0c215e0a8 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -64,7 +64,7 @@
   <string name="title_setup_light_theme">Tema claro</string>
   <string name="title_setup_dark_theme">Tema oscuro</string>
   <string name="title_advanced">Opciones avanzadas</string>
-  <string name="title_advanced_enabled">Activado</string>
+  <string name="title_advanced_enabled">Servicio activado</string>
   <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
   <string name="title_advanced_light">Usar luz de notificación</string>
   <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
@@ -109,9 +109,10 @@
   <string name="title_no_host">Falta nombre de host</string>
   <string name="title_no_user">Falta nombre de usuario</string>
   <string name="title_no_password">Falta contraseña</string>
-  <string name="title_no_drafts">No hay cuenta primaria o no hay carpeta de borradores</string>
-  <string name="title_no_archive">No hay cuenta primaria o no hay carpeta de archivados</string>
-  <string name="title_no_target">La carpeta destino no está establecida o no existe</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Este proveedor no soporta mensajes Push. La recepción de nuevos mensajes puede ser retrasada.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS no está soportado, vea las Preguntas Frecuentes</string>
   <string name="title_account_delete">¿Eliminar esta cuenta permanentemente?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Tiempo</string>
   <string name="title_sort_on_unread">No leído</string>
   <string name="title_sort_on_starred">Destacado</string>
-  <string name="title_swipe">Establecer destino al deslizar a la derecha</string>
   <string name="title_previous">Anterior</string>
   <string name="title_next">Siguiente</string>
   <string name="title_answer_reply">Plantilla de respuesta</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 9ba000ce32..857d5cf5fe 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 87b1797548..605dc775a9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Nom d\'hôte manquant</string>
   <string name="title_no_user">Nom d\'utilisateur manquant</string>
   <string name="title_no_password">Mot de passe manquant</string>
-  <string name="title_no_drafts">Pas de compte principal ou bien pas de dossier brouillon</string>
-  <string name="title_no_archive">Pas de compte principal ou bien pas de dossier archive</string>
-  <string name="title_no_target">Le dossier cible n\'est pas défini ou est manquant</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Ce fournisseur ne gère pas les messages push. La réception des nouveaux messages peut être retardée.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS non pris en charge, consulter la FAQ</string>
   <string name="title_account_delete">Supprimer définitivement ce compte ?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Date</string>
   <string name="title_sort_on_unread">Non lu(s)</string>
   <string name="title_sort_on_starred">Suivis</string>
-  <string name="title_swipe">Définir l\'action du balayage à droite</string>
   <string name="title_previous">Précédent</string>
   <string name="title_next">Suivant</string>
   <string name="title_answer_reply">Modèle de réponse</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6da6e0dada..9100253383 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -117,9 +117,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -210,7 +211,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7ff42798ae..7f44bb3ae3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -23,7 +23,7 @@
   </plurals>
   <string name="title_notification_failed">\'%1$s\' fallito</string>
   <string name="menu_setup">Configurazione</string>
-  <string name="menu_answers">Reply templates</string>
+  <string name="menu_answers">Modelli di risposta</string>
   <string name="menu_operations">Operazioni</string>
   <string name="menu_legend">Legenda</string>
   <string name="menu_faq">FAQ/supporto</string>
@@ -69,7 +69,7 @@
   <string name="title_advanced_light">Usa il led di notifica</string>
   <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
   <string name="title_advanced_swipe">Azioni swipe</string>
-  <string name="title_advanced_compact">Compact message view</string>
+  <string name="title_advanced_compact">Visualizzazione messaggio compatto</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Seleziona &#8230;</string>
   <string name="title_identity_name">Il tuo nome</string>
@@ -109,9 +109,10 @@
   <string name="title_no_host">Nome dell\'host mancante</string>
   <string name="title_no_user">Nome utente mancante</string>
   <string name="title_no_password">Password mancante</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Questo fornitore non supporta i messaggi push. La ricezione di nuovi messaggi può subire ritardi.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS non supportato, vedi le FAQ</string>
   <string name="title_account_delete">Eliminare questo account permanentemente?</string>
@@ -202,10 +203,9 @@
   <string name="title_sort_on_time">Ora</string>
   <string name="title_sort_on_unread">Non letti</string>
   <string name="title_sort_on_starred">Stellati</string>
-  <string name="title_swipe">Set right swipe target</string>
-  <string name="title_previous">Previous</string>
-  <string name="title_next">Next</string>
-  <string name="title_answer_reply">Reply template</string>
+  <string name="title_previous">Precedente</string>
+  <string name="title_next">Successivo</string>
+  <string name="title_answer_reply">Modello di risposta</string>
   <string name="title_answer_name">Nome risposta</string>
   <string name="title_answer_text">Testo risposta</string>
   <string name="title_legend_inbox">Posta in arrivo</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 6da6e0dada..9100253383 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -117,9 +117,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -210,7 +211,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d41c253209..efe1339dd6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -105,9 +105,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -198,7 +199,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index d41c253209..efe1339dd6 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -105,9 +105,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -198,7 +199,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d11def1fc2..b9ff311afe 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -31,7 +31,7 @@
   </plurals>
   <string name="title_notification_failed">%1$s nie powiodło się</string>
   <string name="menu_setup">Ustawienia</string>
-  <string name="menu_answers">Reply templates</string>
+  <string name="menu_answers">Szablony odpowiedzi</string>
   <string name="menu_operations">Operacje</string>
   <string name="menu_legend">Legenda</string>
   <string name="menu_faq">FAQ/Wsparcie</string>
@@ -77,7 +77,7 @@
   <string name="title_advanced_light">Użyj diody powiadomień</string>
   <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
   <string name="title_advanced_swipe">Gesty przesuwania</string>
-  <string name="title_advanced_compact">Compact message view</string>
+  <string name="title_advanced_compact">Widok kompaktowy</string>
   <string name="title_advanced_debug">Debuguj</string>
   <string name="title_select">Wybierz &#8230;</string>
   <string name="title_identity_name">Twoja nazwa</string>
@@ -117,9 +117,10 @@
   <string name="title_no_host">Brak nazwy hosta</string>
   <string name="title_no_user">Brak nazwy użytkownika</string>
   <string name="title_no_password">Brak hasła</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Ten dostawca nie obsługuje wiadomości push. Odbieranie nowych wiadomości może być opóźnione.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS nie jest wspierane, zobacz FAQ</string>
   <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
@@ -177,7 +178,7 @@
   <string name="title_attachment_saved">Załącznik zapisany</string>
   <string name="title_attachment_unavailable">Niektóre załączniki nie są pobrane i nie zostaną przekazane, kontynuować?</string>
   <string name="title_ask_delete">Usunąć wiadomość bezpowrotnie?</string>
-  <string name="title_ask_discard">Discard draft?</string>
+  <string name="title_ask_discard">Odrzucić szkic?</string>
   <string name="title_ask_spam">Zgłosić wiadomość jako spam?</string>
   <string name="title_compose">Napisz</string>
   <string name="title_from">Od:</string>
@@ -187,7 +188,7 @@
   <string name="title_bcc">UDW:</string>
   <string name="title_subject">Temat:</string>
   <string name="title_body_hint">Twoja wiadomość</string>
-  <string name="title_discard">Discard</string>
+  <string name="title_discard">Odrzuć</string>
   <string name="title_save">Zapisz</string>
   <string name="title_send">Wyślij</string>
   <string name="title_clipboard_empty">Schowek pusty</string>
@@ -200,7 +201,7 @@
   <string name="title_from_missing">Brak nadawcy</string>
   <string name="title_to_missing">Brak adresata</string>
   <string name="title_attachments_missing">Załączniki są wciąż ładowane</string>
-  <string name="title_draft_deleted">Draft discarded</string>
+  <string name="title_draft_deleted">Szkic odrzucony</string>
   <string name="title_draft_saved">Szkic zapisany</string>
   <string name="title_queued">Wysyłanie wiadomości</string>
   <string name="title_search">Szukaj</string>
@@ -210,10 +211,9 @@
   <string name="title_sort_on_time">Czas</string>
   <string name="title_sort_on_unread">Nieprzeczytane</string>
   <string name="title_sort_on_starred">Oznaczone</string>
-  <string name="title_swipe">Set right swipe target</string>
-  <string name="title_previous">Previous</string>
-  <string name="title_next">Next</string>
-  <string name="title_answer_reply">Reply template</string>
+  <string name="title_previous">Poprzedni</string>
+  <string name="title_next">Następny</string>
+  <string name="title_answer_reply">Szablon odpowiedzi</string>
   <string name="title_answer_name">Nazwa odpowiedzi</string>
   <string name="title_answer_text">Tekst odpowiedzi</string>
   <string name="title_legend_inbox">Odebrane</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 054f01deb4..280247d572 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Nome do servidor faltante</string>
   <string name="title_no_user">Nome do usuário faltante</string>
   <string name="title_no_password">Senha faltante</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 56202d9f4a..06b1c03b44 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 7b7e049d79..5dc5394980 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -27,7 +27,7 @@
   </plurals>
   <string name="title_notification_failed">\'%1$s\' a eșuat</string>
   <string name="menu_setup">Setări</string>
-  <string name="menu_answers">Reply templates</string>
+  <string name="menu_answers">Șabloane răspunsuri</string>
   <string name="menu_operations">Operaţii</string>
   <string name="menu_legend">Legendă</string>
   <string name="menu_faq">Întrebări/suport</string>
@@ -73,7 +73,7 @@
   <string name="title_advanced_light">Folosire LED de notificare</string>
   <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
   <string name="title_advanced_swipe">Acțiuni glisare</string>
-  <string name="title_advanced_compact">Compact message view</string>
+  <string name="title_advanced_compact">Afișarea compactă a mesajelor</string>
   <string name="title_advanced_debug">Depanare</string>
   <string name="title_select">Selectaţi &#8230;</string>
   <string name="title_identity_name">Numele dumneavoastră</string>
@@ -113,9 +113,10 @@
   <string name="title_no_host">Lipsește numele serverului</string>
   <string name="title_no_user">Lipsește numele de utilizator</string>
   <string name="title_no_password">Lipsește parola</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Acest furnizor nu suportă mesaje push. Recepția mesajelor noi poate fi întârziată.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS nu este suportat, consultați lista de întrebări și răspunsuri</string>
   <string name="title_account_delete">Ștergeți definitiv acest cont?</string>
@@ -206,10 +207,9 @@
   <string name="title_sort_on_time">Dată</string>
   <string name="title_sort_on_unread">Necitit</string>
   <string name="title_sort_on_starred">Marcat</string>
-  <string name="title_swipe">Set right swipe target</string>
-  <string name="title_previous">Previous</string>
-  <string name="title_next">Next</string>
-  <string name="title_answer_reply">Reply template</string>
+  <string name="title_previous">Precedent</string>
+  <string name="title_next">Următor</string>
+  <string name="title_answer_reply">Șablon răspuns</string>
   <string name="title_answer_name">Titlu răspuns</string>
   <string name="title_answer_text">Text răspuns</string>
   <string name="title_legend_inbox">Primite</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 44008e20d0..dc7a114451 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -117,9 +117,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -210,7 +211,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 72fd8974da..7b2d4522d8 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -113,9 +113,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -206,7 +207,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 296c27e74e..daf55bd093 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Värdnamn saknas</string>
   <string name="title_no_user">Användarnamn saknas</string>
   <string name="title_no_password">Lösenord saknas</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">Leverantören stöder inte push-meddelanden. Mottagning av nya meddelanden kan fördröjas.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS stöds inte, se Vanliga frågor</string>
   <string name="title_account_delete">Ta bort detta konto permanent?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Tid</string>
   <string name="title_sort_on_unread">Olästa</string>
   <string name="title_sort_on_starred">Stjärnmärkta</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index adc40b3882..9548a5dd11 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -109,9 +109,10 @@
   <string name="title_no_host">Sunucu adı eksik</string>
   <string name="title_no_user">Kullanıcı adı eksik</string>
   <string name="title_no_password">Parola Eksik</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Bu hesabı kalıcı olarak sil?</string>
@@ -202,7 +203,6 @@
   <string name="title_sort_on_time">Zaman</string>
   <string name="title_sort_on_unread">Okunmadı</string>
   <string name="title_sort_on_starred">Yıldızlı</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 44008e20d0..dc7a114451 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -117,9 +117,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -210,7 +211,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index d41c253209..efe1339dd6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -105,9 +105,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -198,7 +199,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fb9478f9d6..044105b460 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -105,9 +105,10 @@
   <string name="title_no_host">缺少主机名称</string>
   <string name="title_no_user">缺少用户名</string>
   <string name="title_no_password">缺少密码</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">吃提供商不支持推送消息. 新消息的接收可能会延迟</string>
   <string name="title_no_uidplus">不支持 IMAP UIDPLUS, 详见常见问题</string>
   <string name="title_account_delete">确定永久删除这个账户吗？</string>
@@ -198,7 +199,6 @@
   <string name="title_sort_on_time">时间</string>
   <string name="title_sort_on_unread">未读</string>
   <string name="title_sort_on_starred">星标记</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d41c253209..efe1339dd6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -105,9 +105,10 @@
   <string name="title_no_host">Host name missing</string>
   <string name="title_no_user">User name missing</string>
   <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">No primary account or no drafts folder</string>
-  <string name="title_no_archive">No primary account or no archive folder</string>
-  <string name="title_no_target">Target folder not set or missing</string>
+  <string name="title_no_drafts">No drafts folder selected</string>
+  <string name="title_no_trash">No trash folder selected</string>
+  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+  <string name="title_no_primary_archive">No primary account or no archive folder</string>
   <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
   <string name="title_account_delete">Delete this account permanently?</string>
@@ -198,7 +199,6 @@
   <string name="title_sort_on_time">Time</string>
   <string name="title_sort_on_unread">Unread</string>
   <string name="title_sort_on_starred">Starred</string>
-  <string name="title_swipe">Set right swipe target</string>
   <string name="title_previous">Previous</string>
   <string name="title_next">Next</string>
   <string name="title_answer_reply">Reply template</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4aa1186cd8..ce7fc03c7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -125,8 +125,10 @@
     <string name="title_no_host">Host name missing</string>
     <string name="title_no_user">User name missing</string>
     <string name="title_no_password">Password missing</string>
-    <string name="title_no_drafts">No primary account or no drafts folder</string>
-    <string name="title_no_archive">No primary account or no archive folder</string>
+    <string name="title_no_drafts">No drafts folder selected</string>
+    <string name="title_no_trash">No trash folder selected</string>
+    <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
+    <string name="title_no_primary_archive">No primary account or no archive folder</string>
     <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
     <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
     <string name="title_account_delete">Delete this account permanently?</string>