diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index b3b5118309..8e5fee15f7 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -683,7 +683,6 @@
     <string name="title_send">Изпращане</string>
     <string name="title_send_now">Изпращане сега</string>
     <string name="title_send_via">Изпращане чрез</string>
-    <string name="title_send_with_options">Изпрати &#8230;</string>
     <string name="title_send_at">Изпрати като &#8230;</string>
     <string name="title_send_encryption">Криптиране</string>
     <string name="title_send_priority">Приоритет</string>
@@ -721,7 +720,6 @@
     <string name="title_attachment_keywords">прикрепен,прикачен фаил,прикачени файлове,включен</string>
     <string name="title_attachment_reminder">Възнамерявате ли да добавите прикачен файл?</string>
     <string name="title_attachments_missing">Не всички файлове са свалени</string>
-    <string name="title_send_dialog_hint">Този диалогов прозорец все още ще е достъпен чрез менюто с трите точки в лентата за действие</string>
     <string name="title_draft_deleted">Черновата отказана</string>
     <string name="title_draft_saved">Черновата запазена</string>
     <string name="title_ask_send_via">Изпрати съобщение до %1$s чрез %2$s?</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index eac601125b..295f03e7e7 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -550,7 +550,6 @@
     <string name="title_save">Desa</string>
     <string name="title_send">Enviar</string>
     <string name="title_send_via">Envia com</string>
-    <string name="title_send_with_options">Envia &#8230;</string>
     <string name="title_send_at">Envia a les &#8230;</string>
     <string name="title_send_encryption">Xifratge</string>
     <string name="title_send_priority">Prioritat</string>
@@ -586,7 +585,6 @@
     <string name="title_attachment_keywords">adjunt, fitxer adjunt, fitxers adjunts inclosos</string>
     <string name="title_attachment_reminder">Teníeu la intenció d’afegir un fitxer adjunt?</string>
     <string name="title_attachments_missing">No es descarreguen tots els fitxers adjunts</string>
-    <string name="title_send_dialog_hint">Aquest diàleg encara estarà disponible a través del menú de desbordament de tres punts de la barra d’acció</string>
     <string name="title_draft_deleted">Esborrany eliminat</string>
     <string name="title_draft_saved">Esborrany desat</string>
     <string name="title_ask_send_via">Enviar missatge a %1$s mitjançant %2$s?</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index bb5af02128..947c58a273 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -723,7 +723,6 @@
     <string name="title_send">Odeslat</string>
     <string name="title_send_now">Odeslat nyní</string>
     <string name="title_send_via">Odeslat přes</string>
-    <string name="title_send_with_options">Odeslat &#8230;</string>
     <string name="title_send_at">Odeslat později &#8230;</string>
     <string name="title_send_encryption">Šifrování</string>
     <string name="title_send_priority">Priorita</string>
@@ -761,7 +760,6 @@
     <string name="title_attachment_keywords">příloha,přílohy,příloze,přílohu,přiložené,přiloženém,přiložený,přiložená,připojené,připojeném,připojený,připojená</string>
     <string name="title_attachment_reminder">Měl jste v úmyslu přidat přílohu?</string>
     <string name="title_attachments_missing">Nebyly staženy všechny přílohy</string>
-    <string name="title_send_dialog_hint">Tento dialog bude i nadále dostupný skrze tříbodové rozbalovací menu na panelu akcí</string>
     <string name="title_draft_deleted">Koncept zahozen</string>
     <string name="title_draft_saved">Koncept uložen</string>
     <string name="title_ask_send_via">Odeslat zprávu na %1$s přes %2$s?</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index c86476c854..31f399db84 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -704,7 +704,6 @@
     <string name="title_send">Send</string>
     <string name="title_send_now">Send nu</string>
     <string name="title_send_via">Send via</string>
-    <string name="title_send_with_options">Send &#8230;</string>
     <string name="title_send_at">Sendt kl. &#8230;</string>
     <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
@@ -743,7 +742,6 @@
     <string name="title_attachment_keywords">vedhæft,vedhæftet,vedhæftede,vedhæftning,vedhæftninger,vedhæftningen</string>
     <string name="title_attachment_reminder">Ville du tilføje en vedhæftning?</string>
     <string name="title_attachments_missing">Ikke alle vedhæftninger er downloadet</string>
-    <string name="title_send_dialog_hint">Denne dialog vil stadig være tilgængelig via 3-priksoverløbsmenuen på handlingsbjælken</string>
     <string name="title_draft_deleted">Kladde kasseret</string>
     <string name="title_draft_saved">Kladde gemt</string>
     <string name="title_ask_send_via">Send besked til %1$s via %2$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 846c55c810..7e10198ad0 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -230,6 +230,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_prefix_once">Re: und Fwd: nur einmal beim Antworten oder Weiterleiten voranstellen</string>
     <string name="title_advanced_extended_reply">Erweiterte Antwort-/Weiterleitungs-Kopfzeile verwenden</string>
     <string name="title_advanced_quote_reply">Beantworteten Text zitieren</string>
