diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 10dccb3b94..b7a5ab1ffb 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -155,6 +155,7 @@
     <string name="title_advanced_threading">Vlákna konverzací</string>
     <string name="title_advanced_avatars">Zobrazit fotografie kontaktů</string>
     <string name="title_advanced_identicons">Zobrazit identikony</string>
+    <string name="title_advanced_circular">Použít kulaté ikony</string>
     <string name="title_advanced_name_email">Zobrazit jména a e-mailové adresy</string>
     <string name="title_advanced_subject_italic">Zobrazit předmět kurzívou</string>
     <string name="title_advanced_flags">Zobrazit hvězdičky (oblíbené)</string>
@@ -178,6 +179,7 @@
     <string name="title_advanced_prefix_once">Přidat do předmětu pouze jednu předponu při odpovídání nebo přeposílání</string>
     <string name="title_advanced_autosend">Potvrzovat odesílání zpráv</string>
     <string name="title_advanced_badge">Zobrazit počet nových zpráv na ikoně aplikace</string>
+    <string name="title_advanced_subscriptions">Spravovat odběry složek</string>
     <string name="title_advanced_notify_preview">Zobrazit náhled zprávy v oznámení</string>
     <string name="title_advanced_search_local">Externí hledání na zařízení</string>
     <string name="title_advanced_light">Použít oznamovací LED</string>
@@ -187,6 +189,7 @@
     <string name="title_advanced_paranoid">Doplňující funkce ochrany soukromí</string>
     <string name="title_advanced_updates">Kontrolovat aktualizace</string>
     <string name="title_advanced_debug">Režim ladění</string>
+    <string name="title_advanced_last_cleanup">Poslední čištění: %1$s</string>
     <string name="title_advanced_enabled_hint">Globálně zakáže nebo povolí přijímání a odesílání zpráv</string>
     <string name="title_advanced_schedule_hint">Dotkněte se času pro jeho změnu</string>
     <string name="title_advanced_metered_hint">Účtovaná připojení jsou obecně mobilní připojení nebo placené Wi-Fi hotspoty</string>
@@ -195,6 +198,7 @@
     <string name="title_advanced_threading_hint">Seskupit zprávy které spolu souvisí</string>
     <string name="title_advanced_name_email_hint">Při deaktivaci se zobrazí pouze jména, pokud budou k dispozici</string>
     <string name="title_advanced_flags_hint">Mějte na paměti, že zprávy s hvězdičkou budou vždy uchovávány lokálně</string>
+    <string name="title_advanced_subscriptions_hint">Složky bez přihlášeného odběru budou skryty</string>
     <string name="title_advanced_preview_hint">K dispozici pouze pokud byl stažen text zprávy</string>
     <string name="title_advanced_autoexpand_hint">Automaticky otevřít zprávu pokud je v konverzaci pouze jediná zpráva nebo jediná nepřečtená</string>
     <string name="title_advanced_autocollapse_hint">Vícero rozbalených zpráv bude vždy sbaleno při pohybu zpět</string>
@@ -331,6 +335,7 @@
     <string name="title_show_html">Zobrazit původní</string>
     <string name="title_trash">Koš</string>
     <string name="title_copy">Kopírovat &#8230;</string>
+    <string name="title_subscribe">Přihlásit odběr</string>
     <string name="title_delete">Smazat</string>
     <string name="title_more">Více</string>
     <string name="title_spam">Nevyžádané</string>
@@ -411,6 +416,7 @@
     <string name="title_search_hint">Hledat na serveru</string>
     <string name="title_search_device">Hledat v zařízení</string>
     <string name="title_searching">Hledám \"%1$s\"</string>
+    <string name="title_reset_order">Obnovit pořadí</string>
     <string name="title_sort_on">Řadit dle</string>
     <string name="title_sort_on_time">Čas</string>
     <string name="title_sort_on_unread">Nepřečteno</string>
@@ -462,6 +468,7 @@
     <string name="title_legend_trash">Koš</string>
     <string name="title_legend_junk">Nevyžádaná</string>
     <string name="title_legend_notify">Oznamovat nové zprávy</string>
+    <string name="title_legend_subscribed">Přihlášen k odběru</string>
     <string name="title_legend_unified">Sjednocené doručené / hlavní účet</string>
     <string name="title_legend_primary_disconnected">Účet odpojen</string>
     <string name="title_legend_primary_connected">Účet připojen</string>
@@ -529,7 +536,6 @@
     <string name="title_hint_tracking_image">Sledovací obrázek %1$sx%2$s px</string>
     <string name="title_hint_ignore_contact">Dlouhý stisk kontaktu = nikdy jej nepovažovat za oblíbený</string>
     <string name="title_open_link">Otevřít odkaz</string>
