diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 2058d44a0f..1a718d7cd9 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Barra d\'eines multimèdia</string>
     <string name="title_insert_contact_group">Introdueixi la informació de grup</string>
     <string name="title_insert_template">Inserta plantilla</string>
+    <string name="title_edit_plain_text">Editar en text pla</string>
+    <string name="title_edit_formatted_text">Editar com a text amb format</string>
     <string name="title_send_plain_text">Només text pla</string>
     <string name="title_send_receipt">Sol·liciteu el lliurament/llegida del rebut</string>
     <string name="title_send_receipt_remark">La majoria de proveïdors i clients de correu electrònic ignoren les sol·licituds de recepció</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 75f1c3dfdf..8d6211a918 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -313,6 +313,7 @@
     <string name="title_select">Vælg &#8230;</string>
     <string name="title_identity_name">Dit navn</string>
     <string name="title_identity_email">Din e-mailadresse</string>
+    <string name="title_identity_color_hint">Identitetsfarver har forrang over kontofarver</string>
     <string name="title_advanced_sender">Tillad redigering af afsenderadresse</string>
     <string name="title_advanced_sender_regex">Regex, der matcher redigerede adresser</string>
     <string name="title_identity_reply_to">Svar til-adresse</string>
@@ -540,6 +541,8 @@
     <string name="title_media_toolbar">Medieværktøjsbjælke</string>
     <string name="title_insert_contact_group">Indsæt kontaktgruppe</string>
     <string name="title_insert_template">Indsæt skabelon</string>
+    <string name="title_edit_plain_text">Redigér som almindelig tekst</string>
+    <string name="title_edit_formatted_text">Redigér som omformateret tekst</string>
     <string name="title_send_plain_text">Kun klartekst</string>
     <string name="title_send_receipt">Bed om leverings-/læstkvittering</string>
     <string name="title_send_receipt_remark">De fleste udbydere og e-mailklienter ignorerer kvitteringsanmodninger</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 472143c791..c4ceb0f4ae 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -541,6 +541,8 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_media_toolbar">Mediensymbolleiste</string>
     <string name="title_insert_contact_group">Kontaktgruppe einfügen</string>
     <string name="title_insert_template">Vorlage einfügen</string>
+    <string name="title_edit_plain_text">Als Plain Text bearbeiten</string>
+    <string name="title_edit_formatted_text">Als reformierten Text bearbeiten</string>
     <string name="title_send_plain_text">Nur Text</string>
     <string name="title_send_receipt">Lieferung/Lesebestätigung anfordern</string>
     <string name="title_send_receipt_remark">Die meisten Anbieter und E-Mail-Clients ignorieren Quittungsanfragen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 606148cc11..5e2e1aa4a6 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Barra de herramientas multimedia</string>
     <string name="title_insert_contact_group">Insertar grupo de contactos</string>
     <string name="title_insert_template">Insertar plantilla</string>
+    <string name="title_edit_plain_text">Editar como texto plano</string>
+    <string name="title_edit_formatted_text">Editar como texto con formato</string>
     <string name="title_send_plain_text">Sólo en texto plano</string>
     <string name="title_send_receipt">Solicitar recibo de entrega/lectura</string>
     <string name="title_send_receipt_remark">La mayoría de los clientes y proveedores de email ignoran los pedidos de recibos</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index d262669326..72f2987012 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -314,6 +314,7 @@
     <string name="title_select">Valitse &#8230;</string>
     <string name="title_identity_name">Nimesi</string>
     <string name="title_identity_email">Sähköpostiosoitteesi</string>
+    <string name="title_identity_color_hint">Identiteettien värit ovat etusijalla ennen kansioiden ja tilien värejä</string>
     <string name="title_advanced_sender">Salli lähetysosoitteen muokkaaminen</string>
     <string name="title_advanced_sender_regex">Regex muokattavien osoitteiden täsmäämiseen</string>
     <string name="title_identity_reply_to">Vastausosoite</string>