+    <string name="title_advanced_resize_reply">Bilder im Antworttext skalieren</string>
     <string name="title_advanced_signature_location">Signaturposition</string>
     <string name="title_advanced_signature_end">Signatur nach zitierter/weitergeleiteter Nachricht hinzufügen</string>
     <string name="title_advanced_plain_only">Immer als Reintext senden, nicht als HTML</string>
@@ -705,7 +706,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_send">Senden</string>
     <string name="title_send_now">Jetzt senden</string>
     <string name="title_send_via">Senden über</string>
-    <string name="title_send_with_options">Senden &#8230;</string>
     <string name="title_send_at">Später senden &#8230;</string>
     <string name="title_send_encryption">Verschlüsselung</string>
     <string name="title_send_priority">Priorität</string>
@@ -717,11 +717,19 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_style_color">Farbe</string>
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link einfügen</string>
+    <string name="title_add_image">Grafik hinzufügen</string>
+    <string name="title_add_image_inline">Einfügen</string>
+    <string name="title_add_image_attach">Anhängen</string>
+    <string name="title_add_image_resize">Größe ändern</string>
+    <string name="title_add_resize_pixels">&lt; %1$d Pixel</string>
+    <string name="title_add_image_select">Datei auswählen</string>
     <string name="title_add_attachment">Anhang hinzufügen</string>
     <string name="title_attachment_file">Anhang hinzufügen</string>
     <string name="title_attachment_photo">Foto aufnehmen</string>
     <string name="title_attachment_audio">Audio aufnehmen</string>
     <string name="title_show_addresses">Kopie/Blindkopie anzeigen</string>
+    <string name="title_send_dialog">Sendeoptionen anzeigen</string>
+    <string name="title_image_dialog">Grafikoptionen anzeigen</string>
     <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>
@@ -744,7 +752,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_attachment_keywords">angehängt,Anhang,Anhänge,beigefügt,Anlage,Anlagen,anbei</string>
     <string name="title_attachment_reminder">Beabsichtigen Sie einen Anhang hinzuzufügen?</string>
     <string name="title_attachments_missing">Nicht alle Dateianhänge wurden heruntergeladen</string>
-    <string name="title_send_dialog_hint">Dieser Dialog ist stets über das drei Punkte-Überlauf-Menü in der Aktionsleiste verfügbar</string>
+    <string name="title_dialog_hint">Dieser Dialog kann über das Drei-Punkte-Menü (⋮) in der oberen Aktionsleiste wieder aktiviert werden</string>
     <string name="title_draft_deleted">Entwurf gelöscht</string>
     <string name="title_draft_saved">Entwurf gespeichert</string>
     <string name="title_ask_send_via">Sende E-Mail zu %1$s über %2$s?</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d1b0144d5f..76ab1d4ce7 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -705,7 +705,6 @@
     <string name="title_send">Enviar</string>
     <string name="title_send_now">Enviar ahora</string>
     <string name="title_send_via">Enviar vía</string>
-    <string name="title_send_with_options">Enviar &#8230;</string>
     <string name="title_send_at">Enviar a &#8230;</string>
     <string name="title_send_encryption">Cifrado</string>
     <string name="title_send_priority">Prioridad</string>
@@ -744,7 +743,6 @@
     <string name="title_attachment_keywords">adjunto,adjunta,adjuntos,incluido,incluida,adjuntas</string>
     <string name="title_attachment_reminder">¿Tuvo la intención de añadir un archivo adjunto?</string>
     <string name="title_attachments_missing">No todos los adjuntos fueron descargados</string>
-    <string name="title_send_dialog_hint">Este diálogo estará disponible a través del menú desplegable de tres puntos en la barra de acción</string>
     <string name="title_draft_deleted">Borrador eliminado</string>
     <string name="title_draft_saved">Borrador guardado</string>
     <string name="title_ask_send_via">¿Enviar mensaje a %1$s vía %2$s?</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 06b52a9676..995b0aeb62 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -227,6 +227,7 @@
     <string name="title_advanced_prefix_once">Jarri aurrizkia mintzagaiari behin bakarrik erantzun edo birbidaltzean</string>
     <string name="title_advanced_extended_reply">Erabili erantzun/birbidali goiburu hedatua</string>
     <string name="title_advanced_quote_reply">Aipatu erantzundako testua</string>