-    <string name="title_show_organization">Zobrazit organizaci</string>
     <string name="title_insecure_link">Tento odkaz není bezpečný</string>
     <string name="title_select_app">Vyberte aplikaci</string>
     <string name="title_updated">Je k dispozici aktualizace na verzi %1$s</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e2ba9bd50c..544a0c221b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_advanced_prefix_once">Betreff nur einmal beim Antworten oder Weiterleiten voranstellen</string>
     <string name="title_advanced_autosend">Senden von E-Mails bestätigen</string>
     <string name="title_advanced_badge">Startsymbol mit der Anzahl der neuen Nachrichten anzeigen</string>
+    <string name="title_advanced_subscriptions">Ihre Abonnements verwalten</string>
     <string name="title_advanced_notify_preview">Zeige die Nachrichten-Vorschau in den Benachrichtigungen</string>
     <string name="title_advanced_search_local">Externe Suche auf Gerät</string>
     <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
@@ -181,6 +182,7 @@
     <string name="title_advanced_threading_hint">E-Mails gruppieren, die miteinander verwandt sind</string>
     <string name="title_advanced_name_email_hint">Wenn deaktiviert, werden nur Namen angezeigt, sofern verfügbar</string>
     <string name="title_advanced_flags_hint">Beachten Sie, dass markierte Nachrichten immer lokal gehalten werden</string>
+    <string name="title_advanced_subscriptions_hint">Ordner, die nicht abonniert sind, werden versteckt</string>
     <string name="title_advanced_preview_hint">Nur verfügbar, wenn der E-Mail-Text heruntergeladen wurde</string>
     <string name="title_advanced_autoexpand_hint">Eine (ungelesene) Nachricht wird automatisch geöffnet</string>
     <string name="title_advanced_autocollapse_hint">Mehrere erweiterte Nachrichten werden immer auf \'zurück\' geschlossen</string>
@@ -317,6 +319,7 @@
     <string name="title_show_html">Original anzeigen</string>
     <string name="title_trash">Löschen</string>
     <string name="title_copy">Kopiere &#8230;</string>
+    <string name="title_subscribe">Abonnieren</string>
     <string name="title_delete">Löschen</string>
     <string name="title_more">Mehr</string>
     <string name="title_spam">Spam</string>
@@ -449,6 +452,7 @@
     <string name="title_legend_trash">Papierkorb</string>
     <string name="title_legend_junk">Spam</string>
     <string name="title_legend_notify">Eingangsbenachrichtigung</string>
+    <string name="title_legend_subscribed">Abonniert zu</string>
     <string name="title_legend_unified">Sammeleingang / primäres Konto</string>
     <string name="title_legend_primary_disconnected">Konto getrennt</string>
     <string name="title_legend_primary_connected">Konto verbunden</string>
@@ -516,7 +520,7 @@
     <string name="title_hint_tracking_image">Tracking-Bild %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Lange drücken einen Kontakt, um ihn nie als Favorit einzustufen</string>
     <string name="title_open_link">Link öffnen</string>
-    <string name="title_show_organization">Organisation anzeigen</string>
+    <string name="title_ip_owner">IP-Adresse des Eigentümers</string>
     <string name="title_insecure_link">Dieser Link ist unsicher</string>
     <string name="title_select_app">App auswählen</string>
     <string name="title_updated">Es ist ein Update auf Version %1$s verfügbar</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 9e54736b64..712541ddbd 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -515,7 +515,6 @@
     <string name="title_hint_tracking_image">Imagen de seguimiento %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Mantener pulsado un contacto para no considerarlo nunca como favorito</string>
     <string name="title_open_link">Abrir enlace</string>
-    <string name="title_show_organization">Mostrar organización</string>
     <string name="title_insecure_link">Este enlace es inseguro</string>
     <string name="title_select_app">Seleccionar aplicación</string>
     <string name="title_updated">Hay una actualización a la version %1$s disponible</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1ebe687571..a6d357e8e2 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_advanced_prefix_once">Ne préfixer le sujet qu\'une seule fois lors de la réponse ou du transfert</string>
     <string name="title_advanced_autosend">Confirmer l\'envoi des messages</string>
     <string name="title_advanced_badge">Afficher l\'icône du lanceur avec le nombre de nouveaux messages</string>
+    <string name="title_advanced_subscriptions">Gérer les abonnements de dossier</string>
     <string name="title_advanced_notify_preview">Afficher l\'aperçu du message dans les notifications</string>
     <string name="title_advanced_search_local">Recherche externe sur l\'appareil</string>
     <string name="title_advanced_light">Utiliser le voyant de notification</string>
@@ -181,6 +182,7 @@
     <string name="title_advanced_threading_hint">Groupe de messages liés les uns aux autres</string>
     <string name="title_advanced_name_email_hint">Si désactivé, seuls les noms seront affichés si disponibles</string>
     <string name="title_advanced_flags_hint">Notez que les messages suivis seront toujours conservés localement</string>
