diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index bcc4df90..488fdd02 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -124,7 +124,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index bcc4df90..488fdd02 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -124,7 +124,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index bcc4df90..488fdd02 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -124,7 +124,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index bcc4df90..488fdd02 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -124,7 +124,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bcc4df90..488fdd02 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -124,7 +124,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 2e45f6dc..5dce7bce 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,251 +1,252 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
-  <string name="channel_service">Service</string>
-  <string name="channel_notification">Notifications</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 de M. Bokhorst</string>
+  <string name="channel_service">Servei</string>
+  <string name="channel_notification">Notificacions</string>
   <string name="channel_error">Errors</string>
   <plurals name="title_notification_synchronizing">
-    <item quantity="one">Synchronizing %1$d account</item>
-    <item quantity="other">Synchronizing %1$d accounts</item>
+    <item quantity="one">Sincronitzant %1$d compte</item>
+    <item quantity="other">Sincronitzant %1$d comptes</item>
   </plurals>
   <plurals name="title_notification_operations">
-    <item quantity="one">%1$d operation pending</item>
-    <item quantity="other">%1$d operations pending</item>
+    <item quantity="one">%1$d operació pendent</item>
+    <item quantity="other">%1$d operacions pendents</item>
   </plurals>
   <plurals name="title_notification_unseen">
-    <item quantity="one">%1$d new message</item>
-    <item quantity="other">%1$d new messages</item>
+    <item quantity="one">%1$d missatge nou</item>
+    <item quantity="other">%1$d missatges nous</item>
   </plurals>
   <plurals name="title_notification_unsent">
-    <item quantity="one">%1$d unsent message</item>
-    <item quantity="other">%1$d unsent messages</item>
+    <item quantity="one">%1$d missatge sense enviar</item>
+    <item quantity="other">%1$d missatges sense enviar</item>
   </plurals>