+    <string name="title_advanced_resize_reply">Aldatu irudien tamaina erantzundako testuan</string>
     <string name="title_advanced_signature_location">Sinaduraren kokapena</string>
     <string name="title_advanced_signature_end">Gehitu sinadura aipatutako/bidalitako mezuaren ondoren</string>
     <string name="title_advanced_plain_only">Bidali testu soil hutsa lehenetsita</string>
@@ -701,7 +702,6 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_send">Bidali</string>
     <string name="title_send_now">Bidali orain</string>
     <string name="title_send_via">Bidali honen bidez</string>
-    <string name="title_send_with_options">Bidali &#8230;</string>
     <string name="title_send_at">Bidali noiz &#8230;</string>
     <string name="title_send_encryption">Zifratzea</string>
     <string name="title_send_priority">Lehentasuna</string>
@@ -713,11 +713,19 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_style_color">Kolorea</string>
     <string name="title_style_clear">Garbitu formatua</string>
     <string name="title_style_link">Txertatu esteka</string>
+    <string name="title_add_image">Gehitu irudia</string>
+    <string name="title_add_image_inline">Txertatu</string>
+    <string name="title_add_image_attach">Erantsi</string>
+    <string name="title_add_image_resize">Aldatu tamaina</string>
+    <string name="title_add_resize_pixels">&lt; %1$d pixel</string>
+    <string name="title_add_image_select">Aukeratu fitxategia</string>
     <string name="title_add_attachment">Gehitu eranskina</string>
     <string name="title_attachment_file">Erantsi fitxategia</string>
     <string name="title_attachment_photo">Atera argazkia</string>
     <string name="title_attachment_audio">Grabatu audioa</string>
     <string name="title_show_addresses">Erakutsi CC/BCC</string>
+    <string name="title_send_dialog">Erakutsi bidaltzeko aukerak</string>
+    <string name="title_image_dialog">Erakutsi irudien aukerak</string>
     <string name="title_media_toolbar">Multimedia tresna-barra</string>
     <string name="title_insert_contact_group">Txertatu kontaktu taldea</string>
     <string name="title_insert_template">Txertatu txantiloia</string>
@@ -740,7 +748,7 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_attachment_keywords">erantsita,eranskina,eranskinak,txertatuta</string>
     <string name="title_attachment_reminder">Eranskin bat gehitzeko asmoa zenuen?</string>
     <string name="title_attachments_missing">Ez dira eranskin guztiak deskargatu</string>
-    <string name="title_send_dialog_hint">Elkarrizketa-koadro hau ekintza-barrako hiru puntuen menuan eskuragarri dago</string>
+    <string name="title_dialog_hint">Elkarrizketa hau berriro aktibatu daiteke goiko tresna barrako hiru puntuko menuaren bidez</string>
     <string name="title_draft_deleted">Zirriborroa baztertu da</string>
     <string name="title_draft_saved">Zirriborroa gordeta</string>
     <string name="title_ask_send_via">Bidali mezua %1$s jasotzaileari %2$s bidez?</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 55dbe9bc80..a29cba1214 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -702,7 +702,6 @@
     <string name="title_send">Lähetä</string>
     <string name="title_send_now">Lähetä heti</string>
     <string name="title_send_via">Lähetä kautta</string>
-    <string name="title_send_with_options">Lähetä &#8230;</string>
     <string name="title_send_at">Lähetysaika &#8230;</string>
     <string name="title_send_encryption">Salaus</string>
     <string name="title_send_priority">Tärkeysjärjestys</string>
@@ -741,7 +740,6 @@
     <string name="title_attachment_keywords">liite,liitteet,liitetty,liitetyt,sisällytetty,lisätty,liitin,sisällytin,lisäsin</string>
     <string name="title_attachment_reminder">Oli tarkoituksenasi lisätä liite?</string>
     <string name="title_attachments_missing">Kaikkia liitteitä ei ole ladattu</string>
-    <string name="title_send_dialog_hint">Tämä valintaikkuna on saatavilla toimintopalkin kolmen pisteen valikossa</string>
     <string name="title_draft_deleted">Luonnos hylätty</string>
     <string name="title_draft_saved">Luonnos tallennettu</string>
     <string name="title_ask_send_via">Lähetäänkö viesti vastaanottajalle %1$s identiteetillä %2$s?</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 5a9abce9a5..e4710206ac 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -229,6 +229,7 @@
     <string name="title_advanced_prefix_once">Ne préfixer l\'objet qu\'une seule fois lors de la réponse ou du transfert</string>
     <string name="title_advanced_extended_reply">Utiliser l\'en-tête étendu de réponse/transfert</string>
     <string name="title_advanced_quote_reply">Citer le texte répondu</string>
