diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 3c2556265a..68a5796e51 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -158,7 +158,6 @@
     <string name="title_no_idle">Bu təchizatçı ani mesajları dəstəkləmir. Bu, yeni mesajların alınmasını gecikdirəcək və batareyanın istifadəsini artıracaq.</string>
     <string name="title_account_delete">Bu hesab birdəfəlik silinsin?</string>
     <string name="title_identity_delete">Bu kimlik birdəfəlik silinsin?</string>
-    <string name="title_pop">POP dəstəklənmir</string>
     <string name="title_edit_html">HTML kimi düzəliş et</string>
     <string name="title_synchronize_now">İndi eyniləşdir</string>
     <string name="title_delete_local">Yerli mesajları sil</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 8084ed7174..6a3389c5bc 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -93,7 +93,6 @@
     <string name="title_no_password">Falta la contrasenya</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_synchronize_now">Sincronitza ara</string>
     <string name="title_delete_local">Esborra els missatges locals</string>
     <string name="title_edit_properties">Edita les propietats</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 223d988050..77865609ad 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_setup_black_theme">Schwarzes Design</string>
     <string name="title_setup_system_theme">System Design</string>
     <string name="title_setup_defaults">Auf Standard zurücksetzen</string>
+    <string name="title_setup_options">Optionen</string>
     <string name="title_advanced">Erweiterte Optionen</string>
     <string name="title_advanced_section_general">Allgemeines</string>
     <string name="title_advanced_section_connection">Verbindung</string>
@@ -128,6 +129,7 @@
     <string name="title_advanced_html">Für bekannte Kontakte Mails automatisch im Original-Format anzeigen</string>
     <string name="title_advanced_images">Für bekannte Kontakte Bilder automatisch anzeigen</string>
     <string name="title_advanced_actionbar">Navigationsleiste in Konversationen</string>
+    <string name="title_advanced_notify_preview">Zeige die Nachrichten-Vorschau in den Benachrichtigungen</string>
     <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
     <string name="title_advanced_sound">Benachrichtigungston auswählen</string>
     <string name="title_advanced_pull_refresh">Zum Aktualisieren nach unten ziehen</string>
@@ -204,13 +206,16 @@
     <string name="title_no_inbox">Posteingang nicht gefunden</string>
     <string name="title_no_primary_drafts">Kein Hauptkonto oder kein Entwürfe-Ordner</string>
     <string name="title_no_idle">Dieser Anbieter unterstützt keine Pushnachrichten. Dies verzögert den Empfang neuer E-Mails und erhöht den Akkuverbrauch.</string>
+    <string name="title_no_move">Dieser Anbieter unterstützt das Verschieben nicht</string>
+    <string name="title_no_uidplus">Dieser Anbieter unterstützt UIDPLUS nicht</string>
     <string name="title_no_sync">Synchronisationsfehler seit %1$s</string>
     <string name="title_drafts_required">Ein Entwürfe-Ordner ist erforderlich, um Nachrichten zu senden</string>
     <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
     <string name="title_identity_delete">Möchten Sie diese Identität unwiderruflich löschen?</string>
-    <string name="title_pop">POP wird nicht unterstützt</string>
     <string name="title_edit_html">Als HTML bearbeiten</string>
     <string name="title_last_connected">Zuletzt verbunden: %1$s</string>
+    <string name="title_pop3_hint">POP3 hat erhebliche Einschränkungen, daher verwenden Sie bitte IMAP, falls möglich</string>
+    <string name="title_pop3_support">POP3 wird nicht unterstützt, siehe auch die FAQ</string>
     <string name="title_synchronize_now">Jetzt synchronisieren</string>
     <string name="title_delete_local">Lösche lokale Nachrichten</string>
     <string name="title_empty_trash">Papierkorb leeren</string>
@@ -264,7 +269,7 @@
     <string name="title_raw_save">Rohdaten speichern</string>
     <string name="title_manage_keywords">Schlagwörter verwalten</string>
     <string name="title_add_keyword">Schlagwort hinzufügen</string>
-    <string name="title_show_inline">In line-Anhänger anzeigen</string>
+    <string name="title_show_inline">Inline-Anhänge anzeigen</string>
     <string name="title_download_all">Alle herunterladen</string>
     <string name="title_save_all">Alles speichern</string>
     <string name="title_show_html">Original anzeigen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 9405bc39ea..f3e1c89206 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_setup_black_theme">Tema negro</string>
     <string name="title_setup_system_theme">Tema del sistema</string>
     <string name="title_setup_defaults">Restablecer ajustes por defecto</string>
+    <string name="title_setup_options">Opciones</string>
     <string name="title_advanced">Opciones avanzadas</string>
     <string name="title_advanced_section_general">General</string>
     <string name="title_advanced_section_connection">Conexión</string>
@@ -128,6 +129,7 @@
     <string name="title_advanced_html">Mostrar mensaje original automáticamente para contactos conocidos</string>
     <string name="title_advanced_images">Mostrar imágenes automáticamente para contactos conocidos</string>
     <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
+    <string name="title_advanced_notify_preview">Mostrar vista previa del mensaje en notificaciones</string>
     <string name="title_advanced_light">Usar luz de notificación</string>
     <string name="title_advanced_sound">Seleccionar sonido de notificación</string>
     <string name="title_advanced_pull_refresh">Tire hacia abajo para actualizar</string>
@@ -158,6 +160,7 @@
     <string name="title_identity_name">Su nombre</string>
     <string name="title_identity_email">Su dirección de correo electrónico</string>
     <string name="title_identity_reply_to">Responder a la dirección</string>
+    <string name="title_identity_plain_text">Enviar sólo texto plano</string>
     <string name="title_identity_read_receipt">Solicitar confirmación de lectura</string>
     <string name="title_identity_delivery_receipt">Solicitar confirmación de entrega</string>
     <string name="title_identity_receipt_remark">La mayoría de los proveedores ignoran las solicitudes de confirmación</string>
@@ -203,13 +206,15 @@
     <string name="title_no_inbox">Bandeja de entrada no encontrada</string>
     <string name="title_no_primary_drafts">No hay cuenta primaria o no hay carpeta de borradores</string>
     <string name="title_no_idle">Este proveedor no soporta mensajes PUSH. Esto retrasará la recepción de nuevos mensajes y aumentará el uso de batería.</string>