-  <string name="title_notification_failed">\'%1$s\' failed</string>
-  <string name="menu_setup">Setup</string>
-  <string name="menu_answers">Standard replies</string>
-  <string name="menu_operations">Operations</string>
-  <string name="menu_legend">Legend</string>
-  <string name="menu_faq">FAQ/support</string>
-  <string name="menu_pro">Pro features</string>
-  <string name="menu_privacy">Privacy</string>
-  <string name="menu_about">About</string>
-  <string name="menu_invite">Invite</string>
-  <string name="menu_rate">Rate this app</string>
-  <string name="menu_other">Other apps</string>
-  <string name="title_eula">End-user license agreement</string>
-  <string name="title_agree">I agree</string>
-  <string name="title_disagree">I disagree</string>
-  <string name="title_version">Version %1$s</string>
-  <string name="title_list_accounts">Accounts</string>
-  <string name="title_list_identities">Identities</string>
-  <string name="title_edit_account">Edit account</string>
-  <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings</string>
-  <string name="title_setup_import">Import settings</string>
-  <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
-  <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
-  <string name="title_setup_exported">Settings exported</string>
-  <string name="title_setup_imported">Settings imported</string>
-  <string name="title_setup_account">Manage accounts</string>
-  <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_identity">Manage identities</string>
-  <string name="title_setup_identity_remark">To send email</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_permissions">Grant permissions</string>
-  <string name="title_setup_permissions_remark">To get contact information (optional)</string>
-  <string name="title_setup_to_do">To do</string>
-  <string name="title_setup_done">Done</string>
-  <string name="title_setup_light_theme">Light theme</string>
-  <string name="title_setup_dark_theme">Dark theme</string>
-  <string name="title_advanced">Advanced options</string>
-  <string name="title_advanced_enabled">Enabled</string>
-  <string name="title_advanced_avatars">Show contact photos</string>
-  <string name="title_advanced_light">Use notification light</string>
-  <string name="title_advanced_browse">Browse messages on the server</string>
-  <string name="title_advanced_swipe">Swipe actions</string>
-  <string name="title_advanced_debug">Debug mode</string>
-  <string name="title_select">Select &#8230;</string>
-  <string name="title_identity_name">Your name</string>
-  <string name="title_identity_email">Your email address</string>
-  <string name="title_identity_reply_to">Reply to address</string>
-  <string name="title_optional">Optional</string>
-  <string name="title_account_linked">Linked account</string>
-  <string name="title_account_name">Account name</string>
-  <string name="title_account_name_hint">Used to differentiate folders</string>
-  <string name="title_account_signature">Signature text</string>
+  <string name="title_notification_failed">%1$s ha fallat</string>
+  <string name="menu_setup">Configuració</string>
+  <string name="menu_answers">Respostes estàndard</string>
+  <string name="menu_operations">Operacions</string>
+  <string name="menu_legend">Llegenda</string>
+  <string name="menu_faq">Preguntes freqüents/suport</string>
+  <string name="menu_pro">Característiques Pro</string>
+  <string name="menu_privacy">Privadesa</string>
+  <string name="menu_about">Quant a</string>
+  <string name="menu_invite">Invitació</string>
+  <string name="menu_rate">Puntua l\'aplicació</string>
+  <string name="menu_other">Altres aplicacions</string>
+  <string name="title_eula">Contracte de Llicència d’usuari final</string>
+  <string name="title_agree">D’acord</string>
+  <string name="title_disagree">No hi estic d\'acord</string>
+  <string name="title_version">Versió %1$s</string>
+  <string name="title_list_accounts">Comptes</string>
+  <string name="title_list_identities">Identitats</string>
+  <string name="title_edit_account">Edita el compte</string>
+  <string name="title_edit_identity">Edita identitat</string>
+  <string name="title_edit_folder">Edita la carpeta</string>
+  <string name="title_setup">Configuració</string>
+  <string name="title_setup_export">Exporta la configuració</string>
+  <string name="title_setup_import">Importa una configuració</string>
+  <string name="title_setup_export_do">Els comptes i identitats seran exportats sense contrasenyes</string>
+  <string name="title_setup_import_do">Els comptes importats no es sobreescriuran</string>
+  <string name="title_setup_exported">Configuració exportada</string>
+  <string name="title_setup_imported">Configuració importada</string>
+  <string name="title_setup_account">Gestiona els comptes</string>
+  <string name="title_setup_account_remark">Per rebre correu-e</string>
+  <string name="title_setup_identity">Gestiona les identitats</string>
+  <string name="title_setup_identity_remark">Per enviar correu-e</string>
+  <string name="title_setup_doze">Inhabilita les optimitzacions de bateria</string>
+  <string name="title_setup_doze_remark">Per rebre correu-e contínuament (opcional)</string>
+  <string name="title_setup_doze_instructions">En el següent diàleg, selecciona \"totes les apps\" a dalt, selecciona aquesta aplicació i polsa i confirma «no optimitzis la bateria»</string>
+  <string name="title_setup_data">Desactiva estalvi de dades</string>
+  <string name="title_setup_permissions">Concedeix permisos</string>
+  <string name="title_setup_permissions_remark">Per obtenir informació de contacte (opcional)</string>
+  <string name="title_setup_to_do">Per fer</string>
+  <string name="title_setup_done">Fet</string>
+  <string name="title_setup_light_theme">Tema clar</string>
+  <string name="title_setup_dark_theme">Tema fosc</string>
+  <string name="title_advanced">Opcions avançades</string>
+  <string name="title_advanced_enabled">Activat</string>
+  <string name="title_advanced_avatars">Mostra les fotos dels contactes</string>
+  <string name="title_advanced_light">Utilitza el led de notificacions</string>
+  <string name="title_advanced_browse">Busca missatges en el servidor remot</string>
+  <string name="title_advanced_swipe">Accions per lliscar</string>
+  <string name="title_advanced_debug">Mode de depuració</string>
+  <string name="title_select">Selecciona &#8230;</string>
+  <string name="title_identity_name">El teu nom</string>
+  <string name="title_identity_email">La teva adreça de correu-e</string>
+  <string name="title_identity_reply_to">Respon a l’adreça</string>
+  <string name="title_optional">Opcional</string>
+  <string name="title_account_linked">Compte vinculat</string>
+  <string name="title_account_name">Nom del compte</string>
+  <string name="title_account_name_hint">Emprat per diferenciar carpetes</string>
+  <string name="title_account_signature">Text de signatura</string>
   <string name="title_account_color">Color</string>