+    <string name="title_advanced_subscriptions_hint">Les dossiers non abonnés seront cachés</string>
     <string name="title_advanced_preview_hint">Disponible uniquement lorsque le texte du message a été téléchargé</string>
     <string name="title_advanced_autoexpand_hint">Ouvrir automatiquement le message lorsqu’il n’y a qu’un seul message ou seulement un message non lu dans une conversation</string>
     <string name="title_advanced_autocollapse_hint">Les messages étendus multiples seront toujours fermés par \'retour\'</string>
@@ -317,6 +319,7 @@
     <string name="title_show_html">Afficher l\'original</string>
     <string name="title_trash">Corbeille</string>
     <string name="title_copy">Copie de &#8230;</string>
+    <string name="title_subscribe">S\'abonner</string>
     <string name="title_delete">Supprimer</string>
     <string name="title_more">Plus</string>
     <string name="title_spam">Spam</string>
@@ -449,6 +452,7 @@
     <string name="title_legend_trash">Corbeille</string>
     <string name="title_legend_junk">Courrier indésirable</string>
     <string name="title_legend_notify">Notification pour les nouveaux messages</string>
+    <string name="title_legend_subscribed">Abonné à</string>
     <string name="title_legend_unified">Boîte de réception unifiée / compte primaire</string>
     <string name="title_legend_primary_disconnected">Compte déconnecté</string>
     <string name="title_legend_primary_connected">Compte connecté</string>
@@ -516,7 +520,7 @@
     <string name="title_hint_tracking_image">Image de suivi %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Appuyer longuement sur un contact pour ne jamais le considérer comme un favori</string>
     <string name="title_open_link">Ouvrir le lien</string>
-    <string name="title_show_organization">Afficher l\'organisation</string>
+    <string name="title_ip_owner">Adresse IP du propriétaire</string>
     <string name="title_insecure_link">Ce lien n’est pas sécurisé</string>
     <string name="title_select_app">Sélectionner une application</string>
     <string name="title_updated">Une mise à jour vers la version %1$s est disponible</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index d306d9bf3d..278dd5ea24 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_advanced_prefix_once">Prefissa l\'oggetto solo una volta per rispondere o inoltrare</string>
     <string name="title_advanced_autosend">Confermare l\'invio dei messaggi</string>
     <string name="title_advanced_badge">Mostra icona launcher con numero di nuovi messaggi</string>
+    <string name="title_advanced_subscriptions">Gestisci abbonamenti cartelle</string>
     <string name="title_advanced_notify_preview">Mostra anteprima messaggio nelle notifiche</string>
     <string name="title_advanced_search_local">Ricerca esterna sul dispositivo</string>
     <string name="title_advanced_light">Usa il led di notifica</string>
@@ -172,6 +173,7 @@
     <string name="title_advanced_paranoid">Caratteristiche aggiuntive della privacy</string>
     <string name="title_advanced_updates">Controlla aggiornamenti</string>
     <string name="title_advanced_debug">Debug</string>
+    <string name="title_advanced_last_cleanup">Ultima pulizia: %1$s</string>
     <string name="title_advanced_enabled_hint">Attiva o disattiva a livello globale la ricezione e l\'invio dei messaggi</string>
     <string name="title_advanced_schedule_hint">Tocca un orario per impostare un orario</string>
     <string name="title_advanced_metered_hint">Le connessioni a consumo sono generalmente connessioni mobili o hotspot Wi-Fi a pagamento</string>
@@ -180,6 +182,7 @@
     <string name="title_advanced_threading_hint">Messaggi di gruppo relazionati a vicenda</string>
     <string name="title_advanced_name_email_hint">Quando disabilitati saranno mostrati solo i nomi quando disponibili</string>
     <string name="title_advanced_flags_hint">Nota che i messaggi preferiti saranno sempre conservati localmente</string>
+    <string name="title_advanced_subscriptions_hint">Le cartelle a cui non sei iscritto verranno nascoste</string>
     <string name="title_advanced_preview_hint">Disponibile solo quando è stato scaricato il testo del messaggio</string>
     <string name="title_advanced_autoexpand_hint">Apri automaticamente il messaggio quando c\'è un solo messaggio o solo un messaggio da leggere in una conversazione</string>
     <string name="title_advanced_autocollapse_hint">Più messaggi estesi verranno sempre chiusi con \'indietro\'</string>
@@ -316,6 +319,7 @@
     <string name="title_show_html">Visualizza originale</string>
     <string name="title_trash">Cestino</string>
     <string name="title_copy">Copia &#8230;</string>
+    <string name="title_subscribe">Iscriviti</string>
     <string name="title_delete">Elimina</string>
     <string name="title_more">Altro</string>
     <string name="title_spam">Posta indesiderata</string>
@@ -448,6 +452,7 @@
     <string name="title_legend_trash">Cestino</string>
     <string name="title_legend_junk">Posta indesiderata</string>
     <string name="title_legend_notify">Notifica nuovi messaggi</string>