+    <string name="title_no_move">Este proveedor no soporta MOVE</string>
+    <string name="title_no_uidplus">Este proveedor no soporta UIDPLUS</string>
     <string name="title_no_sync">Errores de sincronización desde %1$s</string>
     <string name="title_drafts_required">Una carpeta de borradores es necesaria para enviar mensajes</string>
     <string name="title_account_delete">¿Eliminar esta cuenta permanentemente?</string>
     <string name="title_identity_delete">¿Eliminar esta identidad permanentemente?</string>
-    <string name="title_pop">POP no está soportado</string>
     <string name="title_edit_html">Editar como HTML</string>
     <string name="title_last_connected">Última conexión: %1$s</string>
+    <string name="title_pop3_hint">POP3 tiene limitaciones importantes, así que use IMAP siempre que sea posible</string>
     <string name="title_synchronize_now">Sincronizar ahora</string>
     <string name="title_delete_local">Eliminar mensajes locales</string>
     <string name="title_empty_trash">Vaciar papelera</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 550bc05f30..2334fd108d 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -177,7 +177,6 @@
     <string name="title_drafts_required">برای ارسال پیام‌ها به پوشه پیش‌نویس‌ها نیاز است</string>
     <string name="title_account_delete">حذف همیشگی این حساب؟</string>
     <string name="title_identity_delete">حذف همیشگی این هویت؟</string>
-    <string name="title_pop">POP پشتیبانی نمی‌شود</string>
     <string name="title_edit_html">ویرایش به صورت HTML</string>
     <string name="title_last_connected">آخرین اتصال: %1$s</string>
     <string name="title_synchronize_now">هم اکنون همگام سازی شود</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index a914c2b7ff..4dba3f8d7b 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_setup_black_theme">Thème noir</string>
     <string name="title_setup_system_theme">Thème système</string>
     <string name="title_setup_defaults">Rétablir les paramètres par défaut</string>
+    <string name="title_setup_options">Options</string>
     <string name="title_advanced">Options avancées</string>
     <string name="title_advanced_section_general">Général</string>
     <string name="title_advanced_section_connection">Connexion</string>
@@ -128,6 +129,7 @@
     <string name="title_advanced_html">Afficher automatiquement le message initial pour les contacts connus</string>
     <string name="title_advanced_images">Afficher automatiquement les images des contacts connus</string>
     <string name="title_advanced_actionbar">Barre d\'action de conversation</string>
+    <string name="title_advanced_notify_preview">Afficher l\'aperçu du message dans les notifications</string>
     <string name="title_advanced_light">Utiliser le voyant de notification</string>
     <string name="title_advanced_sound">Sélectionner le son pour les notifications</string>
     <string name="title_advanced_pull_refresh">Tirer vers le bas pour actualiser</string>
@@ -204,13 +206,16 @@
     <string name="title_no_inbox">Boîte de réception introuvable</string>
     <string name="title_no_primary_drafts">Pas de compte principal ou pas de dossier Brouillons</string>
     <string name="title_no_idle">Ce fournisseur ne gère pas les messages en mode push. Cela va retarder la réception de nouveaux messages et augmenter l\'utilisation de la batterie.</string>
+    <string name="title_no_move">Ce fournisseur ne prend pas en charge MOVE</string>
+    <string name="title_no_uidplus">Ce fournisseur ne prend pas en charge UIDPLUS</string>
     <string name="title_no_sync">Erreurs de synchronisation depuis %1$s</string>
     <string name="title_drafts_required">Un dossier brouillon est nécessaire pour envoyer des messages</string>
     <string name="title_account_delete">Supprimer définitivement ce compte ?</string>
     <string name="title_identity_delete">Supprimer définitivement cette identité ?</string>
-    <string name="title_pop">POP n\'est pas supporté</string>
     <string name="title_edit_html">Modifier en HTML</string>
     <string name="title_last_connected">Dernière connexion : %1$s</string>
+    <string name="title_pop3_hint">POP3 a des limitations significatives, donc utilisez IMAP si possible</string>
+    <string name="title_pop3_support">POP3 n\'est pas pris en charge, voir aussi la FAQ</string>
     <string name="title_synchronize_now">Synchroniser maintenant</string>
     <string name="title_delete_local">Supprimer les messages locaux</string>
     <string name="title_empty_trash">Vider la corbeille</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 5028df93cb..6fc9e5ca30 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_setup_black_theme">Tema nero</string>
     <string name="title_setup_system_theme">Tema di sistema</string>
     <string name="title_setup_defaults">Ripristina predefiniti</string>
+    <string name="title_setup_options">Opzioni</string>
     <string name="title_advanced">Opzioni avanzate</string>
     <string name="title_advanced_section_general">Generale</string>
     <string name="title_advanced_section_connection">Connessione</string>
@@ -128,6 +129,7 @@
     <string name="title_advanced_html">Mostra automaticamente il messaggio originale per i contatti conosciuti</string>
     <string name="title_advanced_images">Mostra automaticamente le immagini per i contatti conosciuti</string>
     <string name="title_advanced_actionbar">Barra di azione di conversazione</string>
+    <string name="title_advanced_notify_preview">Mostra anteprima messaggio nelle notifiche</string>
     <string name="title_advanced_light">Usa il led di notifica</string>
     <string name="title_advanced_sound">Seleziona il suono di notifica</string>
     <string name="title_advanced_pull_refresh">Trascina in basso per aggiornare</string>
@@ -158,6 +160,7 @@
     <string name="title_identity_name">Il tuo nome</string>
     <string name="title_identity_email">Il tuo indirizzo email</string>
     <string name="title_identity_reply_to">Rispondi all\'indirizzo</string>
+    <string name="title_identity_plain_text">Invia solo testo semplice</string>
     <string name="title_identity_read_receipt">Richiedi conferma di lettura</string>
     <string name="title_identity_delivery_receipt">Richiedi ricevuta di consegna</string>
     <string name="title_identity_receipt_remark">La maggior parte dei fornitori ignora le richieste di conferma</string>
@@ -203,13 +206,15 @@
     <string name="title_no_inbox">Posta in arrivo non trovata</string>
     <string name="title_no_primary_drafts">Nessun account principale o nessuna cartella bozze</string>
     <string name="title_no_idle">Questo fornitore non supporta i messaggi push. Ciò ritarderà la ricezione di nuovi messaggi e aumenterà l\'utilizzo della batteria.</string>