-  <string name="title_domain">Domain name</string>
-  <string name="title_autoconfig">Get settings</string>
-  <string name="title_no_settings">Settings not found</string>
+  <string name="title_domain">Nom de domini</string>
+  <string name="title_autoconfig">Obté la configuració de</string>
+  <string name="title_no_settings">Configuració no trobada</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
-  <string name="title_provider">Provider</string>
-  <string name="title_custom">Custom</string>
-  <string name="title_host">Host name</string>
+  <string name="title_provider">Proveïdor</string>
+  <string name="title_custom">Personalitzat</string>
+  <string name="title_host">Nom del servidor</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_port">Port number</string>
-  <string name="title_user">User name</string>
-  <string name="title_password">Password</string>
-  <string name="title_authorize">Select account</string>
-  <string name="title_authorizing">Authorizing account &#8230;</string>
-  <string name="title_setup_advanced">Advanced</string>
-  <string name="title_store_sent">Store sent messages (normally not needed)</string>
-  <string name="title_synchronize_account">Synchronize (receive messages)</string>
-  <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (default account)</string>
-  <string name="title_primary_identity">Primary (default identity)</string>
-  <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
-  <string name="title_check">Check</string>
-  <string name="title_no_name">Name missing</string>
-  <string name="title_no_email">Email address missing</string>
-  <string name="title_no_account">Account missing</string>
-  <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">Drafts folder missing</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>
-  <string name="title_identity_delete">Delete this identity permanently?</string>
-  <string name="title_pop">POP is not supported</string>
-  <string name="title_insecure">Insecure connections are not supported</string>
-  <string name="title_synchronize_now">Synchronize now</string>
-  <string name="title_delete_local">Delete local messages</string>
-  <string name="title_empty_trash">Empty trash</string>
-  <string name="title_edit_properties">Edit properties</string>
-  <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
-  <string name="title_folder_name">Folder name</string>
-  <string name="title_display_name">Display name</string>
-  <string name="title_hide_folder">Hide from list</string>
-  <string name="title_hide_folders">Hide hidden folders</string>
-  <string name="title_show_folders">Show hidden folders</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_exists">Folder %1$s exists</string>
-  <string name="title_folder_delete">Delete folder permanently?</string>
-  <string name="title_folder_unified">Unified inbox</string>
-  <string name="title_folder_inbox">Inbox</string>
-  <string name="title_folder_outbox">Outbox</string>
-  <string name="title_folder_all">Archive</string>
-  <string name="title_folder_drafts">Drafts</string>
-  <string name="title_folder_trash">Trash</string>
-  <string name="title_folder_junk">Spam</string>
-  <string name="title_folder_sent">Sent</string>
-  <string name="title_folder_system">System</string>
-  <string name="title_folder_user">User</string>
-  <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Conversation</string>
-  <string name="title_no_messages">No messages</string>
-  <string name="title_show_images">Show images</string>
+  <string name="title_port">Número de port</string>
+  <string name="title_user">Nom d\'usuari</string>
+  <string name="title_password">Contrasenya</string>
+  <string name="title_authorize">Selecciona un compte</string>
+  <string name="title_authorizing">Autoritzant compte &#8230;</string>
+  <string name="title_setup_advanced">Avançat</string>
+  <string name="title_store_sent">Emmagatzema missatges enviats (normalment no és necessari)</string>
+  <string name="title_synchronize_account">Sincronitza (rebre missatges)</string>
+  <string name="title_synchronize_identity">Sincronitza (envia missatges)</string>
+  <string name="title_primary_account">Primària (compte per defecte)</string>
+  <string name="title_primary_identity">Primària (identitat per defecte)</string>
+  <string name="title_keep_alive_interval">Interval d\'activitat (minuts)</string>
+  <string name="title_check">Comprovar</string>
+  <string name="title_no_name">Falta nom</string>
+  <string name="title_no_email">Falta l\'adreça de correu-e</string>
+  <string name="title_no_account">Falta compte</string>
+  <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_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>
+  <string name="title_identity_delete">Esborrar aquesta identitat per sempre?</string>
+  <string name="title_pop">POP no està suportat</string>
+  <string name="title_insecure">Les connexions insegures no estan suportades</string>
+  <string name="title_synchronize_now">Sincronitza ara</string>
+  <string name="title_delete_local">Esborra els missatges locals</string>
+  <string name="title_empty_trash">Buida la paperera</string>
+  <string name="title_edit_properties">Edita les propietats</string>
+  <string name="title_empty_trash_ask">Vols buidar la paperera?</string>
+  <string name="title_folder_name">Nom de carpeta</string>
+  <string name="title_display_name">Mostrar el nom</string>
+  <string name="title_hide_folder">Amagar de la llista</string>
+  <string name="title_hide_folders">Amaga les carpetes ocultes</string>
+  <string name="title_show_folders">Mostra les carpetes ocultes</string>
+  <string name="title_synchronize_folder">Sincronitza (rebre missatges)</string>
+  <string name="title_unified_folder">Mostra en la safata d\'entrada unificada</string>
+  <string name="title_after">Sincronitza (dies)</string>
+  <string name="title_folder_exists">La carpeta %1$s existeix</string>
+  <string name="title_folder_delete">Esborrar la carpeta per sempre?</string>
+  <string name="title_folder_unified">Safata d\'entrada unificada</string>
+  <string name="title_folder_inbox">Safata d\'entrada</string>
+  <string name="title_folder_outbox">Safata de sortida</string>
+  <string name="title_folder_all">Arxiu</string>
+  <string name="title_folder_drafts">Esborranys</string>
+  <string name="title_folder_trash">Paperera</string>
+  <string name="title_folder_junk">Correu brossa</string>
+  <string name="title_folder_sent">Enviat</string>
+  <string name="title_folder_system">Sistema</string>
+  <string name="title_folder_user">Usuari</string>
+  <string name="title_folder_primary">Carpetes del compte primari</string>
+  <string name="title_folder_thread">Conversació</string>
+  <string name="title_no_messages">No hi ha missatges</string>
+  <string name="title_show_images">Mostra imatges</string>
   <string name="title_subject_reply">Re: %1$s</string>