@@ -541,6 +542,8 @@
     <string name="title_media_toolbar">Mediatyökalupalkki</string>
     <string name="title_insert_contact_group">Lisää yhteystietoryhmä</string>
     <string name="title_insert_template">Lisää viestipohja</string>
+    <string name="title_edit_plain_text">Muokkaa pelkkänä tekstinä</string>
+    <string name="title_edit_formatted_text">Muokkaa uudelleenmuotoiltuna tekstinä</string>
     <string name="title_send_plain_text">Lähetä muotoilemattomana tekstinä</string>
     <string name="title_send_receipt">Pyydä toimitus-/lukukuittaus</string>
     <string name="title_send_receipt_remark">Useimmat palveluntarjoajat ja sähköpostisovellukset jättävät kuittauspyynnöt huomioimatta</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1cae23243a..72e27a8c8f 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Barre d\'outils média</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_edit_plain_text">Modifier comme texte brut</string>
+    <string name="title_edit_formatted_text">Modifier comme texte reformaté</string>
     <string name="title_send_plain_text">Texte brut seulement</string>
     <string name="title_send_receipt">Demander un accusé de réception/lecture</string>
     <string name="title_send_receipt_remark">La plupart des fournisseurs et des clients de messagerie ignorent les demandes d\'accusé de réception</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 60e1ad49e4..ee66d8a404 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -313,6 +313,7 @@
     <string name="title_select">Seleziona &#8230;</string>
     <string name="title_identity_name">Il tuo nome</string>
     <string name="title_identity_email">Il tuo indirizzo email</string>
+    <string name="title_identity_color_hint">I colori dell\'identità hanno precedenza sui colori di cartella e account</string>
     <string name="title_advanced_sender">Consenti la modifica dell\'indirizzo mittente</string>
     <string name="title_advanced_sender_regex">Regex per abbinare gli indirizzi modificati</string>
     <string name="title_identity_reply_to">Rispondi all\'indirizzo</string>
@@ -540,6 +541,8 @@
     <string name="title_media_toolbar">Barra strumenti media</string>
     <string name="title_insert_contact_group">Inserisci gruppo di contatto</string>
     <string name="title_insert_template">Inserisci modello</string>
+    <string name="title_edit_plain_text">Modifica come testo semplice</string>
+    <string name="title_edit_formatted_text">Modifica come testo riformattato</string>
     <string name="title_send_plain_text">Solo testo semplice</string>
     <string name="title_send_receipt">Richiedi ricevuta di consegna/lettura</string>
     <string name="title_send_receipt_remark">La maggior parte dei provider e dei client di posta elettronica ignora le richieste di ricevuta</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 1ac41e2a71..b4893b796c 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -17,6 +17,7 @@
     <string name="menu_answers">テンプレート</string>
     <string name="menu_operations">操作</string>
     <string name="menu_setup">設定</string>
+    <string name="menu_legend">凡例</string>
     <string name="menu_faq">サポート</string>
     <string name="menu_issue">問題を報告</string>
     <string name="menu_privacy">プライバシー</string>
@@ -32,6 +33,7 @@
     <string name="title_list_accounts">アカウント</string>
     <string name="title_setup">設定</string>
     <string name="title_setup_help">ヘルプ</string>
+    <string name="title_setup_quick">クイックセットアップ</string>
     <string name="title_setup_to_do">To Do</string>
     <string name="title_setup_done">完了</string>
     <string name="title_setup_export">設定をエクスポート</string>
@@ -39,12 +41,14 @@
     <string name="title_setup_password">パスワード</string>
     <string name="title_setup_theme">テーマを選択</string>
     <string name="title_setup_options">オプション</string>
+    <string name="title_advanced_section_main">基本</string>
     <string name="title_advanced_section_synchronize">受信</string>
     <string name="title_advanced_section_send">送信</string>
     <string name="title_advanced_section_connection">接続</string>
     <string name="title_advanced_section_display">表示</string>
     <string name="title_advanced_section_behavior">動作</string>
     <string name="title_advanced_section_notifications">通知</string>
