diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 16c5c9846a..ed74fa658d 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -267,6 +267,7 @@
     <string name="title_no_utf8">Tento poskytovatel nepodporuje UTF-8</string>
     <string name="title_no_sync">Chyby synchronizace od %1$s</string>
     <string name="title_sync_errors">Synchronizace některých složek selhala</string>
+    <string name="title_identity_required">Identita je vyžadována pro odesílání zpráv</string>
     <string name="title_drafts_required">Složka konceptů je vyžadována pro odesílání zpráv</string>
     <string name="title_account_delete">Trvale smazat tento účet?</string>
     <string name="title_identity_delete">Trvale smazat tuto identitu?</string>
@@ -400,6 +401,7 @@
     <string name="title_style_toolbar">Panel formátování</string>
     <string name="title_add_attachment">Přidat přílohu</string>
     <string name="title_show_addresses">Zobrazit kopii/skrytou kopii</string>
+    <string name="title_insert_contact_group">Vložit skupinu kontaktů</string>
     <string name="title_from_missing">Chybí odesílatel</string>
     <string name="title_to_missing">Chybí příjemce</string>
     <string name="title_attachments_missing">Nebyly staženy všechny přílohy</string>
@@ -538,6 +540,7 @@
     <string name="title_open_link">Otevřít odkaz</string>
     <string name="title_ip_owner">IP adresa vlastníka</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>
     <string name="title_issue">Máte dotaz nebo problém?</string>
     <string name="title_yes">Ano</string>
@@ -598,4 +601,9 @@
         <item>Střední</item>
         <item>Velké</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>Komu</item>
+        <item>Kopie</item>
+        <item>Skrytá kopie</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8687b448b3..4a7aa884fa 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -251,6 +251,7 @@
     <string name="title_no_utf8">Dieser Anbieter unterstützt UTF-8 nicht</string>
     <string name="title_no_sync">Synchronisationsfehler seit %1$s</string>
     <string name="title_sync_errors">Synchronisieren einiger Ordner fehlgeschlagen</string>
+    <string name="title_identity_required">Für das Senden von Nachrichten ist ein Name erforderlich</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>
@@ -384,6 +385,8 @@
     <string name="title_style_toolbar">Symbolleistenstil</string>
     <string name="title_add_attachment">Anhang hinzufügen</string>
     <string name="title_show_addresses">CC/BCC anzeigen</string>
+    <string name="title_insert_contact_group">Kontaktgruppe einfügen</string>
+    <string name="title_insert_template">Vorlage einfügen</string>
     <string name="title_from_missing">Absender fehlt</string>
     <string name="title_to_missing">Empfänger fehlt</string>
     <string name="title_attachments_missing">Nicht alle Dateianhänge wurden heruntergeladen</string>
@@ -522,6 +525,7 @@
     <string name="title_open_link">Link öffnen</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>
     <string name="title_issue">Haben Sie eine Frage oder ein Problem?</string>
     <string name="title_yes">Ja</string>
@@ -582,4 +586,9 @@
         <item>Mittel</item>
         <item>Groß</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>An</item>
+        <item>Zusätzliche Empfänger (CC)</item>
+        <item>Verdeckte Empfänger (BCC)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 7db6e3fd02..73983e5209 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -163,6 +163,7 @@
     <string name="title_advanced_prefix_once">Prefijar el asunto solo una vez al responder o reenviar</string>
     <string name="title_advanced_autosend">Confirmar enviar mensajes</string>
     <string name="title_advanced_badge">Mostrar icono del lanzador con el número de mensajes nuevos</string>
+    <string name="title_advanced_subscriptions">Administrar suscripciones de carpeta</string>
     <string name="title_advanced_notify_preview">Mostrar vista previa del mensaje en notificaciones</string>
     <string name="title_advanced_search_local">Búsqueda externa en dispositivo</string>
     <string name="title_advanced_light">Usar luz de notificación</string>
@@ -172,6 +173,7 @@
     <string name="title_advanced_paranoid">Características de privacidad adicionales</string>
     <string name="title_advanced_updates">Buscar actualizaciones</string>
     <string name="title_advanced_debug">Modo de depuración</string>
+    <string name="title_advanced_last_cleanup">Última limpieza: %1$s</string>
     <string name="title_advanced_enabled_hint">Desactivar o activar globalmente la recepción y envío de mensajes</string>
     <string name="title_advanced_schedule_hint">Toque en una hora para establecer una hora</string>
     <string name="title_advanced_metered_hint">Las conexiones medidas son generalmente conexiones móviles o puntos de acceso Wi-Fi de pago</string>
@@ -180,6 +182,7 @@
     <string name="title_advanced_threading_hint">Agrupar mensajes relacionados entre sí</string>
     <string name="title_advanced_name_email_hint">Si está desactivado, solo se mostrarán los nombres cuando estén disponibles</string>
     <string name="title_advanced_flags_hint">Tenga en cuenta que los mensajes destacados siempre se almacenarán localmente</string>