-  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark read</string>
-  <string name="title_unseen">Mark unread</string>
-  <string name="title_flag">Add star</string>
-  <string name="title_unflag">Remove star</string>
-  <string name="title_forward">Forward</string>
-  <string name="title_reply_all">Reply to all</string>
-  <string name="title_show_headers">Show headers</string>
-  <string name="title_show_html">Show original</string>
-  <string name="title_trash">Trash</string>
-  <string name="title_delete">Delete</string>
-  <string name="title_more">More</string>
-  <string name="title_spam">Spam</string>
-  <string name="title_move">Move</string>
-  <string name="title_archive">Archive</string>
-  <string name="title_reply">Reply</string>
-  <string name="title_moving">Moving message to %1$s</string>
-  <string name="title_no_viewer">No viewer app available for %1$s</string>
-  <string name="title_attachment_saved">Attachment saved</string>
-  <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
-  <string name="title_ask_delete">Delete message permanently?</string>
-  <string name="title_ask_discard">Discard draft?</string>
-  <string name="title_ask_spam">Report message as spam?</string>
-  <string name="title_compose">Compose</string>
-  <string name="title_from">From:</string>
-  <string name="title_to">To:</string>
-  <string name="title_reply_to">Reply to:</string>
+  <string name="title_subject_forward">Rv: %1$s</string>
+  <string name="title_seen">Marca com a llegit</string>
+  <string name="title_unseen">Marca com a no llegit</string>
+  <string name="title_flag">Afegeix a destacats</string>
+  <string name="title_unflag">Treure de destacats</string>
+  <string name="title_forward">Següent</string>
+  <string name="title_reply_all">Respon a tots</string>
+  <string name="title_show_headers">Mostra les capçaleres</string>
+  <string name="title_show_html">Veure l\'original</string>
+  <string name="title_trash">Paperera</string>
+  <string name="title_delete">Eliminar</string>
+  <string name="title_more">Més</string>
+  <string name="title_spam">Correu brossa</string>
+  <string name="title_move">Mou</string>
+  <string name="title_archive">Arxivar</string>
+  <string name="title_reply">Respon</string>
+  <string name="title_moving">Movent el missatge a %1$s</string>
+  <string name="title_no_viewer">No hi ha cap visor disponible per a %1$s</string>
+  <string name="title_attachment_saved">Fitxer adjunt desat</string>
+  <string name="title_attachment_unavailable">Alguns adjunts no s\'han descarregat i no seran reenviats, continuar?</string>
+  <string name="title_ask_delete">Esborrar el missatge per sempre?</string>
+  <string name="title_ask_discard">Voleu rebutjar l\'esborrany?</string>
+  <string name="title_ask_spam">Qualificar el missatge com correu brossa?</string>
+  <string name="title_compose">Redactar</string>
+  <string name="title_from">De:</string>
+  <string name="title_to">A:</string>
+  <string name="title_reply_to">Respondre a:</string>
   <string name="title_cc">CC:</string>