+    <string name="title_no_move">Questo provider non supporta MOVE</string>
+    <string name="title_no_uidplus">Questo provider non supporta UIDPLUS</string>
     <string name="title_no_sync">Errori di sincronizzazione da %1$s</string>
     <string name="title_drafts_required">Per inviare messaggi è necessaria una cartella bozze</string>
     <string name="title_account_delete">Eliminare questo account permanentemente?</string>
     <string name="title_identity_delete">Eliminare questa identità permanentemente?</string>
-    <string name="title_pop">POP non è supportato</string>
     <string name="title_edit_html">Modifica come HTML</string>
     <string name="title_last_connected">Ultima connessione:%1$s</string>
+    <string name="title_pop3_hint">POP3 ha limitazioni significative, quindi usa IMAP quando possibile</string>
     <string name="title_synchronize_now">Sincronizza ora</string>
     <string name="title_delete_local">Elimina i messaggi locali</string>
     <string name="title_empty_trash">Svuota cestino</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 24c20662f7..6895563fa7 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_setup_black_theme">Zwart thema</string>
     <string name="title_setup_system_theme">Systeem thema</string>
     <string name="title_setup_defaults">Verstekwaarden herstellen</string>
+    <string name="title_setup_options">Opties</string>
     <string name="title_advanced">Geavanceerde opties</string>
     <string name="title_advanced_section_general">Algemeen</string>
     <string name="title_advanced_section_connection">Verbinding</string>
@@ -205,13 +206,16 @@
     <string name="title_no_inbox">Postvak in niet gevonden</string>
     <string name="title_no_primary_drafts">Geen primair account of geen map voor concepten</string>
     <string name="title_no_idle">Deze provider biedt geen ondersteuning voor push-berichten. Dit zal het ontvangen van nieuwe berichten vertragen en het gebruik van de batterij te verhogen.</string>
+    <string name="title_no_move">Deze provider ondersteunt geen MOVE</string>
+    <string name="title_no_uidplus">Deze provider ondersteunt geen UIDPLUS</string>
     <string name="title_no_sync">Synchronisatiefouten sinds %1$s</string>
     <string name="title_drafts_required">Een concepten map is vereist om berichten te verzenden</string>
     <string name="title_account_delete">Verwijder dit account permanent?</string>
     <string name="title_identity_delete">Verwijder deze identiteit permanent?</string>
-    <string name="title_pop">POP wordt niet ondersteund</string>
     <string name="title_edit_html">Als HTML bewerken</string>
     <string name="title_last_connected">Laatst verbonden: %1$s</string>
+    <string name="title_pop3_hint">POP3 heeft aanzienlijke beperkingen, dus gebruik IMAP indien mogelijk</string>
+    <string name="title_pop3_support">POP3 wordt niet ondersteund, zie ook de FAQ</string>
     <string name="title_synchronize_now">Nu synchroniseren</string>
     <string name="title_delete_local">Verwijder lokale berichten</string>
     <string name="title_empty_trash">Prullenbak leegmaken</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 34f1af1aa3..5dcfce2a5c 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="app_welcome">FairEmail to aplikacja e-mail o otwartym kodzie źródłowym, koncentrująca się na prywatności i bezpieczeństwie. Z tego powodu niektóre funkcje mogą działać inaczej niż to, do czego jesteś przyzwyczajony.</string>
+    <string name="app_limitations">Przykładowo, wiadomości będą zawsze przeformatowane, aby usunąć niebezpieczne elementy i zwiększyć czytelność, a otwieranie linków musi być potwierdzane dla zachowania bezpieczeństwa.</string>
     <string name="channel_service">Usługa</string>
     <string name="channel_notification">Powiadomienia</string>
     <string name="channel_warning">Ostrzeżenia</string>
@@ -95,7 +96,12 @@
     <string name="title_setup_exported">Ustawienia wyeksportowane</string>
     <string name="title_setup_imported">Ustawienia zaimportowane</string>
     <string name="title_setup_quick">Szybkie ustawienia</string>
+    <string name="title_setup_quick_remark">Ustaw konto i tożsamość dla większości głównych dostawców poczty</string>
+    <string name="title_setup_go">Idż</string>
+    <string name="title_setup_setting_gmail">Włącz dostęp dla \"mniej bezpiecznych\" aplikacji do konta</string>
     <string name="title_setup_no_settings">Nie znaleziono ustawień dla \'%1$s\'</string>
+    <string name="title_setup_quick_success">Pomyślnie dodano konto i tożsamość</string>
+    <string name="title_setup_quick_failed">Możesz ustawić konto i tożsamość w krokach poniżej</string>
     <string name="title_setup_manage">Zarządzaj</string>
     <string name="title_setup_grant">Zezwól</string>
     <string name="title_setup_account">Skonfiguruj konta</string>
@@ -108,17 +114,20 @@
     <string name="title_setup_doze_remark">Do ciągłego sprawdzania e-mail (opcjonalnie)</string>
     <string name="title_setup_doze_instructions">W następnym oknie dialogowym, na górze wybierz \"Wszystkie aplikacje\", odszukaj i dotknij FairEmail, wybierz \"Nie optymalizuj\"</string>
     <string name="title_setup_data">Wyłącz oszczędzanie danych</string>
+    <string name="title_setup_inbox">Czytaj wiadomości</string>
     <string name="title_setup_notifications">Zarządzaj powiadomieniami</string>
     <string name="title_setup_to_do">Do zrobienia</string>
     <string name="title_setup_done">Gotowe</string>
     <string name="title_setup_light_theme">Jasny motyw</string>
     <string name="title_setup_dark_theme">Ciemny motyw</string>
     <string name="title_setup_black_theme">Czarny motyw</string>
+    <string name="title_setup_system_theme">Motyw systemu</string>
     <string name="title_setup_defaults">Przywróć domyślne</string>
     <string name="title_advanced">Opcje zaawansowane</string>
     <string name="title_advanced_section_general">Ogólne</string>
     <string name="title_advanced_section_connection">Połączenie</string>
     <string name="title_advanced_section_display">Wyświetlanie</string>
+    <string name="title_advanced_section_behavior">Zachowanie</string>
     <string name="title_advanced_section_misc">Różne</string>
     <string name="title_advanced_enabled">Synchronizuj</string>
     <string name="title_advanced_metered">Użyj połączeń taryfowych</string>