+    <string name="title_legend_subscribed">Iscritto a</string>
     <string name="title_legend_unified">Posta in arrivo unificata / account principale</string>
     <string name="title_legend_primary_disconnected">Account disconnesso</string>
     <string name="title_legend_primary_connected">Account connesso</string>
@@ -515,7 +520,7 @@
     <string name="title_hint_tracking_image">Immagine di tracciamento %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Tieni premuto un contatto per non considerarlo un preferito</string>
     <string name="title_open_link">Apri collegamento</string>
-    <string name="title_show_organization">Mostra organizzazione</string>
+    <string name="title_ip_owner">Indirizzo IP proprietario</string>
     <string name="title_insecure_link">Questo link non è sicuro</string>
     <string name="title_select_app">Seleziona app</string>
     <string name="title_updated">È disponibile un aggiornamento alla versione %1$s</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 66c49f66c8..ef81974fc3 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_advanced_prefix_once">Prefix onderwerp slechts één keer bij beantwoorden of doorsturen</string>
     <string name="title_advanced_autosend">Bevestig het verzenden van berichten</string>
     <string name="title_advanced_badge">Toon opstartpictogram met aantal nieuwe berichten</string>
+    <string name="title_advanced_subscriptions">Beheer map abonnementen</string>
     <string name="title_advanced_notify_preview">Toon berichtvoorbeeld in meldingen</string>
     <string name="title_advanced_search_local">Extern zoeken op apparaat</string>
     <string name="title_advanced_light">Gebruik meldingslicht</string>
@@ -181,6 +182,7 @@
     <string name="title_advanced_threading_hint">Groepeer gerelateerde berichten</string>
     <string name="title_advanced_name_email_hint">Indien uitgeschakeld, worden alleen namen weergegeven als deze beschikbaar zijn</string>
     <string name="title_advanced_flags_hint">Merk op dat berichten met een ster altijd lokaal worden bewaard</string>
+    <string name="title_advanced_subscriptions_hint">Mappen zonder abonnement worden verborgen</string>
     <string name="title_advanced_preview_hint">Alleen beschikbaar wanneer de berichttekst werd gedownload</string>
     <string name="title_advanced_autoexpand_hint">Bericht automatisch openen als er slechts één bericht of slechts één ongelezen bericht in een gesprek is</string>
     <string name="title_advanced_autocollapse_hint">Meerdere uitgeklapte berichten worden altijd gesloten bij \'terug\'</string>
@@ -317,6 +319,7 @@
     <string name="title_show_html">Toon origineel</string>
     <string name="title_trash">Weggooien</string>
     <string name="title_copy">Kopieer &#8230;</string>
+    <string name="title_subscribe">Abonneren</string>
     <string name="title_delete">Verwijder</string>
     <string name="title_more">Meer</string>
     <string name="title_spam">Spam</string>
@@ -449,6 +452,7 @@
     <string name="title_legend_trash">Prullenbak</string>
     <string name="title_legend_junk">Spam</string>
     <string name="title_legend_notify">Melding bij nieuwe berichten</string>
+    <string name="title_legend_subscribed">Geabonneerd op</string>
     <string name="title_legend_unified">Gecombineerd postvak in / primaire account</string>
     <string name="title_legend_primary_disconnected">Account niet verbonden</string>
     <string name="title_legend_primary_connected">Account verbonden</string>
@@ -516,7 +520,7 @@
     <string name="title_hint_tracking_image">Tracking afbeelding %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Druk lang op een contact om het nooit als een favoriet te beschouwen</string>
     <string name="title_open_link">Link openen</string>
-    <string name="title_show_organization">Toon organisatie</string>
+    <string name="title_ip_owner">Eigenaar IP-adres</string>
     <string name="title_insecure_link">Deze link is onveilig</string>
     <string name="title_select_app">Selecteer app</string>
     <string name="title_updated">Er is een update naar versie %1$s beschikbaar</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 249b64ad64..522015aa69 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -473,7 +473,6 @@
     <string name="title_hint_tracking_image">Web beacon %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Długo naciśnij kontakt, aby nigdy nie uznać go za ulubiony</string>
     <string name="title_open_link">Otwórz link</string>
-    <string name="title_show_organization">Pokaż organizację</string>
     <string name="title_insecure_link">Ten link nie jest bezpieczny</string>
     <string name="title_select_app">Wybierz aplikację</string>
     <string name="title_updated">Jest dostępna aktualizacja do wersji %1$s</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 089439b845..2de19c8066 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -26,6 +26,10 @@
         <item quantity="one">%1$d nova mensagem</item>
         <item quantity="other">%1$d novas mensagens</item>
     </plurals>
+    <plurals name="title_notification_unsent">
+        <item quantity="one">%1$d mensagem a ser enviada</item>
+        <item quantity="other">%1$d mensagens a serem enviadas</item>
+    </plurals>
     <plurals name="title_tile_unseen">
         <item quantity="one">%1$d nova</item>
         <item quantity="other">%1$d novas</item>