-  <string name="title_bcc">BCC:</string>
-  <string name="title_subject">Subject:</string>
-  <string name="title_body_hint">Your message</string>
-  <string name="title_discard">Discard</string>
-  <string name="title_save">Save</string>
-  <string name="title_send">Send</string>
-  <string name="title_clipboard_empty">Clipboard empty</string>
-  <string name="title_style_bold">Bold</string>
-  <string name="title_style_italic">Italic</string>
-  <string name="title_style_link">Insert link</string>
-  <string name="title_style_image">Insert image</string>
-  <string name="title_add_attachment">Add attachment</string>
-  <string name="title_show_addresses">Show CC/BCC</string>
-  <string name="title_from_missing">Sender missing</string>
-  <string name="title_to_missing">Recipient missing</string>
-  <string name="title_attachments_missing">Attachments still loading</string>
-  <string name="title_draft_deleted">Draft discarded</string>
-  <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Sending message</string>
-  <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
-  <string name="title_searching">Searching \'%1$s\'</string>
-  <string name="title_sort_on">Sort on</string>
-  <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_previous">Previous</string>
-  <string name="title_next">Next</string>
-  <string name="title_answer_reply">Standard reply</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
-  <string name="title_legend_inbox">Inbox</string>
-  <string name="title_legend_unified">Unified inbox</string>
-  <string name="title_legend_archive">Archive</string>
-  <string name="title_legend_trash">Trash</string>
-  <string name="title_legend_primary_disconnected">Account disconnected</string>
-  <string name="title_legend_primary_connected">Account connected</string>
-  <string name="title_legend_cc">CC/BCC</string>
-  <string name="title_legend_attachment">Attachment</string>
-  <string name="title_legend_thread">Conversation</string>
-  <string name="title_legend_contacts">Contacts</string>
-  <string name="title_legend_synchronize_on">Synchronize on</string>
-  <string name="title_legend_synchronize_off">Synchronize off</string>
-  <string name="title_legend_primary">Primary/starred</string>
-  <string name="title_legend_disconnected">Disconnected</string>
-  <string name="title_legend_connecting">Connecting</string>
-  <string name="title_legend_connected">Connected</string>
-  <string name="title_legend_synchronizing">Synchronizing</string>
-  <string name="title_legend_downloading">Downloading</string>
-  <string name="title_legend_closing">Closing</string>
-  <string name="title_hint_folder_actions">Long press for options</string>
-  <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
-  <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
-  <string name="title_hint_sync">Downloading messages can take some time, depending on the number of messages, the speed of your internet connection and your email provider</string>
-  <string name="title_open_link">Open link</string>
-  <string name="title_updated">There is an update to version %1$s available</string>
-  <string name="title_issue">Do you have a question or problem?</string>
-  <string name="title_yes">Yes</string>
+  <string name="title_bcc">CCO:</string>
+  <string name="title_subject">Assumpte:</string>
+  <string name="title_body_hint">El teu missatge</string>
+  <string name="title_discard">Descartar</string>
+  <string name="title_save">Desa</string>
+  <string name="title_send">Enviar</string>
+  <string name="title_clipboard_empty">Porta-retalls buit</string>
+  <string name="title_style_bold">Negreta</string>
+  <string name="title_style_italic">Cursiva</string>
+  <string name="title_style_link">Insereix enllaç</string>
+  <string name="title_style_image">Insereix imatge</string>
+  <string name="title_add_attachment">Afegeix un adjunt</string>
+  <string name="title_show_addresses">Mostra CC/CCO</string>
+  <string name="title_from_missing">Falta l\'emissor</string>
+  <string name="title_to_missing">Falta el receptor</string>
+  <string name="title_attachments_missing">Els adjunts encara s\'estan carregant</string>
+  <string name="title_draft_deleted">Esborrany eliminat</string>
+  <string name="title_draft_saved">Esborrany desat</string>
+  <string name="title_queued">Enviant missatge</string>
+  <string name="title_search">Cerca</string>
+  <string name="title_search_hint">Cerca en el servidor remot</string>
+  <string name="title_searching">Cercant \'%1$s\'</string>
+  <string name="title_sort_on">Ordena per</string>
+  <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_previous">Anterior</string>
+  <string name="title_next">Següent</string>
+  <string name="title_answer_reply">Resposta estàndard</string>
+  <string name="title_answer_name">Nom de resposta</string>
+  <string name="title_answer_text">Text de resposta</string>
+  <string name="title_legend_inbox">Safata d\'entrada</string>
+  <string name="title_legend_unified">Safata d\'entrada unificada</string>
+  <string name="title_legend_archive">Arxiu</string>
+  <string name="title_legend_trash">Paperera</string>
+  <string name="title_legend_primary_disconnected">Compte desconnectat</string>
+  <string name="title_legend_primary_connected">Compte connectat</string>
+  <string name="title_legend_cc">CC/CCO</string>
+  <string name="title_legend_attachment">Adjunt</string>
+  <string name="title_legend_thread">Conversació</string>
+  <string name="title_legend_contacts">Contactes</string>
+  <string name="title_legend_synchronize_on">Sincronitza engegada</string>
+  <string name="title_legend_synchronize_off">Sincronització apagada</string>
+  <string name="title_legend_primary">Primària/destacada</string>
+  <string name="title_legend_disconnected">Desconnectat</string>
+  <string name="title_legend_connecting">S\'està connectant</string>
+  <string name="title_legend_connected">Connectat</string>
+  <string name="title_legend_synchronizing">Sincronitzant</string>
+  <string name="title_legend_downloading">Descarregant</string>
+  <string name="title_legend_closing">Tancant</string>
+  <string name="title_hint_folder_actions">Manté polsat per més opcions</string>
+  <string name="title_hint_support">Si tens algun problema o pregunta, per favor utilitza el menú d\'ajuda per obtenir assistència</string>
+  <string name="title_hint_message_actions">Llisca cap a l\'esquerra per enviar a la paperera; o bé cap a la dreta per arxivar (si és possible)</string>
+  <string name="title_hint_sync">Descarregar missatges pot trigar, depenent del nombre de missatges, de la velocitat de la teva connexió a Internet i del teu proveïdor de correu-e</string>
+  <string name="title_open_link">Obrir l\'enllaç</string>
+  <string name="title_updated">Hi ha disponible una actualització a la versió %1$s</string>
+  <string name="title_issue">Tens alguna pregunta o problema?</string>
+  <string name="title_yes">Sí</string>
   <string name="title_no">No</string>