@@ -129,8 +138,11 @@
     <string name="title_advanced_threading">Konwersacje w wątkach</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_identicons">Pokazuje ikony kontaktów</string>
+    <string name="title_advanced_name_email">Pokaż nazwy i adresy e-mail</string>
     <string name="title_advanced_preview">Pokaż podgląd wiadomości</string>
     <string name="title_advanced_addresses">Domyślnie pokazuj szczegóły adresu</string>
+    <string name="title_advanced_html">Automatycznie pokaż oryginalną wiadomość dla znanych kontaktów</string>
+    <string name="title_advanced_images">Automatycznie pokaż obrazki dla znanych kontaktów</string>
     <string name="title_advanced_light">Użyj diody powiadomień</string>
     <string name="title_advanced_sound">Wybierz dźwięk powiadomienia</string>
     <string name="title_advanced_pull_refresh">Pociągnij w dół, aby odświeżyć</string>
@@ -190,7 +202,6 @@
     <string name="title_no_sync">Błędy synchornizacji od %1$s</string>
     <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
     <string name="title_identity_delete">Usunąć tożsamość bezpowrotnie?</string>
-    <string name="title_pop">POP nie jest wspierane</string>
     <string name="title_edit_html">Edytuj jako HTML</string>
     <string name="title_last_connected">Ostatnio połączony: %1$s</string>
     <string name="title_synchronize_now">Synchronizuj teraz</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8164b70543..052066d031 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_setup_imported">Configurações importadas</string>
     <string name="title_setup_quick">Configuração rápida</string>
     <string name="title_setup_quick_remark">Configurar rapidamente uma conta e uma identidade para a maioria dos principais serviços/provedores</string>
-    <string name="title_setup_go">OK</string>
+    <string name="title_setup_go">Ir</string>
     <string name="title_setup_setting_gmail">Permitir o acesso para apps \"menos seguros\"</string>
     <string name="title_setup_no_settings">Nenhuma configuração encontrada para \'%1$s\'</string>
     <string name="title_setup_quick_success">Uma conta e uma identidade foram adicionados com sucesso</string>
@@ -107,6 +107,7 @@
     <string name="title_setup_black_theme">Tema escuro</string>
     <string name="title_setup_system_theme">Tema do sistema</string>
     <string name="title_setup_defaults">Restaurar padrão</string>
+    <string name="title_setup_options">Opções</string>
     <string name="title_advanced">Opções avançadas</string>
     <string name="title_advanced_section_general">Geral</string>
     <string name="title_advanced_section_connection">Conexão</string>
@@ -122,24 +123,60 @@
     <string name="title_advanced_threading">Encadeamento de conversas</string>
     <string name="title_advanced_avatars">Mostrar fotos de contatos</string>
     <string name="title_advanced_identicons">Mostrar identicons</string>
+    <string name="title_advanced_name_email">Mostrar os nomes e endereços de e-mail</string>
     <string name="title_advanced_preview">Mostrar pré-visualização da mensagem</string>
     <string name="title_advanced_addresses">Mostrar detalhes do endereço por padrão</string>
     <string name="title_advanced_html">Mostrar automaticamente a mensagem original para contatos conhecidos</string>
+    <string name="title_advanced_images">Mostrar automaticamente imagens para contatos conhecidos</string>
+    <string name="title_advanced_actionbar">Barra de ação de conversa</string>
+    <string name="title_advanced_notify_preview">Mostrar pré-visualização de mensagem nas notificações</string>
+    <string name="title_advanced_light">Usar luz de notificação</string>
+    <string name="title_advanced_sound">Selecionar som de notificação</string>
+    <string name="title_advanced_pull_refresh">Puxe para baixo para atualizar</string>
+    <string name="title_advanced_autoexpand">Expandir mensagens automaticamente</string>
+    <string name="title_advanced_autoclose">Fechar conversas automaticamente</string>
+    <string name="title_advanced_swipenav">Deslize para a esquerda/direita para ir para próxima/anterior conversa</string>
+    <string name="title_advanced_autonext">Ir para a próxima conversa automaticamente ao fechar a conversa</string>
+    <string name="title_advanced_autoread">Marcar mensagens como lidas automaticamente ao movê-las</string>
+    <string name="title_advanced_collapse">Recolher mensagens em conversas ao \'voltar\'</string>
+    <string name="title_advanced_automove">Confirmar ao mover mensagens</string>
+    <string name="title_advanced_confirm">Confirme as ações que podem vazar informações confidenciais</string>
+    <string name="title_advanced_sender">Permitir editar o endereço do remetente</string>
+    <string name="title_advanced_autoresize">Redimensionar as imagens automaticamente para exibir em telas</string>
+    <string name="title_advanced_autosend">Confirmar o envio de mensagens</string>
     <string name="title_advanced_updates">Procurar por atualizações</string>
+    <string name="title_advanced_debug">Modo de depuração</string>
+    <string name="title_advanced_enabled_hint">Desative ou habilite o recebimento e envio de mensagens globalmente</string>
+    <string name="title_advanced_metered_hint">Conexões limitadas são geralmente conexões móveis ou hotspots Wi-Fi pagos</string>
+    <string name="title_advanced_browse_hint">Obter mais mensagens ao rolar para baixo</string>
+    <string name="title_advanced_unified_hint">Mostrar as pastas da caixa de entrada unificada ou as mensagens da caixa de entrada unificada</string>
+    <string name="title_advanced_threading_hint">Agrupe as mensagens relacionadas entre si</string>
+    <string name="title_advanced_name_email_hint">Quando desativado apenas os nomes serão exibidos quando disponíveis</string>
+    <string name="title_advanced_preview_hint">Somente disponível quando o texto da mensagem for baixado</string>
+    <string name="title_advanced_autoexpand_hint">Abrir automaticamente a mensagem quando há apenas uma mensagem ou uma mensagem não-lida em uma conversa</string>
+    <string name="title_advanced_autoclose_hint">Fechar automaticamente conversas quando todas as mensagens estiverem arquivadas, enviadas ou na lixeira</string>
+    <string name="title_advanced_sender_hint">A maioria dos provedores não permite endereços de remetente modificados</string>
     <string name="title_select">Selecionar &#8230;</string>
     <string name="title_identity_name">Seu nome</string>
     <string name="title_identity_email">Seu endereço de e-mail</string>
     <string name="title_identity_reply_to">Resposta para o endereço</string>