+    <string name="title_advanced_subscriptions_hint">Las carpetas no suscritas se ocultarán</string>
     <string name="title_advanced_preview_hint">Sólo disponible cuando el texto del mensaje fue descargado</string>
     <string name="title_advanced_autoexpand_hint">Abrir mensaje automáticamente cuando haya solo un mensaje o uno no leído en una conversación</string>
     <string name="title_advanced_autocollapse_hint">Múltiples mensajes expandidos siempre se cerrarán con \'atrás\'</string>
@@ -248,6 +251,7 @@
     <string name="title_no_utf8">Este proveedor no es compatible con UTF-8</string>
     <string name="title_no_sync">Errores de sincronización desde %1$s</string>
     <string name="title_sync_errors">Error al sincronizar algunas carpetas</string>
+    <string name="title_identity_required">Se requiere una identidad para enviar mensajes</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>
@@ -316,6 +320,7 @@
     <string name="title_show_html">Mostrar original</string>
     <string name="title_trash">Papelera</string>
     <string name="title_copy">Copiar &#8230;</string>
+    <string name="title_subscribe">Subscribir</string>
     <string name="title_delete">Eliminar</string>
     <string name="title_more">Más</string>
     <string name="title_spam">Spam</string>
@@ -380,6 +385,7 @@
     <string name="title_style_toolbar">Barra de herramientas de estilo</string>
     <string name="title_add_attachment">Agregar adjunto</string>
     <string name="title_show_addresses">Mostrar CC/CCO</string>
+    <string name="title_insert_contact_group">Insertar grupo de contactos</string>
     <string name="title_from_missing">Falta remitente</string>
     <string name="title_to_missing">Falta destinatario</string>
     <string name="title_attachments_missing">No todos los adjuntos fueron descargados</string>
@@ -448,6 +454,7 @@
     <string name="title_legend_trash">Papelera</string>
     <string name="title_legend_junk">Spam</string>
     <string name="title_legend_notify">Notificar nuevos mensajes</string>
+    <string name="title_legend_subscribed">Suscrito a</string>
     <string name="title_legend_unified">Bandeja de entrada unificada / Cuenta principal</string>
     <string name="title_legend_primary_disconnected">Cuenta desconectada</string>
     <string name="title_legend_primary_connected">Cuenta conectada</string>
@@ -515,7 +522,9 @@
     <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_ip_owner">Dirección IP del propietario</string>
     <string name="title_insecure_link">Este enlace es inseguro</string>
+    <string name="title_select_app">Seleccionar app</string>
     <string name="title_updated">Hay una actualización a la version %1$s disponible</string>
     <string name="title_issue">¿Tiene una pregunta o problema?</string>
     <string name="title_yes">Sí</string>
@@ -576,4 +585,9 @@
         <item>Medio</item>
         <item>Grande</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>A</item>
+        <item>CC</item>
+        <item>CCO</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 73c0e73d18..8e0685e028 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -251,6 +251,7 @@
     <string name="title_no_utf8">Ce fournisseur ne prend pas en charge l\'UTF-8</string>
     <string name="title_no_sync">Erreurs de synchronisation depuis %1$s</string>
     <string name="title_sync_errors">La synchronisation de certains dossiers a échoué</string>
+    <string name="title_identity_required">Une identité est nécessaire pour envoyer des messages</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>
@@ -384,6 +385,8 @@
     <string name="title_style_toolbar">Barre d\'outils de style</string>
     <string name="title_add_attachment">Ajouter une pièce jointe</string>
     <string name="title_show_addresses">Afficher Cc/Cci</string>
+    <string name="title_insert_contact_group">Insérer un groupe de contacts</string>
+    <string name="title_insert_template">Insérer un modèle</string>
     <string name="title_from_missing">Expéditeur manquant</string>
     <string name="title_to_missing">Destinataire manquant</string>
     <string name="title_attachments_missing">Les pièces jointes ne sont pas toutes téléchargées</string>
@@ -583,4 +586,9 @@
         <item>Moyen</item>
         <item>Grand</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>A</item>
+        <item>Cc</item>
+        <item>Cci</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 864da8f9e1..6a1b4f7ac2 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -251,6 +251,7 @@
     <string name="title_no_utf8">Questo provider non supporta UTF-8</string>
     <string name="title_no_sync">Errori di sincronizzazione da %1$s</string>
     <string name="title_sync_errors">Sincronizzazione di alcune cartelle fallita</string>
+    <string name="title_identity_required">È necessaria un\'identità per inviare messaggi</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>
@@ -522,6 +523,7 @@
     <string name="title_open_link">Apri collegamento</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>
     <string name="title_issue">Hai una domanda o un problema?</string>
     <string name="title_yes">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 6a76d46f82..8ae3cd0d45 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -251,6 +251,7 @@
     <string name="title_no_utf8">Deze provider ondersteunt geen UTF-8</string>
     <string name="title_no_sync">Synchronisatiefouten sinds %1$s</string>
     <string name="title_sync_errors">Synchroniseren van sommige mappen mislukt</string>