+    <string name="title_advanced_resize_reply">Redimensionner les images dans le texte de la réponse</string>
     <string name="title_advanced_signature_location">Emplacement de la signature</string>
     <string name="title_advanced_signature_end">Ajouter la signature après le message cité/transféré</string>
     <string name="title_advanced_plain_only">Envoyer le texte brut uniquement par défaut</string>
@@ -704,7 +705,6 @@
     <string name="title_send">Envoyer</string>
     <string name="title_send_now">Envoyer maintenant</string>
     <string name="title_send_via">Envoyer avec</string>
-    <string name="title_send_with_options">Envoyer&#8230;</string>
     <string name="title_send_at">Envoyer à&#8230;</string>
     <string name="title_send_encryption">Chiffrement</string>
     <string name="title_send_priority">Priorité</string>
@@ -716,11 +716,19 @@
     <string name="title_style_color">Couleur</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
+    <string name="title_add_image">Ajouter une image</string>
+    <string name="title_add_image_inline">Insérer</string>
+    <string name="title_add_image_attach">Attacher</string>
+    <string name="title_add_image_resize">Redimensionner</string>
+    <string name="title_add_resize_pixels">&lt; %1$d pixels</string>
+    <string name="title_add_image_select">Sélectionner un fichier</string>
     <string name="title_add_attachment">Ajouter une pièce jointe</string>
     <string name="title_attachment_file">Joindre un fichier</string>
     <string name="title_attachment_photo">Prendre une photo</string>
     <string name="title_attachment_audio">Enregistrer un fichier audio</string>
     <string name="title_show_addresses">Afficher Cc/Cci</string>
+    <string name="title_send_dialog">Afficher les options d\'envoi</string>
+    <string name="title_image_dialog">Afficher les options de l\'image</string>
     <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>
@@ -743,7 +751,7 @@
     <string name="title_attachment_keywords">pièce jointe,pièces jointes,ci-joint,ci-jointe,ci-joints,ci-jointes</string>
     <string name="title_attachment_reminder">Avez-vous l\'intention d\'ajouter une pièce jointe ?</string>
     <string name="title_attachments_missing">Les pièces jointes ne sont pas toutes téléchargées</string>
-    <string name="title_send_dialog_hint">Cette boîte de dialogue sera toujours disponible via le menu affiché par les trois points dans la barre d\'action</string>
+    <string name="title_dialog_hint">Cette boîte de dialogue peut être réactivée via le menu (trois points) de la barre d\'action en haut</string>
     <string name="title_draft_deleted">Brouillon supprimé</string>
     <string name="title_draft_saved">Brouillon enregistré</string>
     <string name="title_ask_send_via">Envoyer le message à %1$s via %2$s ?</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index ed1d64f20c..b230b64ca4 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -334,7 +334,6 @@
     <string name="title_send">Stjoere</string>
     <string name="title_send_now">Stjoer no</string>
     <string name="title_send_via">Stjoer fia</string>
-    <string name="title_send_with_options">Stjoere &#8230;</string>
     <string name="title_send_encryption">Fersifering</string>
     <string name="title_send_priority">Prioriteit</string>
     <string name="title_style_bold">Dryst</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 60a6c50ea5..2c17ae3c2d 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -676,7 +676,6 @@
     <string name="title_send">Pošalji</string>
     <string name="title_send_now">Pošalji sada</string>
     <string name="title_send_via">Pošalji putem</string>
-    <string name="title_send_with_options">Slanje &#8230;</string>
     <string name="title_send_at">Pošalji u &#8230;</string>
     <string name="title_send_encryption">Šifriranje</string>
     <string name="title_send_priority">Prioritet</string>
@@ -713,7 +712,6 @@
     <string name="title_attachment_keywords">vezani, vezanje, prilozi, uključeni</string>
     <string name="title_attachment_reminder">Jeste li namjeravali dodati privitak?</string>
     <string name="title_attachments_missing">Ne preuzimaju se svi prilozi</string>
-    <string name="title_send_dialog_hint">Ovaj će dijalog i dalje biti dostupan putem preljevnog izbornika s tri točke na radnoj traci</string>
     <string name="title_draft_deleted">Skica odbačena</string>
     <string name="title_draft_saved">Skica spremljena</string>
     <string name="title_ask_send_via">Pošaljite poruku na %1$s putem %2$s?</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index d52f72a414..ae03446136 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -593,7 +593,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_send">Küldés</string>
     <string name="title_send_now">Küldés most</string>
     <string name="title_send_via">Küldés a következővel</string>