@@ -135,6 +139,7 @@
     <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_circular">Mostrar ícones redondos</string>
     <string name="title_advanced_name_email">Mostrar os nomes e endereços de e-mail</string>
     <string name="title_advanced_subject_italic">Mostrar assunto em itálico</string>
     <string name="title_advanced_flags">Mostrar estrelas (favoritos)</string>
@@ -167,6 +172,7 @@
     <string name="title_advanced_paranoid">Recursos extra de privacidade</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_last_cleanup">Última limpeza: %1$s</string>
     <string name="title_advanced_enabled_hint">Desative ou habilite o recebimento e envio de mensagens globalmente</string>
     <string name="title_advanced_schedule_hint">Toque uma vez para definir um tempo</string>
     <string name="title_advanced_metered_hint">Conexões limitadas são geralmente conexões móveis ou hotspots Wi-Fi pagos</string>
@@ -391,6 +397,7 @@
     <string name="title_search_hint">Pesquisar no servidor</string>
     <string name="title_search_device">Pesquisar no dispositivo</string>
     <string name="title_searching">Pesquisando \'%1$s\'</string>
+    <string name="title_reset_order">Redefinir ordem</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>
@@ -509,7 +516,6 @@
     <string name="title_hint_tracking_image">Imagem de rastreamento %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Pressione e segure um contato para nunca considerá-lo como favorito</string>
     <string name="title_open_link">Abrir link</string>
-    <string name="title_show_organization">Mostrar organização</string>
     <string name="title_insecure_link">Este link é inseguro</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>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index d89bbb0641..6fee3ef46b 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -29,6 +29,11 @@
         <item quantity="few">%1$d mesaje noi</item>
         <item quantity="other">%1$d de mesaje noi</item>
     </plurals>
+    <plurals name="title_notification_unsent">
+        <item quantity="one">%1$d mesaj de trimis</item>
+        <item quantity="few">%1$d mesaje de trimis</item>
+        <item quantity="other">%1$d de mesaje de trimis</item>
+    </plurals>
     <plurals name="title_tile_unseen">
         <item quantity="one">%1$d nou</item>
         <item quantity="few">%1$d noi</item>
@@ -142,6 +147,7 @@
     <string name="title_advanced_threading">Aranjare mesaje în conversație</string>
     <string name="title_advanced_avatars">Arată pozele contactelor</string>
     <string name="title_advanced_identicons">Arată iconițe generate</string>
+    <string name="title_advanced_circular">Arată pictograme rotunde</string>
     <string name="title_advanced_name_email">Arată nume și adrese de e-mail</string>
     <string name="title_advanced_subject_italic">Arată subiectul cursiv</string>
     <string name="title_advanced_flags">Arată marcate (favorite)</string>
@@ -165,6 +171,7 @@
     <string name="title_advanced_prefix_once">Adaugă prefix la subiect o singură dată pentru răspuns sau redirecționare</string>
     <string name="title_advanced_autosend">Confirmă trimiterea mesajelor</string>
     <string name="title_advanced_badge">Afișează iconița lansatorului cu numărul de mesaje noi</string>
+    <string name="title_advanced_subscriptions">Gestionați abonările la dosare</string>
     <string name="title_advanced_notify_preview">Arată previzualizare mesaj în notificare</string>
     <string name="title_advanced_search_local">Căutare externă pe dispozitiv</string>
     <string name="title_advanced_light">Folosire LED de notificare</string>
@@ -174,6 +181,7 @@
     <string name="title_advanced_paranoid">Caracteristici de confidențialitate suplimentare</string>
     <string name="title_advanced_updates">Verificare actualizări aplicație</string>
     <string name="title_advanced_debug">Depanare</string>
+    <string name="title_advanced_last_cleanup">Ultima curățare: %1$s</string>
     <string name="title_advanced_enabled_hint">Control global pentru recepția și trimiterea mesajelor</string>
     <string name="title_advanced_schedule_hint">Atingeţi data pentru a seta un timp</string>
     <string name="title_advanced_metered_hint">Conexiunile contorizate sunt în general cele mobile sau punctele de acces Wi-Fi cu plată</string>
@@ -182,6 +190,7 @@
     <string name="title_advanced_threading_hint">Grupează mesajele asociate</string>
     <string name="title_advanced_name_email_hint">Dacă este dezactivată, doar numele va fi afișat atunci când este disponibil</string>
     <string name="title_advanced_flags_hint">Rețineți că mesajele marcate vor fi păstrate întotdeauna la nivel local</string>
+    <string name="title_advanced_subscriptions_hint">Dosarele fără abonări vor fi ascunse</string>
     <string name="title_advanced_preview_hint">Disponibil doar atunci când a fost descarcat textul mesajului</string>
     <string name="title_advanced_autoexpand_hint">Atunci când este doar un mesaj sau doar un mesaj necitit într-o conversație</string>
     <string name="title_advanced_autocollapse_hint">Mesajele multiple vor fi mereu plate când se apasă \'înapoi\'</string>