+    <string name="title_identity_plain_text">Enviar apenas em texto simples</string>
     <string name="title_identity_read_receipt">Solicitar recibo de leitura</string>
     <string name="title_identity_delivery_receipt">Solicitar recibo de entrega</string>
     <string name="title_identity_receipt_remark">A maioria dos provedores ignoram solicitações de recebimento</string>
+    <string name="title_identity_store_sent">Armazenar mensagens enviadas</string>
+    <string name="title_identity_store_sent_remark">Habilitar isto somente se seu provedor de e-mail não armazena automaticamente mensagens enviadas</string>
     <string name="title_optional">Opcional</string>
     <string name="title_account_linked">Conta vinculada</string>
     <string name="title_account_name">Nome da conta</string>
     <string name="title_account_name_hint">Usada para diferenciar pastas</string>
+    <string name="title_account_prefix">Prefixo de Namespace</string>
+    <string name="title_account_prefix_hint">Usado para simplificar os nomes de pasta</string>
     <string name="title_account_signature">Texto da assinatura</string>
     <string name="title_account_color">Cor</string>
     <string name="title_account_notify">Notificações separadas</string>
+    <string name="title_account_left">Deslize para esquerda</string>
+    <string name="title_account_right">Deslizar para direita</string>
     <string name="title_domain">Nome do domínio</string>
     <string name="title_autoconfig">Obter configurações</string>
     <string name="title_provider">Provedor</string>
@@ -149,12 +186,15 @@
     <string name="title_port">Número da porta</string>
     <string name="title_user">Nome de usuário</string>
     <string name="title_password">Senha</string>
+    <string name="title_realm">Domínio</string>
     <string name="title_authorize">Selecionar conta</string>
     <string name="title_authorizing">Autorizando a conta &#8230;</string>
     <string name="title_setup_advanced">Avançado</string>
     <string name="title_synchronize_account">Sincronizar (receber mensagens)</string>
     <string name="title_synchronize_identity">Sincronizar (enviar mensagens)</string>
+    <string name="title_primary_account">Principal (identidade padrão)</string>
     <string name="title_primary_identity">Primária (identidade padrão)</string>
+    <string name="title_keep_alive_interval">Intervalo de manutenção da conexão (minutos)</string>
     <string name="title_check">Verificar</string>
     <string name="title_no_name">Nome ausente</string>
     <string name="title_no_email">Endereço de e-mail ausente</string>
@@ -163,18 +203,43 @@
     <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_inbox">Caixa de entrada não encontrada</string>
     <string name="title_no_primary_drafts">Nenhuma conta primária ou pasta de rascunhos</string>
+    <string name="title_no_idle">Este provedor não suporta mensagens push. Isso irá atrasar o recebimento de novas mensagens e aumentar o uso da bateria.</string>
+    <string name="title_no_move">Este provedor de e-mail não dá suporte a opção MOVER</string>
+    <string name="title_no_uidplus">Este provedor de e-mail não dá suporte a UIDPLUS</string>
+    <string name="title_no_sync">Erros de sincronização desde %1$s</string>
+    <string name="title_drafts_required">Uma pasta de rascunhos é necessário para enviar mensagens</string>
     <string name="title_account_delete">Excluir esta conta permanentemente?</string>
     <string name="title_identity_delete">Excluir esta identidade permanentemente?</string>
-    <string name="title_pop">POP não é suportado</string>
+    <string name="title_edit_html">Editar como HTML</string>
+    <string name="title_last_connected">Última vez conectado: %1$s</string>
+    <string name="title_pop3_hint">POP3 tem limitações significativas, então use IMAP sempre que possível</string>
     <string name="title_synchronize_now">Sincronizar agora</string>
     <string name="title_delete_local">Excluir mensagens locais</string>
+    <string name="title_empty_trash">Esvaziar lixeira</string>
     <string name="title_edit_properties">Editar propriedades</string>
+    <string name="title_edit_rules">Editar regras</string>
+    <string name="title_empty_trash_ask">Excluir todas as mensagens na lixeira permanentemente?</string>
+    <string name="title_delete_operation">Excluir operações com uma mensagem de erro?</string>
+    <string name="title_no_operations">Nenhuma operação pendente</string>
     <string name="title_folder_name">Nome da pasta</string>
     <string name="title_display_name">Nome de exibição</string>
+    <string name="title_hide_folders">Ocultar pastas ocultas</string>
+    <string name="title_show_folders">Mostrar pastas ocultas</string>
+    <string name="title_hide_folder">Ocultar da lista</string>
+    <string name="title_unified_folder">Mostrar na caixa de entrada unificada</string>
     <string name="title_synchronize_folder">Sincronizar (receber mensagens)</string>
+    <string name="title_poll_folder">Verificar periodicamente ao invés da sincronização contínua</string>
+    <string name="title_download_folder">Baixar automaticamente textos e anexos de mensagem</string>
     <string name="title_notify_folder">Notificar novas mensagens</string>
+    <string name="title_sync_days">Sincronizar as mensagens (dias)</string>
+    <string name="title_sync_days_remark">O aumento deste valor aumentará o uso da bateria e o uso de dados</string>
+    <string name="title_keep_days">Manter mensagens (dias)</string>
     <string name="title_keep_all">Manter todas as mensagens</string>
+    <string name="title_folder_name_missing">Nome da pasta faltando</string>
+    <string name="title_folder_exists">A pasta %1$s já existe</string>
+    <string name="title_folder_delete">Excluir permanentemente esta pasta e quaisquer mensagens que ela contenha?</string>
     <string name="title_folder_unified">Caixa de entrada unificada</string>
     <string name="title_folder_inbox">Caixa de entrada</string>
     <string name="title_folder_outbox">Caixa de saída</string>
@@ -185,6 +250,9 @@
     <string name="title_folder_sent">Enviado</string>
     <string name="title_folder_system">Sistema</string>
     <string name="title_folder_user">Usuário</string>
+    <string name="title_folder_primary">Conta principal de pastas</string>
+    <string name="title_folder_thread">Conversa %1$s</string>
+    <string name="title_folders_unified">Pastas de caixa de entrada unificada</string>
     <string name="title_no_messages">Sem mensagens</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Enc: %1$s</string>
@@ -194,7 +262,9 @@
     <string name="title_unflag">Remover estrela</string>
     <string name="title_forward">Encaminhar</string>
     <string name="title_reply_all">Responder a todos</string>
