diff --git a/.locale-state.metadata b/.locale-state.metadata
index d6b8f7bced..b591db60b9 100644
--- a/.locale-state.metadata
+++ b/.locale-state.metadata
@@ -1,4 +1,4 @@
 {
   "project": "android-mail-new",
-  "locale": "72c66f66b77578a9c307033760b6e2501d4b565a"
+  "locale": "353c68b3a2aa9168af814bcd25cee7aa5c536536"
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml
index 077e33f835..37605316c0 100644
--- a/app/src/main/res/values-b+es+419/strings.xml
+++ b/app/src/main/res/values-b+es+419/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Mensaje enviado</string>
   <string name="mailbox_message_sending_error">Error al enviar el mensaje</string>
   <string name="mailbox_message_sending_error_address_disabled">Esta dirección está desactivada. Error con el envío.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s está deshabilitado, envío fallido.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s y %d más direcciones están deshabilitadas, envío fallido</string>
   <string name="mailbox_message_sending_error_action">Ir a Borradores</string>
   <string name="mailbox_attachment_uploading_error">Error al cargar el archivo adjunto</string>
   <string name="notification_switched_account">Se cambió a la cuenta %s</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 0e41ca7e87..5baec4074b 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Паведамленне адпраўлена</string>
   <string name="mailbox_message_sending_error">Памылка адпраўкі паведамлення</string>
   <string name="mailbox_message_sending_error_address_disabled">Збой адпраўкі. Гэты адрас адключаны.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s адключаны. Збой адпраўкі</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s і яшчэ %d адрасы адключаны. Збой адпраўкі</string>
   <string name="mailbox_message_sending_error_action">Перайсці ў Чарнавікі</string>
   <string name="mailbox_attachment_uploading_error">Памылка запампоўвання далучэння</string>
   <string name="notification_switched_account">Зменена на ўліковы запіс %s</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 43616a1d4b..fa95fc2c59 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">S\'ha enviat el missatge.</string>
   <string name="mailbox_message_sending_error">Error enviant el missatge</string>
   <string name="mailbox_message_sending_error_address_disabled">Aquesta adreça està inhabilitada, l\'enviament ha fallat.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">L\'adreça %s està inhabilitada, l\'enviament ha fallat.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">Les adreces %s i %d estan inhabilitades, no s\'ha pogut fer l\'enviament.</string>
   <string name="mailbox_message_sending_error_action">Aneu a Esborranys</string>
   <string name="mailbox_attachment_uploading_error">S\'ha produït un error en carregar l\'adjunt.</string>
   <string name="notification_switched_account">S\'ha canviat al compte %s.</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cb24714cf7..8911ec7575 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Zpráva odeslána</string>
   <string name="mailbox_message_sending_error">Chyba při odesílání zprávy</string>
   <string name="mailbox_message_sending_error_address_disabled">Tato adresa je deaktivována, odeslání selhalo</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s je deaktivována, odeslání selhalo</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Přejít do Konceptů</string>
   <string name="mailbox_attachment_uploading_error">Chyba při nahrávání přílohy</string>
   <string name="notification_switched_account">Přepnuto na účet %s</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 9c943ce1d4..be67701f9b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Besked sendt</string>
   <string name="mailbox_message_sending_error">Fejl ved afsendelse af besked</string>
   <string name="mailbox_message_sending_error_address_disabled">Denne adresse er deaktiveret, afsendelse mislykkedes</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s er deaktiveret, afsendelse mislykkedes</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s og %d flere adresser er deaktiveret, afsendelse mislykkedes</string>
   <string name="mailbox_message_sending_error_action">Gå til kladder</string>
   <string name="mailbox_attachment_uploading_error">Fejl ved upload af vedhæftning</string>
   <string name="notification_switched_account">Skiftet til konto %s</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 248d99dbd4..3b0a39e458 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Nachricht gesendet</string>
   <string name="mailbox_message_sending_error">Fehler beim Senden der Nachricht</string>
   <string name="mailbox_message_sending_error_address_disabled">Diese Adresse ist deaktiviert, Senden fehlgeschlagen</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s ist deaktiviert, Senden fehlgeschlagen</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s und %d weitere Adressen sind deaktiviert, Senden fehlgeschlagen</string>
   <string name="mailbox_message_sending_error_action">Zu den Entwürfen</string>
   <string name="mailbox_attachment_uploading_error">Fehler beim Hochladen des Anhangs.</string>
   <string name="notification_switched_account">Zu Konto „%s“ gewechselt</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index abb1d6a470..a1a825b2ed 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Το μήνυμα στάλθηκε</string>
   <string name="mailbox_message_sending_error">Σφάλμα κατά την αποστολή του μηνύματος</string>
   <string name="mailbox_message_sending_error_address_disabled">Αυτή η διεύθυνση είναι απενεργοποιημένη, η αποστολή απέτυχε.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s είναι απενεργοποιημένη, η αποστολή απέτυχε</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s και %d επιπλέον διευθύνσεις είναι απενεργοποιημένες, η αποστολή απέτυχε</string>
   <string name="mailbox_message_sending_error_action">Μετάβαση στα Πρόχειρα</string>
   <string name="mailbox_attachment_uploading_error">Σφάλμα κατά τη μεταφόρτωση συνημμένου</string>
   <string name="notification_switched_account">Έγινε αλλαγή σε λογαριασμό %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 84ba296d63..fc7f0edec6 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Se ha enviado el mensaje.</string>
   <string name="mailbox_message_sending_error">Error al enviar el mensaje</string>
   <string name="mailbox_message_sending_error_address_disabled">Esta dirección está desactivada. Error con el envío.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Ir a la carpeta de borradores</string>
   <string name="mailbox_attachment_uploading_error">Error al cargar el archivo adjunto</string>
   <string name="notification_switched_account">Se ha cambiado a la cuenta %s</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 777ba97ce1..94a3686346 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Viesti lähetettiin</string>
   <string name="mailbox_message_sending_error">Virhe lähetettäessä viestiä</string>
   <string name="mailbox_message_sending_error_address_disabled">Tämä osoite on poistettu käytöstä, lähettäminen epäonnistui.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Avaa luonnokset</string>
   <string name="mailbox_attachment_uploading_error">Virhe lisättäessä liitettä</string>
   <string name="notification_switched_account">Vaihdettiin tiliin %s</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b2999b2a95..00a7156010 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Le message a été envoyé.</string>
   <string name="mailbox_message_sending_error">Une erreur s\'est produite lors de l\'envoi du message.</string>
   <string name="mailbox_message_sending_error_address_disabled">Cette adresse est désactivée. L\'envoi n\'a pas abouti.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s est désactivée. L\'envoi n\'a pas abouti.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s et %d autres adresses sont désactivées. L\'envoi n\'a pas abouti.</string>
   <string name="mailbox_message_sending_error_action">Déplacer vers le dossier Brouillons</string>
   <string name="mailbox_attachment_uploading_error">La pièce jointe n\'a pas pu être chargée.</string>
   <string name="notification_switched_account">Basculé sur le compte %s</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ceba5e5625..0243295055 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">संदेश भेजा गया</string>
   <string name="mailbox_message_sending_error">संदेश भेजने में समस्या आई</string>
   <string name="mailbox_message_sending_error_address_disabled">This address is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">ड्राफ्ट पर जाएं</string>
   <string name="mailbox_attachment_uploading_error">अटैचमेंट अपलोड करने में समस्या आई</string>
   <string name="notification_switched_account">Switched to account %s</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index b450a3201c..eeaa3b6e70 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Poruka je poslana</string>
   <string name="mailbox_message_sending_error">Pogreška pri slanju poruke</string>
   <string name="mailbox_message_sending_error_address_disabled">Ova adresa je onemogućena, a slanje nije uspjelo</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Idi u skice</string>
   <string name="mailbox_attachment_uploading_error">Greška kod učitavanja privitka</string>
   <string name="notification_switched_account">Prebačeno na račun %s</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index c407bcb2aa..8101a774f7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Üzenet elküldve</string>
   <string name="mailbox_message_sending_error">Hiba az üzenet küldése közben</string>
   <string name="mailbox_message_sending_error_address_disabled">Ez a cím le van tiltva, a küldés sikertelen</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Ugrás a piszkozatokhoz</string>
   <string name="mailbox_attachment_uploading_error">Hiba mellékletek feltöltésénél</string>
   <string name="notification_switched_account">Átváltás %s fiókra</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index ce9496aec2..5835542738 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Pesan terkirim</string>
   <string name="mailbox_message_sending_error">Masalah dalam mengirim pesan</string>
   <string name="mailbox_message_sending_error_address_disabled">Alamat ini dinonaktifkan, pengiriman gagal</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Ke Draf</string>
   <string name="mailbox_attachment_uploading_error">Kesalahan mengunggah lampiran</string>
   <string name="notification_switched_account">Anda telah beralih ke akun %s</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c719f5086e..1ad1867715 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Messaggio inviato</string>
   <string name="mailbox_message_sending_error">Invio del messaggio non riuscito</string>
   <string name="mailbox_message_sending_error_address_disabled">Indirizzo non attivo. Invio non riuscito.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s non attivo. Invio non riuscito.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s e altri %d indirizzi non attivi. Invio non riuscito.</string>
   <string name="mailbox_message_sending_error_action">Vai alle bozze</string>
   <string name="mailbox_attachment_uploading_error">Caricamento dell\'allegato non riuscito</string>
   <string name="notification_switched_account">Account attuale: %s</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 84444ac2c8..2c824b0daa 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">メッセージが送信されました</string>
   <string name="mailbox_message_sending_error">メッセージ送信エラー</string>
   <string name="mailbox_message_sending_error_address_disabled">アドレスが無効です。送信できません。</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">下書きを開く</string>
   <string name="mailbox_attachment_uploading_error">添付ファイルのアップロードエラー</string>
   <string name="notification_switched_account">アカウント %s に切り替えました</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index b3c04ae46a..a92a84fa93 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">შეტყობინება გაიგზავნა</string>
   <string name="mailbox_message_sending_error">შეტყობინების გაგზავნის შეცდომა</string>
   <string name="mailbox_message_sending_error_address_disabled">This address is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">მონახაზებზე გადასვლა</string>
   <string name="mailbox_attachment_uploading_error">მიმაგრებული ფაილის ატვირთვის შეცდომა</string>
   <string name="notification_switched_account">Switched to account %s</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index a1f044849a..1f85d5d927 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Izen yettwazen</string>
   <string name="mailbox_message_sending_error">Tuccḍa deg tuzna n yizen</string>
   <string name="mailbox_message_sending_error_address_disabled">Tansa-a tensa, tecceḍ tuzna</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Ddu ɣer Yirewwayen</string>
   <string name="mailbox_attachment_uploading_error">Tuccḍa deg usali n umedday</string>
   <string name="notification_switched_account">Yettwabeddel ɣer umiḍan %s</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ba46fab1ad..50d78c304f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">메시지 보냄</string>
   <string name="mailbox_message_sending_error">메시지 전송 오류</string>
   <string name="mailbox_message_sending_error_address_disabled">비활성화 주소이므로 전송에 실패했습니다</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s이(가) 비활성화되었으므로 전송할 수 없습니다.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s 및 %d개 이상 추가 주소가 비활성화되어 전송할 수 없습니다.</string>
   <string name="mailbox_message_sending_error_action">임시 보관함으로 이동하기</string>
   <string name="mailbox_attachment_uploading_error">첨부 파일 업로드 중 오류</string>
   <string name="notification_switched_account">\'%s\' 계정으로 전환됨</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d91a8f8a16..5d2e354f3c 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Melding sendt</string>
   <string name="mailbox_message_sending_error">Feil ved sending av melding</string>
   <string name="mailbox_message_sending_error_address_disabled">Denne adressen er deaktivert, sendingen mislyktes</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s er deaktivert, sendingen mislyktes</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s og %d flere adresser er deaktivert, sendingen mislyktes</string>
   <string name="mailbox_message_sending_error_action">Gå til utkast</string>
   <string name="mailbox_attachment_uploading_error">Feil ved opplasting av vedlegg</string>
   <string name="notification_switched_account">Byttet til konto %s</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f737d6d0eb..a41e3ceebe 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Bericht verzonden</string>
   <string name="mailbox_message_sending_error">Fout bij verzenden bericht</string>
   <string name="mailbox_message_sending_error_address_disabled">Dit adres is uitgeschakeld, verzenden mislukt</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is uitgeschakeld, verzenden mislukt</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s en nog %d adressen zijn uitgeschakeld, verzenden mislukt</string>
   <string name="mailbox_message_sending_error_action">Ga naar Concepten</string>
   <string name="mailbox_attachment_uploading_error">Fout bij het uploaden van bijlage</string>
   <string name="notification_switched_account">Overgeschakeld naar account %s</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1faf8a83e8..3afe969040 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Wiadomość została wysłana</string>
   <string name="mailbox_message_sending_error">Wystąpił błąd podczas wysyłania wiadomości</string>
   <string name="mailbox_message_sending_error_address_disabled">Adres jest wyłączony. Wysyłanie nie powiodło się</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">Adres %s jest wyłączony. Wysyłanie nie powiodło się</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Przejdź do Szkiców</string>
   <string name="mailbox_attachment_uploading_error">Wystąpił błąd podczas przesyłania załącznika</string>
   <string name="notification_switched_account">Przełączono na konto %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 375b6ba2f7..a06c28498f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Mensagem enviada</string>
   <string name="mailbox_message_sending_error">Erro no envio da mensagem</string>
   <string name="mailbox_message_sending_error_address_disabled">Este endereço está desativado. Erro no envio.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s está desativado. Erro no envio.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s e mais %d endereços estão desativados. Erro no envio.</string>
   <string name="mailbox_message_sending_error_action">Ir para Rascunhos</string>
   <string name="mailbox_attachment_uploading_error">Erro ao enviar anexo</string>
   <string name="notification_switched_account">Conta alterada para: %s</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 4b5837539d..9146707885 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Mensagem enviada</string>
   <string name="mailbox_message_sending_error">Erro no envio da mensagem</string>
   <string name="mailbox_message_sending_error_address_disabled">Este endereço está desativado. Erro no envio.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Ir para Rascunhos</string>
   <string name="mailbox_attachment_uploading_error">Erro a enviar o anexo</string>
   <string name="notification_switched_account">Mudou para a conta %s</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 36bec1d0ab..f371ddfdb1 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Mesaj trimis</string>
   <string name="mailbox_message_sending_error">Eroare trimitere mesaj</string>
   <string name="mailbox_message_sending_error_address_disabled">Această adresă este dezactivată, trimiterea a eșuat.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">Trimiterea a eșuat. %s este dezactivată.</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">Trimiterea a eșuat. %s și încă %d adrese sunt dezactivate.</string>
   <string name="mailbox_message_sending_error_action">Accesare Ciorne</string>
   <string name="mailbox_attachment_uploading_error">Eroare la încărcare atașament.</string>
   <string name="notification_switched_account">S-a comutat la contul %s</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4e2c2e3a56..4f77b2bf01 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Сообщение отправлено</string>
   <string name="mailbox_message_sending_error">Ошибка при отправке сообщения</string>
   <string name="mailbox_message_sending_error_address_disabled">Этот адрес отключён, отправка не выполнена</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Перейти в Черновики</string>
   <string name="mailbox_attachment_uploading_error">Ошибка загрузки вложения</string>
   <string name="notification_switched_account">Вы переключились на аккаунт %s</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index cfcf91a5d7..260c3fafad 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Správa odoslaná</string>
   <string name="mailbox_message_sending_error">Chyba pri odosielaní správy</string>
   <string name="mailbox_message_sending_error_address_disabled">Táto adresa je vypnutá, odoslanie zlyhalo</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Prejsť do zložky Koncepty</string>
   <string name="mailbox_attachment_uploading_error">Chyba pri nahrávaní prílohy</string>
   <string name="notification_switched_account">Prepnuté na účet %s</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f7da40c713..6e394f7874 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Sporočilo poslano</string>
   <string name="mailbox_message_sending_error">Napaka pri pošiljanju sporočila</string>
   <string name="mailbox_message_sending_error_address_disabled">Ta naslov je onemogočen. Pošiljanje ni uspelo.</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Pojdi v mapo Osnutki</string>
   <string name="mailbox_attachment_uploading_error">Napaka pri nalaganju priponke</string>
   <string name="notification_switched_account">Preklopili ste na račun %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 edae275242..adf6207caf 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Meddelande skickat</string>
   <string name="mailbox_message_sending_error">Det gick inte att skicka meddelandet</string>
   <string name="mailbox_message_sending_error_address_disabled">Denna adress är inaktiverad, sändning misslyckades</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Gå till utkast</string>
   <string name="mailbox_attachment_uploading_error">Fel vid uppladdning av bilaga</string>
   <string name="notification_switched_account">Bytte till konto %s</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 39fb905132..a255636d81 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">İleti gönderildi</string>
   <string name="mailbox_message_sending_error">İleti gönderilirken sorun çıktı</string>
   <string name="mailbox_message_sending_error_address_disabled">Bu adres kullanımdan kaldırılmış, gönderilemedi</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Taslaklar kutusuna git</string>
   <string name="mailbox_attachment_uploading_error">Ek dosya yüklenirken sorun çıktı</string>
   <string name="notification_switched_account">%s hesabına geçildi</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a366bd2be6..a5498882c3 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">Повідомлення надіслано</string>
   <string name="mailbox_message_sending_error">Помилка надсилання повідомлення</string>
   <string name="mailbox_message_sending_error_address_disabled">Ця адреса вимкнена, не вдалося відправити</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">Перейти до Чернеток</string>
   <string name="mailbox_attachment_uploading_error">Помилка вивантаження вкладення</string>
   <string name="notification_switched_account">Змінено на обліковий запис %s</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a261fafac7..c195248f98 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">邮件已发送</string>
   <string name="mailbox_message_sending_error">发送信息时出错</string>
   <string name="mailbox_message_sending_error_address_disabled">该地址已禁用，发送失败</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">转至草稿箱</string>
   <string name="mailbox_attachment_uploading_error">上传附件时出错</string>
   <string name="notification_switched_account">已切换至账户：%s</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3148d46ea1..217d5be7c9 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -35,6 +35,8 @@
   <string name="mailbox_message_sending_success">郵件已傳送</string>
   <string name="mailbox_message_sending_error">傳送郵件時發生錯誤</string>
   <string name="mailbox_message_sending_error_address_disabled">此位址已停用，傳送失敗</string>
+  <string name="mailbox_message_sending_error_address_disabled_single">%s is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled_multiple">%s and %d more addresses are disabled, sending failed</string>
   <string name="mailbox_message_sending_error_action">前往草稿資料夾</string>
   <string name="mailbox_attachment_uploading_error">上載附件出現錯誤</string>
   <string name="notification_switched_account">已切換至帳號 %s</string>