@@ -238,6 +247,7 @@
     <string name="title_no_name">Lipsește numele</string>
     <string name="title_no_email">Lipsește adresa de e-mail</string>
     <string name="title_email_invalid">Adresa de e-mail nu este validă</string>
+    <string name="title_address_parse_error">Adresa \'%1$s\' este invalidă: %2$s</string>
     <string name="title_no_account">Lipsește contul</string>
     <string name="title_no_host">Lipsește numele serverului</string>
     <string name="title_no_user">Lipsește numele de utilizator</string>
@@ -317,6 +327,7 @@
     <string name="title_show_html">Arată originalul</string>
     <string name="title_trash">Gunoi</string>
     <string name="title_copy">Copiere &#8230;</string>
+    <string name="title_subscribe">Abonare</string>
     <string name="title_delete">Şterge</string>
     <string name="title_more">Mai mult</string>
     <string name="title_spam">Spam</string>
@@ -327,6 +338,7 @@
     <string name="title_reply">Răspunde</string>
     <string name="title_reply_to_sender">Expeditor</string>
     <string name="title_reply_to_all">Toate</string>
+    <string name="title_reply_list">Listă</string>
     <string name="title_reply_receipt">Confirmare de citire</string>
     <string name="title_reply_template">Șablon</string>
     <string name="title_moving">Mutare în %1$s</string>
@@ -396,6 +408,7 @@
     <string name="title_search_hint">Căutare pe server</string>
     <string name="title_search_device">Căutare pe dispozitiv</string>
     <string name="title_searching">Se caută \'%1$s\'</string>
+    <string name="title_reset_order">Resetare ordine</string>
     <string name="title_sort_on">Sortare</string>
     <string name="title_sort_on_time">Dată</string>
     <string name="title_sort_on_unread">Necitit</string>
@@ -447,6 +460,7 @@
     <string name="title_legend_trash">Gunoi</string>
     <string name="title_legend_junk">Spam</string>
     <string name="title_legend_notify">Notificare la mesaje noi</string>
+    <string name="title_legend_subscribed">Abonat la</string>
     <string name="title_legend_unified">Inbox unificat / cont primar</string>
     <string name="title_legend_primary_disconnected">Cont deconectat</string>
     <string name="title_legend_primary_connected">Cont conectat</string>
@@ -514,7 +528,6 @@
     <string name="title_hint_tracking_image">Imagine de urmărire %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Apăsați lung pe un contact pentru a nu-l lua niciodată în considerare ca favorit</string>
     <string name="title_open_link">Deschide legătura</string>
-    <string name="title_show_organization">Arată organizația</string>
     <string name="title_insecure_link">Această legătură este nesigură</string>
     <string name="title_select_app">Selectează aplicația</string>
     <string name="title_updated">Este disponibilă o actualizare la versiunea %1$s</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 457e9814b5..680a9a0ef1 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -179,6 +179,7 @@
     <string name="title_advanced_prefix_once">Добавлять только один префикс темы при ответе или пересылке</string>
     <string name="title_advanced_autosend">Подтверждать отправку сообщений</string>
     <string name="title_advanced_badge">Показать значок запуска с числом новых сообщений</string>
+    <string name="title_advanced_subscriptions">Управление подпиской на папки</string>
     <string name="title_advanced_notify_preview">Предпросмотр сообщений в уведомлениях</string>
     <string name="title_advanced_search_local">Внешний поиск на устройстве</string>
     <string name="title_advanced_light">Использовать индикатор уведомлений</string>
@@ -197,6 +198,7 @@
     <string name="title_advanced_threading_hint">Группировать сообщения, связанные друг с другом</string>
     <string name="title_advanced_name_email_hint">Если отключено, будут показаны только имена (при наличии)</string>
     <string name="title_advanced_flags_hint">Обратите внимание, что отмеченные сообщения всегда будут сохранены локально</string>
+    <string name="title_advanced_subscriptions_hint">Папки без подписки будут скрыты</string>
     <string name="title_advanced_preview_hint">Доступно только когда был загружен текст сообщения</string>
     <string name="title_advanced_autoexpand_hint">Автоматически открывать сообщение, когда оно только одно или только одно непрочитанное сообщение в диалоге</string>
     <string name="title_advanced_autocollapse_hint">Несколько развёрнутых сообщений всегда будут закрыты по кнопке \'назад\'</string>
@@ -333,6 +335,7 @@
     <string name="title_show_html">Показать оригинал</string>
     <string name="title_trash">Корзина</string>
     <string name="title_copy">Копировать &#8230;</string>
+    <string name="title_subscribe">Подписаться</string>
     <string name="title_delete">Удалить</string>
     <string name="title_more">Еще</string>
     <string name="title_spam">Спам</string>