+    <string name="title_share">Compartilhar</string>
     <string name="title_show_headers">Mostrar cabeçalhos</string>
+    <string name="title_raw_download">Baixar mensagem bruta</string>
     <string name="title_manage_keywords">Gerenciar palavras-chave</string>
     <string name="title_add_keyword">Adicionar palavra-chave</string>
     <string name="title_show_html">Mostrar original</string>
@@ -239,42 +309,99 @@
     <string name="title_search">Pesquisar</string>
     <string name="title_search_hint">Pesquisar no servidor</string>
     <string name="title_sort_on">Ordenar por</string>
+    <string name="title_sort_on_time">Data</string>
     <string name="title_sort_on_unread">Não lida</string>
     <string name="title_sort_on_starred">Com estrela</string>
     <string name="title_sort_on_sender">Remetente</string>
+    <string name="title_compact">Visualização compacta</string>
     <string name="title_zoom">Tamanho do texto</string>
     <string name="title_address_sent">Enviado:</string>
     <string name="title_address_unsent">Não enviado:</string>
     <string name="title_address_invalid">Inválido:</string>
+    <string name="title_snoozed">Adiado</string>
     <string name="title_previous">Voltar</string>
     <string name="title_next">Avançar</string>
+    <string name="title_rule_enabled">Ativado</string>
+    <string name="title_rule_stop">Parar processamento</string>
+    <string name="title_rule_sender">Remetente contém</string>
+    <string name="title_rule_subject">Assunto contém</string>
+    <string name="title_rule_header">Cabeçalho contém</string>
+    <string name="title_rule_regex">Regex</string>
+    <string name="title_rule_and">E</string>
+    <string name="title_rule_action">Ação</string>
+    <string name="title_rule_action_remark">Esta ação será aplicada a novas mensagens que chegam no pasta %1$s</string>
+    <string name="title_rule_folder">Pasta</string>
+    <string name="title_rule_identity">Identidade</string>
+    <string name="title_rule_answer">Modelo de resposta</string>
+    <string name="title_rule_name_missing">Nome da regra faltando</string>
+    <string name="title_rule_condition_missing">Condição faltando</string>
     <string name="title_action_seen">Marcar como lida</string>
     <string name="title_action_archive">Arquivo</string>
     <string name="title_action_trash">Lixeira</string>
     <string name="title_legend_inbox">Caixa de entrada</string>
     <string name="title_legend_archive">Arquivo</string>
     <string name="title_legend_trash">Lixeira</string>
+    <string name="title_legend_junk">Spam</string>
     <string name="title_legend_notify">Notificar novas mensagens</string>
+    <string name="title_legend_unified">Caixa de entrada unificada</string>
     <string name="title_legend_primary_disconnected">Conta desconectada</string>
     <string name="title_legend_primary_connected">Conta conectada</string>
     <string name="title_legend_thread">Conversação</string>
+    <string name="title_legend_zoom">Alterar tamanho do texto</string>
+    <string name="title_legend_draft">Existe um rascunho</string>
+    <string name="title_legend_snoozed">Está adiado</string>
+    <string name="title_legend_browsed">Já acessado ou pesquisado</string>
+    <string name="title_legend_answered">Foi respondido</string>
+    <string name="title_legend_attachment">Possui anexo</string>
+    <string name="title_legend_flagged">Possui estrela</string>
+    <string name="title_legend_contacts">Gerenciar contatos</string>
     <string name="title_legend_view">Ver conteúdo</string>
     <string name="title_legend_download">Baixar conteúdo</string>
-    <string name="title_legend_broken_image">Imagem quebrada</string>
+    <string name="title_legend_external_image">Espaço reservado a uma imagem externa</string>
+    <string name="title_legend_embedded_image">Espaço reservado a uma imagem embutida</string>
+    <string name="title_legend_broken_image">Imagem com erros</string>
+    <string name="title_legend_cc">Mostrar CC/CCO</string>
+    <string name="title_legend_pick">Escolher contato</string>
+    <string name="title_legend_bold">Colocar o texto em negrito</string>
+    <string name="title_legend_italic">Colocar o texto em itálico</string>
+    <string name="title_legend_link">Inserir link</string>
+    <string name="title_legend_picture">Inserir uma imagem</string>
+    <string name="title_legend_file">Anexar arquivo</string>
+    <string name="title_legend_download_off">Baixar conteúdo da mensagem sob demanda </string>
+    <string name="title_legend_download_on">Baixar conteúdo de mensagem automaticamente</string>
+    <string name="title_legend_synchronize_on">Sincronização ligada</string>
+    <string name="title_legend_synchronize_off">Sincronização desligada</string>
+    <string name="title_legend_primary">Principal</string>
     <string name="title_legend_disconnected">Desconectado</string>
     <string name="title_legend_connecting">Conectando</string>
     <string name="title_legend_connected">Conectado</string>
     <string name="title_legend_synchronizing">Sincronizando</string>
     <string name="title_legend_downloading">Baixando</string>
     <string name="title_legend_closing">Fechando</string>
+    <string name="title_legend_waiting">Aguardando a próxima sincronização</string>
+    <string name="title_legend_stop">Parar o processamento de regras</string>
+    <string name="title_legend_sync_keep">Número de dias para sincronizar / manter mensagens</string>
+    <string name="title_legend_download_fetch">Número de corpos de mensagens baixadas / cabeçalhos obtidos</string>
+    <string name="title_legend_metered">A conexão é limitada</string>
+    <string name="title_legend_unmetered">A conexão é ilimitada</string>
+    <string name="title_hint_folder_actions">Mantenha pressionado para mais opções</string>
+    <string name="title_hint_folder_sync">Para limitar o uso de bateria e de rede nem todas as pastas e mensagens serão sincronizadas por padrão</string>
+    <string name="title_hint_support">Se você tiver uma pergunta ou um problema, por favor, use o menu de suporte para obter ajuda</string>
+    <string name="title_hint_message_actions">Deslize para a esquerda para mandar para lixeira; deslize para a direita para arquivar (se disponível)</string>
+    <string name="title_hint_message_selection">Pressione longamente uma mensagem para começar a selecionar várias mensagens</string>
+    <string name="title_hint_sync">Baixar mensagens pode levar algum tempo, dependendo da velocidade do provedor, da conexão de internet e do dispositivo, e o número de mensagens. Enquanto estiver baixando as mensagens o app pode responder mais devagar.</string>
     <string name="title_open_link">Abrir link</string>
     <string name="title_select_app">Selecionar app</string>