+    <string name="title_identity_required">Een identiteit is vereist om berichten te verzenden</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>
@@ -384,6 +385,8 @@
     <string name="title_style_toolbar">Stijl werkbalk</string>
     <string name="title_add_attachment">Bijlage toevoegen</string>
     <string name="title_show_addresses">Toon CC/BCC</string>
+    <string name="title_insert_contact_group">Contactgroep toevoegen</string>
+    <string name="title_insert_template">Sjabloon invoegen</string>
     <string name="title_from_missing">Zender ontbreekt</string>
     <string name="title_to_missing">Ontvanger ontbreekt</string>
     <string name="title_attachments_missing">Niet alle bijlagen zijn gedownload</string>
@@ -583,4 +586,9 @@
         <item>Gemiddeld</item>
         <item>Groot</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>Aan</item>
+        <item>Cc</item>
+        <item>Bcc</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 7349e60498..1aba685892 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -267,6 +267,7 @@
     <string name="title_no_utf8">Этот провайдер не поддерживает UTF-8</string>
     <string name="title_no_sync">Ошибки синхронизации после %1$s</string>
     <string name="title_sync_errors">Синхронизация некоторых папок не удалась</string>
+    <string name="title_identity_required">Для отправки сообщений требуется идентификатор</string>
     <string name="title_drafts_required">Для отправки сообщений требуется папка черновиков</string>
     <string name="title_account_delete">Удалить эту учетную запись навсегда?</string>
     <string name="title_identity_delete">Удалить эту учетную запись навсегда?</string>
@@ -400,6 +401,8 @@
     <string name="title_style_toolbar">Панель стилей</string>
     <string name="title_add_attachment">Добавить вложение</string>
     <string name="title_show_addresses">Показать CC / BCC</string>
+    <string name="title_insert_contact_group">Добавить группу контактов</string>
+    <string name="title_insert_template">Вставить шаблон</string>
     <string name="title_from_missing">Отправитель отсутствует</string>
     <string name="title_to_missing">Получатель отсутствует</string>
     <string name="title_attachments_missing">Не все вложения загружены</string>
@@ -538,6 +541,7 @@
     <string name="title_open_link">Открыть ссылку</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>
     <string name="title_issue">У вас есть вопрос или проблема?</string>
     <string name="title_yes">Да</string>
@@ -598,4 +602,9 @@
         <item>Средний</item>
         <item>Большой</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>Кому</item>
+        <item>Копия</item>
+        <item>Скрытая копия</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 2b34822645..b30dab765c 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -517,6 +517,7 @@
     <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_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>
     <string name="title_issue">Bir sorunuz ya da probleminiz mi var?</string>
     <string name="title_yes">Evet</string>
@@ -549,6 +550,13 @@
     <string name="title_debug_info">Hata ayıklama bilgisi</string>
     <string name="title_debug_info_remark">Lütfen sorunu açıklayın ve sorunun zamanını belirtin:</string>
     <string name="title_crash_info_remark">Lütfen uygulama çöktüğü sırada ne yaptığınızı açıklayın:</string>
+    <string-array name="pollIntervalNames">
+        <item>Her Zaman</item>
+        <item>Her yarım saatte bir</item>
+        <item>Saatte bir</item>
+        <item>2 saatte bir</item>
+        <item>4 saatte bir</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Birleşik Gelen Kutusu</item>
         <item>Birleşik klasörler</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1dc9178599..35087ce5a4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -243,6 +243,7 @@
     <string name="title_no_utf8">该邮件服务供应商不支持UTF-8字符集</string>
     <string name="title_no_sync">从 %1$s 开始同步错误</string>
     <string name="title_sync_errors">一些文件夹同步失败</string>
+    <string name="title_identity_required">需要一个身份来发送消息</string>
     <string name="title_drafts_required">需要一个草稿文件夹来发送消息</string>
     <string name="title_account_delete">确定永久删除这个账户吗？</string>
     <string name="title_identity_delete">确定永久删除这个身份吗？</string>
@@ -376,6 +377,8 @@
     <string name="title_style_toolbar">样式工具栏</string>
     <string name="title_add_attachment">添加附件</string>
     <string name="title_show_addresses">显示抄送和密送</string>
+    <string name="title_insert_contact_group">插入联系人组</string>
+    <string name="title_insert_template">插入模板</string>
     <string name="title_from_missing">缺少发件人</string>
     <string name="title_to_missing">缺少收件人</string>
     <string name="title_attachments_missing">没有下载全部附件</string>
@@ -514,6 +517,7 @@
     <string name="title_open_link">打开链接</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>
     <string name="title_issue">您要提问或有问题吗？</string>
     <string name="title_yes">是</string>
@@ -574,4 +578,9 @@
         <item>中等</item>
         <item>大</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>发送至</item>
+        <item>抄送</item>
+        <item>密送</item>
+    </string-array>
 </resources>