-    <string name="title_send_with_options">Küldés &#8230;</string>
     <string name="title_send_at">Küldés ekkor: &#8230;</string>
     <string name="title_send_encryption">Titkosítás</string>
     <string name="title_send_priority">Prioritás</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index de1f4c9095..732383b42f 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -229,6 +229,7 @@
     <string name="title_advanced_prefix_once">Prefissa l\'oggetto solo una volta per rispondere o inoltrare</string>
     <string name="title_advanced_extended_reply">Usa intestazione estesa di risposta/inoltro</string>
     <string name="title_advanced_quote_reply">Cita il testo nella risposta</string>
+    <string name="title_advanced_resize_reply">Ridimensiona le immagini nel testo di risposta</string>
     <string name="title_advanced_signature_location">Posizione della firma</string>
     <string name="title_advanced_signature_end">Aggiungi firma dopo il messaggio citato/inoltrato</string>
     <string name="title_advanced_plain_only">Invia solo in testo semplice per impostazione predefinita</string>
@@ -703,7 +704,6 @@
     <string name="title_send">Invia</string>
     <string name="title_send_now">Invia ora</string>
     <string name="title_send_via">Invia tramite</string>
-    <string name="title_send_with_options">Invia &#8230;</string>
     <string name="title_send_at">Invia alle &#8230;</string>
     <string name="title_send_encryption">Crittografia</string>
     <string name="title_send_priority">Priorità</string>
@@ -715,11 +715,19 @@
     <string name="title_style_color">Colore</string>
     <string name="title_style_clear">Cancella formattazione</string>
     <string name="title_style_link">Inserisci collegamento</string>
+    <string name="title_add_image">Aggiungi immagine</string>
+    <string name="title_add_image_inline">Inserisci</string>
+    <string name="title_add_image_attach">Allega</string>
+    <string name="title_add_image_resize">Ridimensiona</string>
+    <string name="title_add_resize_pixels">&lt; %1$d pixels</string>
+    <string name="title_add_image_select">Seleziona file</string>
     <string name="title_add_attachment">Aggiungi allegato</string>
     <string name="title_attachment_file">Allega file</string>
     <string name="title_attachment_photo">Scatta una foto</string>
     <string name="title_attachment_audio">Registra audio</string>
     <string name="title_show_addresses">Mostra CC/CCN</string>
+    <string name="title_send_dialog">Mostra opzioni invio</string>
+    <string name="title_image_dialog">Mostra opzioni immagine</string>
     <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>
@@ -742,7 +750,7 @@
     <string name="title_attachment_keywords">allegato,allegato,allegati,inclusi</string>
     <string name="title_attachment_reminder">Intende aggiungere un allegato?</string>
     <string name="title_attachments_missing">Non tutti gli allegati sono stati scaricati</string>
-    <string name="title_send_dialog_hint">Questa finestra di dialogo sarà ancora disponibile tramite il menu di overflow a tre punti nella barra di azione</string>
+    <string name="title_dialog_hint">Questa finestra di dialogo può essere riattivata tramite il menu a tre puntini nella barra di azione superiore</string>
     <string name="title_draft_deleted">Bozza eliminata</string>
     <string name="title_draft_saved">Bozza salvata</string>
     <string name="title_ask_send_via">Inviare messaggio a %1$s tramite %2$s?</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 0dd41af7f2..6d695dcb84 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -666,7 +666,6 @@ PlayストアでFairEmailを評価できれば幸いです。
     <string name="title_send">送信</string>
     <string name="title_send_now">今すぐ送信</string>
     <string name="title_send_via">～経由で送信</string>
-    <string name="title_send_with_options">送信 &#8230;</string>
     <string name="title_send_at">&#8230; 日時指定送信</string>
     <string name="title_send_encryption">暗号化</string>
     <string name="title_send_priority">優先度</string>
@@ -704,7 +703,6 @@ PlayストアでFairEmailを評価できれば幸いです。
     <string name="title_attachment_keywords">添付,添付ファイル,付属</string>
     <string name="title_attachment_reminder">添付ファイルを追加しますか？</string>
     <string name="title_attachments_missing">全ての添付ファイルがダウンロードされる訳では有りません</string>
-    <string name="title_send_dialog_hint">このダイアログはアクションバーの3ドットのオーバーフローメニューから引き続き使用出来ます</string>
     <string name="title_draft_deleted">下書きを破棄しました</string>
     <string name="title_draft_saved">下書きを保存しました</string>
     <string name="title_ask_send_via">%2$s経由で%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 ea7a493e44..8aa4b4cf36 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -704,7 +704,6 @@
     <string name="title_send">Verzenden</string>
     <string name="title_send_now">Nu verzenden</string>
     <string name="title_send_via">Verzenden via</string>
-    <string name="title_send_with_options">Verzenden &#8230;</string>
     <string name="title_send_at">Verzenden om &#8230;</string>
     <string name="title_send_encryption">Versleuteling</string>
     <string name="title_send_priority">Prioriteit</string>