@@ -465,6 +468,7 @@
     <string name="title_legend_trash">Корзина</string>
     <string name="title_legend_junk">Спам</string>
     <string name="title_legend_notify">Уведомлять о новых сообщениях</string>
+    <string name="title_legend_subscribed">Подписка на</string>
     <string name="title_legend_unified">Единый почтовый ящик / основная учётная запись</string>
     <string name="title_legend_primary_disconnected">Учетная запись отключена</string>
     <string name="title_legend_primary_connected">Учетная запись подключена</string>
@@ -532,7 +536,7 @@
     <string name="title_hint_tracking_image">Отслеживающее изображение %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Удерживайте контакт, чтобы никогда не считать его избранным</string>
     <string name="title_open_link">Открыть ссылку</string>
-    <string name="title_show_organization">Показывать организацию</string>
+    <string name="title_ip_owner">IP адрес владельца</string>
     <string name="title_insecure_link">Эта ссылка небезопасна</string>
     <string name="title_select_app">Выбрать приложение</string>
     <string name="title_updated">Доступно обновление до версии %1$s</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 1480ea0fae..c27574059d 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -484,7 +484,6 @@
     <string name="title_hint_tracking_image">Spårar bild %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Långt tryck på en kontakt för att aldrig betrakta den som en favorit</string>
     <string name="title_open_link">Öppna länken</string>
-    <string name="title_show_organization">Visa organisation</string>
     <string name="title_insecure_link">Denna länk är osäker</string>
     <string name="title_select_app">Välj app</string>
     <string name="title_updated">Det finns en uppdatering till version %1$s tillgänglig</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 4bb92650f1..5aa8c17d2e 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -26,6 +26,10 @@
         <item quantity="one">%1$d yeni ileti</item>
         <item quantity="other">%1$d yeni ileti</item>
     </plurals>
+    <plurals name="title_notification_unsent">
+        <item quantity="one">%1$d ileti gönderilecek</item>
+        <item quantity="other">%1$d ileti gönderilecek</item>
+    </plurals>
     <plurals name="title_tile_unseen">
         <item quantity="one">%1$d yeni</item>
         <item quantity="other">%1$d yeni</item>
@@ -134,6 +138,7 @@
     <string name="title_advanced_threading">İletişim iş parçacığı</string>
     <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
     <string name="title_advanced_identicons">Kimliklerini göster</string>
+    <string name="title_advanced_circular">Yuvarlak simgeleri göster</string>
     <string name="title_advanced_name_email">Adları ve e-posta adreslarini göster</string>
     <string name="title_advanced_subject_italic">Konuyu eğik yazı ile göster</string>
     <string name="title_advanced_flags">Sık Kullanılanları göster</string>
@@ -165,6 +170,7 @@
     <string name="title_advanced_paranoid">Fazladan gizlilik özellikleri</string>
     <string name="title_advanced_updates">Güncellemelere bak</string>
     <string name="title_advanced_debug">Hata ayıklama</string>
+    <string name="title_advanced_last_cleanup">Son temizleme: %1$s</string>
     <string name="title_advanced_enabled_hint">İletileri alma ve göndermeyi toptan devre dışı bırakın veya etkinleştirin</string>
     <string name="title_advanced_schedule_hint">Bir zaman ayarlamak için bir saate dokunun</string>
     <string name="title_advanced_metered_hint">Ölçülü bağlantılar genellikle mobil bağlantılar veya ücretli Wi-Fi noktalarıdır</string>
@@ -195,6 +201,7 @@
     <string name="title_identity_store_sent">Gönderilmiş iletileri depola</string>
     <string name="title_identity_store_sent_remark">Bunu, yalnızca sağlayıcınız gönderilen iletileri otomatik olarak kaydetmiyorsa etkinleştirin</string>
     <string name="title_optional">İsteğe bağlı</string>
+    <string name="title_recommended">Önerilen</string>
     <string name="title_account_linked">Bağlı hesap</string>
     <string name="title_account_name">Hesap adı</string>
     <string name="title_account_name_hint">Klasörleri ayırt etmek için kullanılır</string>
@@ -228,6 +235,7 @@
     <string name="title_no_name">İsim eksik</string>
     <string name="title_no_email">E-posta adresi eksik</string>
     <string name="title_email_invalid">E-posta adresi geçersiz</string>
+    <string name="title_address_parse_error">%1$s adresi geçersiz: %2$s</string>
     <string name="title_no_account">Hesap bilgisi eksik</string>
     <string name="title_no_host">Sunucu adı eksik</string>
     <string name="title_no_user">Kullanıcı adı eksik</string>
@@ -307,6 +315,7 @@
     <string name="title_show_html">Orjinali göster</string>
     <string name="title_trash">Çöp Kutusu</string>
     <string name="title_copy">Kopyala &#8230;</string>