+    <string name="title_advanced_section_privacy">プライバシー</string>
     <string name="title_advanced_section_misc">その他</string>
     <string name="title_advanced_schedule">スケジュール</string>
     <string name="title_advanced_unseen">すべての未読メッセージ</string>
@@ -78,6 +82,7 @@
     <string name="title_folder_drafts">下書き</string>
     <string name="title_folder_trash">ゴミ箱</string>
     <string name="title_folder_junk">スパム</string>
+    <string name="title_folder_sent">送信済み</string>
     <string name="title_folder_system">システム</string>
     <string name="title_folder_user">ユーザー</string>
     <string name="title_print">印刷</string>
@@ -89,6 +94,11 @@
     <string name="title_spam">スパム</string>
     <string name="title_reply_to_all">すべて</string>
     <string name="title_reply_template">テンプレート</string>
+    <string name="title_from">From:</string>
+    <string name="title_to">To:</string>
+    <string name="title_via_identity">経由:</string>
+    <string name="title_received">受信:</string>
+    <string name="title_size">サイズ:</string>
     <string name="title_search">検索</string>
     <string name="title_select_all">すべて選択</string>
     <string name="title_previous">前へ</string>
@@ -96,10 +106,12 @@
     <string name="title_answer_caption">テンプレートを編集</string>
     <string name="title_rule_answer">返信</string>
     <string name="title_rule_check">確認</string>
+    <string name="title_legend_sent">送信済み</string>
     <string name="title_select_app">アプリを選択</string>
     <string name="title_undo">元に戻す</string>
     <string name="title_redo">やり直し</string>
     <string name="title_add">追加</string>
+    <string name="title_via">経由: %1$s</string>
     <string name="title_unexpected_error">予期しないエラー</string>
     <string name="title_log">ログ</string>
     <string-array name="downloadNames">
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index ad6d36f82a..ad5b439e22 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Media werkbalk</string>
     <string name="title_insert_contact_group">Contactgroep toevoegen</string>
     <string name="title_insert_template">Sjabloon invoegen</string>
+    <string name="title_edit_plain_text">Bewerk als platte tekst</string>
+    <string name="title_edit_formatted_text">Bewerk als geformatteerde tekst</string>
     <string name="title_send_plain_text">Alleen platte tekst</string>
     <string name="title_send_receipt">Vraag ontvangst/leesbevestiging</string>
     <string name="title_send_receipt_remark">De meeste aanbieders en e-mail clients negeren bevestigingsverzoeken</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index e4ec50292c..f345e69612 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Media verktøylinje</string>
     <string name="title_insert_contact_group">Sett inn kontaktgruppe</string>
     <string name="title_insert_template">Sett inn mal</string>
+    <string name="title_edit_plain_text">Rediger som ren tekst</string>
+    <string name="title_edit_formatted_text">Rediger som omformatert tekst</string>
     <string name="title_send_plain_text">Bare vanlig tekst</string>
     <string name="title_send_receipt">Be om levert/lest kvittering</string>
     <string name="title_send_receipt_remark">De fleste tilbydere og e-post klienter ignorerer kvitterings forespørsler</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index e4ec50292c..f345e69612 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Media verktøylinje</string>
     <string name="title_insert_contact_group">Sett inn kontaktgruppe</string>
     <string name="title_insert_template">Sett inn mal</string>
+    <string name="title_edit_plain_text">Rediger som ren tekst</string>
+    <string name="title_edit_formatted_text">Rediger som omformatert tekst</string>
     <string name="title_send_plain_text">Bare vanlig tekst</string>
     <string name="title_send_receipt">Be om levert/lest kvittering</string>
     <string name="title_send_receipt_remark">De fleste tilbydere og e-post klienter ignorerer kvitterings forespørsler</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 675909ab05..49c426a08f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -250,7 +250,7 @@
     <string name="title_advanced_text_color">Показывать цвета текста</string>
     <string name="title_advanced_collapse_quotes">Свернуть цитируемый текст</string>
     <string name="title_advanced_images_inline">Автоматически показывать встроенные изображения</string>