@@ -727,6 +726,8 @@
     <string name="title_attachment_photo">Foto nemen</string>
     <string name="title_attachment_audio">Geluid opnemen</string>
     <string name="title_show_addresses">Toon CC/BCC</string>
+    <string name="title_send_dialog">Toon verzendopties</string>
+    <string name="title_image_dialog">Toon afbeeldingsopties</string>
     <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>
@@ -749,7 +750,7 @@
     <string name="title_attachment_keywords">bijlage,bijlagen</string>
     <string name="title_attachment_reminder">Was u van plan een bijlage toe te voegen?</string>
     <string name="title_attachments_missing">Niet alle bijlagen zijn gedownload</string>
-    <string name="title_send_dialog_hint">Dit dialoogvenster is nog steeds beschikbaar via het driepuntsoverloopmenu in de actiebalk</string>
+    <string name="title_dialog_hint">Dit dialoogvenster kan opnieuw worden ingeschakeld via het 3-puntenmenu in de bovenste actiebalk</string>
     <string name="title_draft_deleted">Concept weggegooid</string>
     <string name="title_draft_saved">Concept opgeslagen</string>
     <string name="title_ask_send_via">Verstuur bericht naar %1$s via %2$s?</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index c9a8c751c6..c673ae136d 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -701,7 +701,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_send">Send</string>
     <string name="title_send_now">Send nå</string>
     <string name="title_send_via">Send via</string>
-    <string name="title_send_with_options">Send &#8230;</string>
     <string name="title_send_at">Sender &#8230;</string>
     <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
@@ -739,7 +738,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_attachment_keywords">festet, feste, vedlegg, inkludert</string>
     <string name="title_attachment_reminder">Hadde du tenkt å legge til et vedlegg?</string>
     <string name="title_attachments_missing">Ikke alle vedlegg er lastet ned</string>
-    <string name="title_send_dialog_hint">Denne dialogboksen vil fremdeles være tilgjengelig via trepunkts menyen i handlingslinjen</string>
     <string name="title_draft_deleted">Utkast forkastet</string>
     <string name="title_draft_saved">Utkast lagret</string>
     <string name="title_ask_send_via">Send meldingen til %1$s via %2$s?</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index c9a8c751c6..c673ae136d 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -701,7 +701,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_send">Send</string>
     <string name="title_send_now">Send nå</string>
     <string name="title_send_via">Send via</string>
-    <string name="title_send_with_options">Send &#8230;</string>
     <string name="title_send_at">Sender &#8230;</string>
     <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
@@ -739,7 +738,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_attachment_keywords">festet, feste, vedlegg, inkludert</string>
     <string name="title_attachment_reminder">Hadde du tenkt å legge til et vedlegg?</string>
     <string name="title_attachments_missing">Ikke alle vedlegg er lastet ned</string>
-    <string name="title_send_dialog_hint">Denne dialogboksen vil fremdeles være tilgjengelig via trepunkts menyen i handlingslinjen</string>
     <string name="title_draft_deleted">Utkast forkastet</string>
     <string name="title_draft_saved">Utkast lagret</string>
     <string name="title_ask_send_via">Send meldingen til %1$s via %2$s?</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index dfc9d7450f..2b81e59f36 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -716,7 +716,6 @@
     <string name="title_send">Wyślij</string>
     <string name="title_send_now">Wyślij teraz</string>
     <string name="title_send_via">Wyślij przez</string>
-    <string name="title_send_with_options">Wyślij &#8230;</string>
     <string name="title_send_at">Wysłać o &#8230;</string>
     <string name="title_send_encryption">Szyfrowanie</string>
     <string name="title_send_priority">Priorytet</string>
@@ -754,7 +753,6 @@
     <string name="title_attachment_keywords">załączony, załącznik, załączniki, w zestawie, w załączonym</string>
     <string name="title_attachment_reminder">Czy zamierzałeś dodać załącznik?</string>
     <string name="title_attachments_missing">Nie wszystkie załączniki są pobrane</string>
-    <string name="title_send_dialog_hint">To okno dialogowe będzie nadal dostępne za pośrednictwem menu z trzema kropkami na pasku akcji</string>
     <string name="title_draft_deleted">Szkic odrzucony</string>
     <string name="title_draft_saved">Szkic zapisany</string>
     <string name="title_ask_send_via">Wyślij wiadomość do %1$s przez %2$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 89f575a432..ba661354ac 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -613,7 +613,6 @@
     <string name="title_send">Enviar</string>
     <string name="title_send_now">Envie agora</string>
     <string name="title_send_via">Enviar via</string>