+    <string name="title_subscribe">Abonelik</string>
     <string name="title_delete">Sil</string>
     <string name="title_more">Daha fazla</string>
     <string name="title_spam">İstenmeyen posta</string>
@@ -317,6 +326,7 @@
     <string name="title_reply">Yanıtla</string>
     <string name="title_reply_to_sender">Gönderici</string>
     <string name="title_reply_to_all">Hepsi</string>
+    <string name="title_reply_list">Liste</string>
     <string name="title_reply_receipt">Okundu bilgisi</string>
     <string name="title_reply_template">Kalıp</string>
     <string name="title_moving">%1$s\'e taşınıyor</string>
@@ -386,6 +396,7 @@
     <string name="title_search_hint">Sunucuda ara</string>
     <string name="title_search_device">Aygıtda ara</string>
     <string name="title_searching">\'%1$s\' aranıyor</string>
+    <string name="title_reset_order">Düzeni sıfırla</string>
     <string name="title_sort_on">Sırala</string>
     <string name="title_sort_on_time">Zaman</string>
     <string name="title_sort_on_unread">Okunmadı</string>
@@ -437,6 +448,7 @@
     <string name="title_legend_trash">Çöp Kutusu</string>
     <string name="title_legend_junk">İstenmeyen posta</string>
     <string name="title_legend_notify">Yeni iletileri bildir</string>
+    <string name="title_legend_subscribed">Abone olundu</string>
     <string name="title_legend_unified">Birleşik gelen kutusu / birincil hesap</string>
     <string name="title_legend_primary_disconnected">Hesap bağlantısı kesildi</string>
     <string name="title_legend_primary_connected">Hesap bağlantısı kuruldu</string>
@@ -504,7 +516,6 @@
     <string name="title_hint_tracking_image">İzlenen görsel %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Bir kişiyi sık kullanılanlarda istemiyorsanız uzun basın</string>
     <string name="title_open_link">Bağlantıyı aç</string>
-    <string name="title_show_organization">Örgütleşimi göster</string>
     <string name="title_insecure_link">Bu bağlantı güvensiz</string>
     <string name="title_select_app">Uygulama seçin</string>
     <string name="title_updated">Sürüm %1$s için bir güncelleme mevcut</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a4add70ffe..af254e4933 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -155,6 +155,7 @@
     <string name="title_advanced_prefix_once">答复或抄送邮件时, 主题前的Re或CC只出现一次</string>
     <string name="title_advanced_autosend">确认发送邮件</string>
     <string name="title_advanced_badge">在启动器图标上显示新消息数目</string>
+    <string name="title_advanced_subscriptions">管理文件夹订阅</string>
     <string name="title_advanced_notify_preview">通知中显示消息预览</string>
     <string name="title_advanced_search_local">外部搜索</string>
     <string name="title_advanced_light">使用指示灯</string>
@@ -173,6 +174,7 @@
     <string name="title_advanced_threading_hint">对相互关联的邮件进行分组</string>
     <string name="title_advanced_name_email_hint">禁用该选项，将仅显示名称（如果可用）</string>
     <string name="title_advanced_flags_hint">请注意, 加星消息将始终保存在本地</string>
+    <string name="title_advanced_subscriptions_hint">未订阅的文件夹将被隐藏</string>
     <string name="title_advanced_preview_hint">只有当消息文本下载时才可用</string>
     <string name="title_advanced_autoexpand_hint">当对话中只有一条消息或只是一条未读消息时，自动打开该消息</string>
     <string name="title_advanced_autocollapse_hint">App将在您按下“返回”键时关闭多条展开的消息</string>
@@ -309,6 +311,7 @@
     <string name="title_show_html">显示原件</string>
     <string name="title_trash">回收站</string>
     <string name="title_copy">复制 &#8230;</string>
+    <string name="title_subscribe">订阅</string>
     <string name="title_delete">删除</string>
     <string name="title_more">更多</string>
     <string name="title_spam">垃圾邮件</string>
@@ -441,6 +444,7 @@
     <string name="title_legend_trash">垃圾箱</string>
     <string name="title_legend_junk">垃圾邮件</string>
     <string name="title_legend_notify">通知新邮件</string>
+    <string name="title_legend_subscribed">订阅</string>
     <string name="title_legend_unified">统一收件箱/主账户</string>
     <string name="title_legend_primary_disconnected">帐户已断开连接</string>
     <string name="title_legend_primary_connected">帐户已连接</string>
@@ -508,7 +512,7 @@
     <string name="title_hint_tracking_image">跟踪图像%1$sx%2$s</string>
     <string name="title_hint_ignore_contact">长按以忽略联系人</string>
     <string name="title_open_link">打开链接</string>
-    <string name="title_show_organization">显示组织</string>
+    <string name="title_ip_owner">所有者 IP 地址</string>
     <string name="title_insecure_link">此链接不安全</string>
     <string name="title_select_app">选择应用</string>
     <string name="title_updated">有新的版本%1$s可用</string>