-  <string name="title_undo">Undo</string>
-  <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
-  <string name="title_pro_feature">This is a pro feature</string>
-  <string name="title_pro_list">List of pro features</string>
-  <string name="title_pro_purchase">Buy</string>
-  <string name="title_pro_hint">Buying pro features will allow you to use all current and future pro features, will keep this app maintained, and supported</string>
-  <string name="title_pro_price">Please see <a href="https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ19">this FAQ</a> about the price of the pro features</string>
-  <string name="title_pro_activated">All pro features are activated</string>
-  <string name="title_pro_valid">All pro features activated</string>
-  <string name="title_pro_invalid">Invalid response</string>
-  <string name="title_pro_support">FairEmail needs your help. Tap to purchase pro features to keep the project going.</string>
-  <string name="title_unexpected_error">Unexpected error</string>
-  <string name="title_log">Log</string>
-  <string name="title_debug_info">Debug info</string>
-  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
-  <string name="title_crash_info_remark">Please describe what you were doing when the app crashed:</string>
+  <string name="title_undo">Desfés</string>
+  <string name="title_try">Prova FairEmail, una aplicació de correu-e per a Android, de codi obert i que respecta la privacitat</string>
+  <string name="title_pro_feature">Això es una característica Pro</string>
+  <string name="title_pro_list">Llista de característiques Pro</string>
+  <string name="title_pro_purchase">Comprar</string>
+  <string name="title_pro_hint">Comprar característiques Pro et permet utilitzar tota la funcionalitat Pro actual i futura i mantindrà el desenvolupament de l\'aplicació</string>
+  <string name="title_pro_price">Dona un cop d\'ull <a href="https://github.com/M66B/open-source-email/blob/master/FAQ.md#FAQ19">a les preguntes freqüents</a> per saber el preu de les característiques Pro</string>
+  <string name="title_pro_activated">Totes les característiques Pro estan activades</string>
+  <string name="title_pro_valid">Totes les característiques Pro estan activades</string>
+  <string name="title_pro_invalid">Resposta no vàlida</string>
+  <string name="title_pro_support">FairEmail necessita el teu ajut. Prem per comprar característiques Pro per mantenir el projecte en marxa.</string>
+  <string name="title_unexpected_error">S\'ha produït un error inesperat</string>
+  <string name="title_log">Registre</string>
+  <string name="title_debug_info">Informació de depuració</string>
+  <string name="title_debug_info_remark">Per favor descriu el problema i indica quan en el que va ocorre:</string>
+  <string name="title_crash_info_remark">Per favor descriu què estaves fent quan l\'aplicació va fallar:</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bd900834..e343ef5d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -116,7 +116,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c72010b2..a6677201 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -108,7 +108,8 @@
   <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">Kladdemappe 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_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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a54afd3f..4cf5c507 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -108,7 +108,8 @@
   <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">Entwurfsordner fehlt</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_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>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 0e5587a3..d8f36ef3 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -108,7 +108,8 @@
   <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">Falta carpeta de Borradores</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_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>