-    <string name="title_send_with_options">Enviar &#8230;</string>
     <string name="title_send_at">Enviar em &#8230;</string>
     <string name="title_send_encryption">Criptografia</string>
     <string name="title_send_priority">Prioridade</string>
@@ -649,7 +648,6 @@
     <string name="title_attachment_keywords">anexado,anexo,anexos,incluídos</string>
     <string name="title_attachment_reminder">Você quis adicionar um anexo?</string>
     <string name="title_attachments_missing">Nem todos os anexos foram baixados</string>
-    <string name="title_send_dialog_hint">Essa caixa de diálogo ainda estará disponível através do menu de três pontos na barra de ação</string>
     <string name="title_draft_deleted">Rascunho descartado</string>
     <string name="title_draft_saved">Rascunho salvo</string>
     <string name="title_ask_send_via">Enviar mensagem para %1$s via %2$s?</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 20bc619995..f327559e12 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -713,7 +713,6 @@
     <string name="title_send">Trimite</string>
     <string name="title_send_now">Trimite acum</string>
     <string name="title_send_via">Trimite prin</string>
-    <string name="title_send_with_options">Trimite &#8230;</string>
     <string name="title_send_at">Trimite la &#8230;</string>
     <string name="title_send_encryption">Criptare</string>
     <string name="title_send_priority">Prioritate</string>
@@ -752,7 +751,6 @@
     <string name="title_attachment_keywords">atasez,atasat,atasate,atsament,atașez,atașat,atașament</string>
     <string name="title_attachment_reminder">Ați intenționat să adăugați un atașament?</string>
     <string name="title_attachments_missing">Nu toate ataşamentele se descarcă</string>
-    <string name="title_send_dialog_hint">Acest dialog va fi disponibil în meniul cu trei puncte din bara de acțiuni</string>
     <string name="title_draft_deleted">S-a renunțat la ciornă</string>
     <string name="title_draft_saved">Ciornă salvată</string>
     <string name="title_ask_send_via">Trimite mesajul către %1$s via %2$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 41df033896..677cadbb26 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -726,7 +726,6 @@
     <string name="title_send">Отправить</string>
     <string name="title_send_now">Отправить сейчас</string>
     <string name="title_send_via">Отправить через</string>
-    <string name="title_send_with_options">Отправить&#8230;</string>
     <string name="title_send_at">Отправить в&#8230;</string>
     <string name="title_send_encryption">Шифрование</string>
     <string name="title_send_priority">Приоритет</string>
@@ -765,7 +764,6 @@
     <string name="title_attachment_keywords">attached,attachment,attachments,included,вложение,вложения,вложении,приложено</string>
     <string name="title_attachment_reminder">Вы хотите добавить вложение?</string>
     <string name="title_attachments_missing">Не все вложения загружены</string>
-    <string name="title_send_dialog_hint">Этот диалог будет по-прежнему доступен через верхнее меню трёх точек в панели действий</string>
     <string name="title_draft_deleted">Черновик отклонён</string>
     <string name="title_draft_saved">Черновик сохранён</string>
     <string name="title_ask_send_via">Отправить сообщение для %1$s через %2$s?</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 595e3518fa..bd5c207035 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -557,7 +557,6 @@
     <string name="title_save">Сачувај</string>
     <string name="title_send">Пошаљи</string>
     <string name="title_send_via">Пошаљи преко</string>
-    <string name="title_send_with_options">Слање &#8230;</string>
     <string name="title_send_at">Слање у &#8230;</string>
     <string name="title_send_encryption">Шифровање</string>
     <string name="title_send_priority">Приоритет</string>
@@ -593,7 +592,6 @@
     <string name="title_attachment_keywords">attached,attachment,attachments,included;прилог;додатак;прилогу;додатку;приложени;атачмент;prilog;dodatak;prilogu;dodatku;priloženi;atačment</string>
     <string name="title_attachment_reminder">Да ли сте планирали да додате прилог?</string>
     <string name="title_attachments_missing">Нису сви прилози преузети</string>
-    <string name="title_send_dialog_hint">Овај дијалог ће и даље бити доступан преко менија са три тачке у траци са радњама</string>
     <string name="title_draft_deleted">Нацрт одбачен</string>
     <string name="title_draft_saved">Нацрт сачуван</string>
     <string name="title_ask_send_via">Пошаљи поруку за %1$s преко %2$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 4f11979f36..8edbe34778 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -703,7 +703,6 @@
     <string name="title_send">Skicka</string>
     <string name="title_send_now">Skicka nu</string>
     <string name="title_send_via">Skicka via</string>
-    <string name="title_send_with_options">Skicka &#8230;</string>
     <string name="title_send_at">Skickad &#8230;</string>
     <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