-    <string name="title_advanced_seekbar">Показывать относительное положение диалога с точкой</string>
+    <string name="title_advanced_seekbar">Показывать относительное положение диалога точкой</string>
     <string name="title_advanced_actionbar">Показывать панель управления диалогами</string>
     <string name="title_advanced_pull_refresh">Потянуть вниз для обновления</string>
     <string name="title_advanced_autoscroll">Прокрутить к началу списка при получении новых сообщений</string>
@@ -336,6 +336,7 @@
     <string name="title_select">Выбор&#8230;</string>
     <string name="title_identity_name">Ваше имя</string>
     <string name="title_identity_email">Ваш адрес электронной почты</string>
+    <string name="title_identity_color_hint">Цвета идентификаторов имеют приоритет над цветами папок учётных записей</string>
     <string name="title_advanced_sender">Разрешить редактирование адреса отправителя</string>
     <string name="title_advanced_sender_regex">Регулярное выражение для сопоставления отредактированных адресов</string>
     <string name="title_identity_reply_to">Обратный адрес</string>
@@ -563,6 +564,8 @@
     <string name="title_media_toolbar">Панель медиа</string>
     <string name="title_insert_contact_group">Добавить группу контактов</string>
     <string name="title_insert_template">Вставить шаблон</string>
+    <string name="title_edit_plain_text">Редактировать как простой текст</string>
+    <string name="title_edit_formatted_text">Редактировать как исходный текст</string>
     <string name="title_send_plain_text">Только простой текст</string>
     <string name="title_send_receipt">Запросить уведомление о доставке/прочтении</string>
     <string name="title_send_receipt_remark">Большинство провайдеров и клиентов электронной почты игнорируют запросы о доставке</string>
@@ -786,7 +789,7 @@
     <string name="title_now">Сейчас</string>
     <string name="title_after">После %1$s</string>
     <string name="title_reset">Сброс</string>
-    <string name="title_hours">Часы</string>
+    <string name="title_hours">час.</string>
     <string name="title_minutes">мин.</string>
     <string name="title_dismiss">Отклонить</string>
     <string name="title_snooze_now">Отложить</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index d746ac48e9..feb95786bf 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -542,6 +542,8 @@
     <string name="title_media_toolbar">Medya araç çubuğu</string>
     <string name="title_insert_contact_group">Kişi grubuna ekle</string>
     <string name="title_insert_template">Kalıp ekle</string>
+    <string name="title_edit_plain_text">Düz metin olarak düzenle</string>
+    <string name="title_edit_formatted_text">Yeniden biçimlendirilmiş metin olarak düzenle</string>
     <string name="title_send_plain_text">Yalnızca düz metin</string>
     <string name="title_send_receipt">İletildi/okundu bilgisi iste</string>
     <string name="title_send_receipt_remark">Çoğu sağlayıcı ve e-posta istemcisi alındı isteklerini yok saymaktadır</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b83fb193ff..dd0ff04ad3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -302,6 +302,7 @@
     <string name="title_select">选择 &#8230;</string>
     <string name="title_identity_name">姓名</string>
     <string name="title_identity_email">电子邮件地址</string>
+    <string name="title_identity_color_hint">身份颜色优先于文件夹和帐户颜色</string>
     <string name="title_advanced_sender">允许编辑发件人地址</string>
     <string name="title_advanced_sender_regex">正则表达式匹配编辑的地址</string>
     <string name="title_identity_reply_to">回复地址</string>
@@ -529,6 +530,8 @@
     <string name="title_media_toolbar">媒体工具栏</string>
     <string name="title_insert_contact_group">插入联系人组</string>
     <string name="title_insert_template">插入模板</string>
+    <string name="title_edit_plain_text">以纯文本形式编辑</string>
+    <string name="title_edit_formatted_text">以格式化文本形式编辑</string>
     <string name="title_send_plain_text">仅纯文本</string>
     <string name="title_send_receipt">请求送达／已读回执</string>
     <string name="title_send_receipt_remark">大多数供应商和电子邮件客户都忽略回执请求</string>