+    <string name="title_updated">Há uma atualização para a versão %1$s disponível</string>
+    <string name="title_issue">Você está com alguma dúvida ou algum problema?</string>
     <string name="title_yes">Sim</string>
     <string name="title_no">Não</string>
     <string name="title_undo">Desfazer</string>
     <string name="title_add">Adicionar</string>
     <string name="title_browse">Navegar</string>
+    <string name="title_info">Informações</string>
     <string name="title_report">Reportar</string>
+    <string name="title_no_ask_again">Não perguntar novamente</string>
     <string name="title_pro_purchase">Comprar</string>
     <string name="title_debug_info">Informações de depuração</string>
     <string name="title_debug_info_remark">Por favor, descreva o problema e indique o momento em que ocorrera:</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index ac9348e749..9f4adeab7a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -115,6 +115,7 @@
     <string name="title_setup_black_theme">Temă neagră</string>
     <string name="title_setup_system_theme">Temă de sistem</string>
     <string name="title_setup_defaults">Restabiliți valorile implicite</string>
+    <string name="title_setup_options">Opţiuni</string>
     <string name="title_advanced">Opțiuni avansate</string>
     <string name="title_advanced_section_general">Generale</string>
     <string name="title_advanced_section_connection">Conexiune</string>
@@ -136,6 +137,7 @@
     <string name="title_advanced_html">Arată în mod automat imaginile originale pentru contactele cunoscute</string>
     <string name="title_advanced_images">Arată în mod automat imaginile pentru contactele cunoscute</string>
     <string name="title_advanced_actionbar">Bara de acțiuni corversație</string>
+    <string name="title_advanced_notify_preview">Arată previzualizare mesaj în notificare</string>
     <string name="title_advanced_light">Folosire LED de notificare</string>
     <string name="title_advanced_sound">Selectare sunet de notificare</string>
     <string name="title_advanced_pull_refresh">Trageți în jos pentru a actualiza</string>
@@ -166,6 +168,7 @@
     <string name="title_identity_name">Numele dumneavoastră</string>
     <string name="title_identity_email">Adresa dvs. de e-mail</string>
     <string name="title_identity_reply_to">Răspuns la adresa</string>
+    <string name="title_identity_plain_text">Trimite numai text simplu</string>
     <string name="title_identity_read_receipt">Solicitare confirmare citire</string>
     <string name="title_identity_delivery_receipt">Solicitare confirmare livrare</string>
     <string name="title_identity_receipt_remark">Majoritatea furnizorilor ignoră cererile de confirmare a livrării</string>
@@ -211,11 +214,12 @@
     <string name="title_no_inbox">Căsuța poștală nu a fost găsită</string>
     <string name="title_no_primary_drafts">Nici un cont principal sau nici un dosar pentru ciorne</string>
     <string name="title_no_idle">Acest furnizor de servicii e-mail nu suporta mesaje push. Acest fapt va duce la întârzierea recepției mesajelor și un consum mai mare al bateriei.</string>
+    <string name="title_no_move">Acest furnizor nu suportă MOVE</string>
+    <string name="title_no_uidplus">Acest furnizor nu suportă UIDPLUS</string>
     <string name="title_no_sync">Erori de sincronizare începând cu %1$s</string>
     <string name="title_drafts_required">Un dosar de ciorne este necesar pentru a trimite mesaje</string>
     <string name="title_account_delete">Ștergeți definitiv acest cont?</string>
     <string name="title_identity_delete">Ștergeți definitiv această identitate?</string>
-    <string name="title_pop">POP nu este acceptat</string>
     <string name="title_edit_html">Editează ca HTML</string>
     <string name="title_last_connected">Ultima conectare: %1$s</string>
     <string name="title_synchronize_now">Sincronizează acum</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 12234aa192..6fd86349fc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -123,6 +123,7 @@
     <string name="title_setup_black_theme">Чёрная тема</string>
     <string name="title_setup_system_theme">Системная тема</string>
     <string name="title_setup_defaults">Восстановить настройки по умолчанию</string>
+    <string name="title_setup_options">Опции</string>
     <string name="title_advanced">Дополнительные опции</string>
     <string name="title_advanced_section_general">Общее</string>
     <string name="title_advanced_section_connection">Соединение</string>
@@ -144,6 +145,7 @@
     <string name="title_advanced_html">Автоматически показывать исходное сообщение для известных контактов</string>
     <string name="title_advanced_images">Автоматически показывать изображения для известных контактов</string>
     <string name="title_advanced_actionbar">Панель управления диалогами</string>
+    <string name="title_advanced_notify_preview">Предпросмотр сообщений в уведомлениях</string>
     <string name="title_advanced_light">Использовать индикатор уведомлений</string>
     <string name="title_advanced_sound">Выбрать звук уведомления</string>
     <string name="title_advanced_pull_refresh">Потяните вниз, для обновления</string>
@@ -220,13 +222,16 @@
     <string name="title_no_inbox">Папка \"Входящие\" не найдена</string>
     <string name="title_no_primary_drafts">Нет основной учетной записи или папки черновиков</string>
     <string name="title_no_idle">Этот провайдер не поддерживает push-сообщения. Это задержит прием новых сообщений и увеличит расход батареи.</string>
+    <string name="title_no_move">Этот провайдер не поддерживает MOVE</string>
+    <string name="title_no_uidplus">Этот провайдер не поддерживает UIDPLUS</string>
     <string name="title_no_sync">Ошибки синхронизации после %1$s</string>
     <string name="title_drafts_required">Для отправки сообщений требуется папка черновиков</string>
     <string name="title_account_delete">Удалить эту учетную запись навсегда?</string>
     <string name="title_identity_delete">Удалить эту учетную запись навсегда?</string>
-    <string name="title_pop">POP не поддерживается</string>
     <string name="title_edit_html">Редактировать как HTML</string>
     <string name="title_last_connected">Последнее подключение: %1$s</string>