@@ -742,7 +741,6 @@
     <string name="title_attachment_keywords">bifogad,bilaga,bilaga,inkluderat</string>
     <string name="title_attachment_reminder">Hade du för avsikt att lägga till en bifogad fil?</string>
     <string name="title_attachments_missing">Inte alla bilagor har hämtats</string>
-    <string name="title_send_dialog_hint">Den här dialogrutan kommer fortfarande att vara tillgänglig via menyn med tre punkter i åtgärdsfältet</string>
     <string name="title_draft_deleted">Utkastet slängdes</string>
     <string name="title_draft_saved">Utkast sparat</string>
     <string name="title_ask_send_via">Skicka meddelande till %1$s via %2$s?</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 8da922fa4b..74d31589fd 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -642,7 +642,6 @@
     <string name="title_send">Gönder</string>
     <string name="title_send_now">Şimdi gönder</string>
     <string name="title_send_via">Üzerinden gönder</string>
-    <string name="title_send_with_options">Gönder &#8230;</string>
     <string name="title_send_at">&#8230;\'te gönder</string>
     <string name="title_send_encryption">Şifreleme</string>
     <string name="title_send_priority">Öncelik</string>
@@ -678,7 +677,6 @@
     <string name="title_attachment_keywords">eklendi,ek,ekler,dahil edildi</string>
     <string name="title_attachment_reminder">Bir ek eklemek niyetinde misiniz?</string>
     <string name="title_attachments_missing">Tüm ekler indirilmedi</string>
-    <string name="title_send_dialog_hint">Bu diyalog, üç-nokta overflow menüsü aracılığıyla eylem çubuğunda yine mevcut olacaktır</string>
     <string name="title_draft_deleted">Taslak silindi</string>
     <string name="title_draft_saved">Taslak kaydedildi</string>
     <string name="title_ask_send_via">%1$s\'e %2$s üzerinden ileti gönderilsin mi?</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cb254647d8..5b112c3283 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -217,6 +217,7 @@
     <string name="title_advanced_prefix_once">答复或抄送邮件时, 主题前的Re或CC只出现一次</string>
     <string name="title_advanced_extended_reply">使用扩展回复/转发头</string>
     <string name="title_advanced_quote_reply">引用回复文本</string>
+    <string name="title_advanced_resize_reply">调整回复文本中图像的大小</string>
     <string name="title_advanced_signature_location">签名位置</string>
     <string name="title_advanced_signature_end">在引用/转发消息后添加签名</string>
     <string name="title_advanced_plain_only">默认仅发送纯文本</string>
@@ -692,7 +693,6 @@
     <string name="title_send">发送</string>
     <string name="title_send_now">现在发送</string>
     <string name="title_send_via">发送方式</string>
-    <string name="title_send_with_options">发送 &#8230;</string>
     <string name="title_send_at">发送于 &#8230;</string>
     <string name="title_send_encryption">加密</string>
     <string name="title_send_priority">优先级</string>
@@ -704,11 +704,19 @@
     <string name="title_style_color">颜色</string>
     <string name="title_style_clear">清除格式</string>
     <string name="title_style_link">插入链接</string>
+    <string name="title_add_image">添加图片</string>
+    <string name="title_add_image_inline">插入</string>
+    <string name="title_add_image_attach">附加</string>
+    <string name="title_add_image_resize">调整大小</string>
+    <string name="title_add_resize_pixels">&lt; %1$d像素</string>
+    <string name="title_add_image_select">选择文件</string>
     <string name="title_add_attachment">添加附件</string>
     <string name="title_attachment_file">插入附件</string>
     <string name="title_attachment_photo">拍照</string>
     <string name="title_attachment_audio">录音</string>
     <string name="title_show_addresses">显示抄送和密送</string>
+    <string name="title_send_dialog">显示发送选项</string>
+    <string name="title_image_dialog">显示图像选项</string>
     <string name="title_media_toolbar">媒体工具栏</string>
     <string name="title_insert_contact_group">插入联系人组</string>
     <string name="title_insert_template">插入模板</string>
@@ -731,7 +739,7 @@
     <string name="title_attachment_keywords">至少包含一个附件</string>
     <string name="title_attachment_reminder">您是否打算添加一个附件？</string>
     <string name="title_attachments_missing">没有下载全部附件</string>
-    <string name="title_send_dialog_hint">操作栏的三点溢出菜单内仍可以找到该对话框</string>
+    <string name="title_dialog_hint">此对话框可以通过顶部操作栏中的三点菜单再次启用</string>
     <string name="title_draft_deleted">草稿已舍弃</string>
     <string name="title_draft_saved">草稿已保存</string>
     <string name="title_ask_send_via">要通过%2$s把消息发送给 %1$s 吗？</string>