@@ -166,7 +167,7 @@
   <string name="title_attachment_saved">Adjunto guardado</string>
   <string name="title_attachment_unavailable">Algunos adjuntos no están descargados y no serán reenviados, ¿continuar?</string>
   <string name="title_ask_delete">¿Eliminar mensaje permanentemente?</string>
-  <string name="title_ask_discard">Discard draft?</string>
+  <string name="title_ask_discard">¿Descartar el borrador?</string>
   <string name="title_ask_spam">¿Reportar mensaje como spam?</string>
   <string name="title_compose">Redactar</string>
   <string name="title_from">De:</string>
@@ -176,7 +177,7 @@
   <string name="title_bcc">CCO:</string>
   <string name="title_subject">Asunto:</string>
   <string name="title_body_hint">Su mensaje</string>
-  <string name="title_discard">Discard</string>
+  <string name="title_discard">Eliminar</string>
   <string name="title_save">Guardar</string>
   <string name="title_send">Enviar</string>
   <string name="title_clipboard_empty">Portapapeles vacío</string>
@@ -189,7 +190,7 @@
   <string name="title_from_missing">Falta remitente</string>
   <string name="title_to_missing">Falta destinatario</string>
   <string name="title_attachments_missing">Adjuntos todavía cargándose</string>
-  <string name="title_draft_deleted">Draft discarded</string>
+  <string name="title_draft_deleted">Borrador eliminado</string>
   <string name="title_draft_saved">Borrador guardado</string>
   <string name="title_queued">Enviando mensaje</string>
   <string name="title_search">Buscar</string>