+    <string name="title_pop3_hint">POP3 имеет значительные ограничения, поэтому используйте IMAP, когда это возможно</string>
+    <string name="title_pop3_support">POP3 не поддерживается, см. также FAQ</string>
     <string name="title_synchronize_now">Синхронизировать сейчас</string>
     <string name="title_delete_local">Удалить локальные сообщения</string>
     <string name="title_empty_trash">Очистить корзину</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 6d2e8452e0..1c435e8263 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -105,6 +105,7 @@
     <string name="title_setup_light_theme">Ljust tema</string>
     <string name="title_setup_dark_theme">Mörkt tema</string>
     <string name="title_setup_black_theme">Svart Tema</string>
+    <string name="title_setup_system_theme">Systemtema</string>
     <string name="title_setup_defaults">Återställ standardvärden</string>
     <string name="title_advanced">Avancerade inställningar</string>
     <string name="title_advanced_section_general">Allmänt</string>
@@ -121,6 +122,7 @@
     <string name="title_advanced_threading">Konversationstrådar</string>
     <string name="title_advanced_avatars">Visa kontaktfoton</string>
     <string name="title_advanced_identicons">Visa identicons</string>
+    <string name="title_advanced_name_email">Visa namn och e-postadresser</string>
     <string name="title_advanced_preview">Förhandsvisning av meddelande</string>
     <string name="title_advanced_addresses">Visa adressuppgifter som standard</string>
     <string name="title_advanced_images">Visa bilder automatiskt för kända kontakter</string>
@@ -130,6 +132,7 @@
     <string name="title_advanced_pull_refresh">Dra ner för att uppdatera</string>
     <string name="title_advanced_autoexpand">Utöka meddelanden automatiskt</string>
     <string name="title_advanced_autoclose">Stäng konversationer automatiskt</string>
+    <string name="title_advanced_swipenav">Svep vänster/höger för att gå till nästa/föregående konversation</string>
     <string name="title_advanced_autonext">Gå automatiskt till nästa konversation vid stängning av konversation</string>
     <string name="title_advanced_autoread">Märk automatiskt meddelanden som lästa vid flyttning av meddelanden</string>
     <string name="title_advanced_collapse">Kollapsa meddelanden i konversationer på \"tillbaka\"</string>
@@ -197,7 +200,6 @@
     <string name="title_no_sync">Synkroniseringsfel sedan %1$s</string>
     <string name="title_account_delete">Ta bort detta konto permanent?</string>
     <string name="title_identity_delete">Ta bort denna identitet permanent?</string>
-    <string name="title_pop">POP stöds inte</string>
     <string name="title_edit_html">Redigera som HTML</string>
     <string name="title_last_connected">Senast ansluten: %1$s</string>
     <string name="title_synchronize_now">Synkronisera nu</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index dfbcd9f40c..47ebffe456 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -205,7 +205,6 @@
     <string name="title_drafts_required">İleti göndermek için taslaklar klasörü gerekir</string>
     <string name="title_account_delete">Bu hesap kalıcı olarak silinsin mi?</string>
     <string name="title_identity_delete">Bu kimlik kalıcı olarak silinsin mi?</string>
-    <string name="title_pop">POP desteklenmiyor</string>
     <string name="title_edit_html">HTML olarak düzenle</string>
     <string name="title_last_connected">Son bağlantı: %1$s</string>
     <string name="title_synchronize_now">Şimdi senkronize et</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5e933b76a9..820c797532 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -93,6 +93,7 @@
     <string name="title_setup_black_theme">黑色主题</string>
     <string name="title_setup_system_theme">系统主题</string>
     <string name="title_setup_defaults">恢复默认设置</string>
+    <string name="title_setup_options">选项</string>
     <string name="title_advanced">高级选项</string>
     <string name="title_advanced_section_general">常规​​​​​</string>
     <string name="title_advanced_section_connection">连接</string>
@@ -114,6 +115,7 @@
     <string name="title_advanced_html">自动显示已知联系人的原始消息</string>
     <string name="title_advanced_images">自动显示来自已知联系人邮件中的图片</string>
     <string name="title_advanced_actionbar">对话操作栏</string>
+    <string name="title_advanced_notify_preview">通知中显示消息预览</string>
     <string name="title_advanced_light">使用指示灯</string>
     <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_pull_refresh">下拉刷新</string>
@@ -144,6 +146,7 @@
     <string name="title_identity_name">姓名</string>
     <string name="title_identity_email">电子邮件地址</string>
     <string name="title_identity_reply_to">回复地址</string>
+    <string name="title_identity_plain_text">仅发送纯文本</string>
     <string name="title_identity_read_receipt">请求读取回执</string>
     <string name="title_identity_delivery_receipt">请求发出凭据</string>
     <string name="title_identity_receipt_remark">大部份提供商忽略接收请求</string>
@@ -189,12 +192,15 @@
     <string name="title_no_inbox">未找到收件箱</string>
     <string name="title_no_primary_drafts">没有主帐户或草稿文件夹</string>
     <string name="title_no_idle">该提供商不支持消息推送，这将延迟新消息的接收并增加电池用量</string>
+    <string name="title_no_move">该邮件服务供应商不支持MOVE扩展</string>
+    <string name="title_no_uidplus">该邮件服务供应商不支持UIDPLUS扩展</string>
     <string name="title_drafts_required">需要一个草稿文件夹来发送消息</string>
     <string name="title_account_delete">确定永久删除这个账户吗？</string>
     <string name="title_identity_delete">确定永久删除这个身份吗？</string>
-    <string name="title_pop">不支持POP</string>
     <string name="title_edit_html">以 html 格式编辑</string>
     <string name="title_last_connected">上次连接%1$s前</string>
+    <string name="title_pop3_hint">POP3协议有很大局限性，因此尽可能使用 IMAP</string>
+    <string name="title_pop3_support">不支持POP3协议，另见FAQ</string>
     <string name="title_synchronize_now">现在同步</string>
     <string name="title_delete_local">删除本地消息</string>
     <string name="title_empty_trash">清空垃圾箱</string>
@@ -424,7 +430,7 @@
     <string name="title_no_ask_again">别再询问</string>
     <string name="title_no_adobe">Adobe Acrobat 阅读器无法安全打开共享的文件，请参阅FAQ 以获取更多信息</string>
     <string name="title_no_body">没有找到消息文本</string>
-    <string name="title_no_charset">不支持的编码</string>
+    <string name="title_no_charset">不支持的编码: %1$s</string>
     <string name="title_try">请试下FairEmail吧！一个安卓平台上开源、隐私友好的邮件客户端</string>
     <string name="title_pro_feature">这是专业版功能</string>
     <string name="title_pro_list">专业版功能列表</string>