@@ -199,8 +200,8 @@
   <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_previous">Previous</string>
-  <string name="title_next">Next</string>
+  <string name="title_previous">Anterior</string>
+  <string name="title_next">Siguiente</string>
   <string name="title_answer_reply">Respuesta estándar</string>
   <string name="title_answer_name">Nombre de respuesta</string>
   <string name="title_answer_text">Texto de respuesta</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 35d86bf5..7b111321 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 658916c7..6e2e8856 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -108,7 +108,8 @@
   <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">Répertoire Brouillons manquant</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_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>
@@ -199,8 +200,8 @@
   <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_previous">Previous</string>
-  <string name="title_next">Next</string>
+  <string name="title_previous">Précédent</string>
+  <string name="title_next">Suivant</string>
   <string name="title_answer_reply">Réponse standard</string>
   <string name="title_answer_name">Nom de la réponse</string>
   <string name="title_answer_text">Texte de la réponse</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 2a80d64f..58517659 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -116,7 +116,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 989706a3..b2a62ff7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -108,7 +108,8 @@
   <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">Cartella delle bozze 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_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>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2a80d64f..58517659 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -116,7 +116,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index af4cd75a..16fc8012 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -104,7 +104,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index af4cd75a..16fc8012 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -104,7 +104,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8f5fce3c..25b5e993 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -116,7 +116,8 @@
   <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">Brakuje folderu Szkice</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_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>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2fd12fe1..7ead468a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 2e45f6dc..857975f8 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -108,7 +108,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 4b363857..b968e85a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -112,7 +112,8 @@
   <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">Lipsește dosarul de ciorne</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_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>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bd900834..e343ef5d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -116,7 +116,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 53cca1d6..6e479b0d 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -112,7 +112,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 47011c1c..c31d59fb 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -108,7 +108,8 @@
   <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">Utkastmapp 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_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>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0b3dfbcb..dd21179e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -108,7 +108,8 @@
   <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">Taslaklar klasörü 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_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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index bd900834..e343ef5d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -116,7 +116,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index af4cd75a..16fc8012 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -104,7 +104,8 @@
   <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">Drafts folder 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_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>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 50d55f08..c61ed13a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -104,7 +104,8 @@
   <string name="title_no_host">缺少主机名称</string>
   <string name="title_no_user">缺少用户名</string>
   <string name="title_no_password">缺少密码</string>
-  <string name="title_no_drafts">缺少草稿箱</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_idle">吃提供商不支持推送消息. 新消息的接收可能会延迟</string>
   <string name="title_no_uidplus">不支持 IMAP UIDPLUS, 详见常见问题</string>
   <string name="title_account_delete">确定永久删除这个账户吗？</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index af4cd75a..16fc8012 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -104,7 +104,8 @@
   <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">Drafts folder 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_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>