diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2bed10a90..7e4dca24f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Text v uvozovkách"</string>
     <string name="message_compose_error_no_recipients">"Je třeba přidat nejméně jednoho příjemce."</string>
     <string name="message_compose_attachments_skipped_toast">"Některé přílohy nelze přeposlat, protože nebyly staženy."</string>
+    <string name="message_compose_attachment_size">"Soubor nelze připojit, protože je příliš velký."</string>
     <string name="message_view_to_label">"Komu:"</string>
     <string name="message_view_cc_label">"Kopie:"</string>
     <string name="message_view_attachment_view_action">"Otevřít"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Zpráva byla uložena jako koncept."</string>
     <string name="add_contact_dlg_title">"Přidat kontakt"</string>
     <string name="add_contact_dlg_message_fmt">"Přidat „<xliff:g id="EMAIL">%s</xliff:g>“ do kontaktů"</string>
+    <string name="message_view_display_attachment_toast">"Tuto přílohu nelze zobrazit."</string>
     <string name="account_setup_basics_title">"Nastavit e-mail"</string>
     <string name="account_setup_basics_instructions">"Zadejte e-mailovou adresu účtu:"</string>
     <string name="account_setup_basics_email_hint">"E-mailová adresa"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3bfa8c709..ce4229b3a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Zitierter Text"</string>
     <string name="message_compose_error_no_recipients">"Sie müssen mindestens einen Empfänger hinzufügen."</string>
     <string name="message_compose_attachments_skipped_toast">"Einige Anhänge können nicht weitergeleitet werden, da Sie noch nicht heruntergeladen wurden."</string>
+    <string name="message_compose_attachment_size">"Dateianhang zu groß"</string>
     <string name="message_view_to_label">"An:"</string>
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Öffnen"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Nachricht als Entwurf gespeichert"</string>
     <string name="add_contact_dlg_title">"Kontakt hinzufügen"</string>
     <string name="add_contact_dlg_message_fmt">"\"<xliff:g id="EMAIL">%s</xliff:g>\" zu den Kontakten hinzufügen"</string>
+    <string name="message_view_display_attachment_toast">"Dieser Anhang kann nicht angezeigt werden."</string>
     <string name="account_setup_basics_title">"E-Mail einrichten"</string>
     <string name="account_setup_basics_instructions">"Geben Sie Ihre im Konto gespeicherte E-Mail-Adresse ein:"</string>
     <string name="account_setup_basics_email_hint">"E-Mail-Adresse"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e253906ba..30f1fd907 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Texto entre comillas"</string>
     <string name="message_compose_error_no_recipients">"Debes especificar, al menos, un destinatario."</string>
     <string name="message_compose_attachments_skipped_toast">"No se pueden reenviar algunos archivos adjuntos porque no se han descargado."</string>
+    <string name="message_compose_attachment_size">"El archivo es demasiado grande para adjuntarlo."</string>
     <string name="message_view_to_label">"Para:"</string>
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Abrir"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Mensaje guardado como borrador"</string>
     <string name="add_contact_dlg_title">"Añadir contacto"</string>
     <string name="add_contact_dlg_message_fmt">"Añadir \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos"</string>
+    <string name="message_view_display_attachment_toast">"No se puede mostrar este archivo adjunto."</string>
     <string name="account_setup_basics_title">"Configurar correo electrónico"</string>
     <string name="account_setup_basics_instructions">"Introduce la dirección de correo electrónico de tu cuenta:"</string>
     <string name="account_setup_basics_email_hint">"Dirección de correo electrónico"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9a0f522ea..734d1e65c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Texte du message précédent"</string>
     <string name="message_compose_error_no_recipients">"Vous devez ajouter au moins un destinataire."</string>
     <string name="message_compose_attachments_skipped_toast">"Impossible de transférer certaines pièces jointes : elles n\'ont pas été téléchargées."</string>
+    <string name="message_compose_attachment_size">"Impossible de joindre le fichier, car il est trop volumineux."</string>
     <string name="message_view_to_label">"À :"</string>
     <string name="message_view_cc_label">"Cc :"</string>
     <string name="message_view_attachment_view_action">"Ouvrir"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Message enregistré comme brouillon."</string>
     <string name="add_contact_dlg_title">"Ajouter un contact"</string>
     <string name="add_contact_dlg_message_fmt">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts"</string>
+    <string name="message_view_display_attachment_toast">"Impossible d\'afficher cette pièce jointe."</string>
     <string name="account_setup_basics_title">"Configurer la messagerie électronique"</string>
     <string name="account_setup_basics_instructions">"Saisissez l\'adresse e-mail de votre compte :"</string>
     <string name="account_setup_basics_email_hint">"Adresse e-mail"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b95d1c6bb..76743debf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Testo tra virgolette"</string>
     <string name="message_compose_error_no_recipients">"Devi aggiungere almeno un destinatario."</string>
     <string name="message_compose_attachments_skipped_toast">"Impossibile inviare alcuni allegati poiché non sono stati scaricati."</string>
+    <string name="message_compose_attachment_size">"File troppo grande. Impossibile allegarlo."</string>
     <string name="message_view_to_label">"A:"</string>
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Apri"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Messaggio salvato come bozza."</string>
     <string name="add_contact_dlg_title">"Aggiungi contatto"</string>
     <string name="add_contact_dlg_message_fmt">"Aggiungi \"<xliff:g id="EMAIL">%s</xliff:g>\" ai contatti"</string>
+    <string name="message_view_display_attachment_toast">"Impossibile visualizzare l\'allegato."</string>
     <string name="account_setup_basics_title">"Imposta email"</string>
     <string name="account_setup_basics_instructions">"Digita l\'indirizzo email del tuo account:"</string>
     <string name="account_setup_basics_email_hint">"Indirizzo email"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4629cfaed..136dfd729 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -75,8 +75,7 @@
     <string name="message_compose_quoted_text_label">"元のメッセージ"</string>
     <string name="message_compose_error_no_recipients">"宛先を入力してください。"</string>
     <string name="message_compose_attachments_skipped_toast">"ダウンロードされていない添付ファイルは転送できません。"</string>
-    <!-- no translation found for message_compose_attachment_size (4401081828287333647) -->
-    <skip />
+    <string name="message_compose_attachment_size">"添付ファイルが大きすぎます。"</string>
     <string name="message_view_to_label">"To:"</string>
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"開く"</string>
@@ -91,6 +90,7 @@
     <string name="message_saved_toast">"メッセージを下書き保存しました。"</string>
     <string name="add_contact_dlg_title">"連絡先を追加"</string>
     <string name="add_contact_dlg_message_fmt">"<xliff:g id="EMAIL">%s</xliff:g> を連絡先に追加する"</string>
+    <string name="message_view_display_attachment_toast">"この添付ファイルは表示できません。"</string>
     <string name="account_setup_basics_title">"メールアカウントの登録"</string>
     <string name="account_setup_basics_instructions">"メールのアカウント情報を入力:"</string>
     <string name="account_setup_basics_email_hint">"メールアドレス"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b85d26aa4..a5c762c73 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"받은메일"</string>
     <string name="message_compose_error_no_recipients">"받는 사람을 한 명 이상 추가해야 합니다."</string>
     <string name="message_compose_attachments_skipped_toast">"일부 첨부파일이 다운로드되지 않아 전달할 수 없습니다."</string>
+    <string name="message_compose_attachment_size">"파일이 너무 커서 첨부할 수 없습니다."</string>
     <string name="message_view_to_label">"받는사람:"</string>
     <string name="message_view_cc_label">"참조:"</string>
     <string name="message_view_attachment_view_action">"열기"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"메일을 임시로 저장했습니다."</string>
     <string name="add_contact_dlg_title">"주소 추가"</string>
     <string name="add_contact_dlg_message_fmt">"주소록에 \'<xliff:g id="EMAIL">%s</xliff:g>\' 추가"</string>
+    <string name="message_view_display_attachment_toast">"이 첨부파일은 표시할 수 없습니다."</string>
     <string name="account_setup_basics_title">"이메일 설정"</string>
     <string name="account_setup_basics_instructions">"계정 이메일 주소 입력:"</string>
     <string name="account_setup_basics_email_hint">"이메일 주소"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 78dbc31f9..e9803bcb3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -73,6 +73,9 @@
     <string name="message_compose_quoted_text_label">"Sitert tekst"</string>
     <string name="message_compose_error_no_recipients">"Du må legge til minst én mottager."</string>
     <string name="message_compose_attachments_skipped_toast">"Noen vedlegg kunne ikke sendes videre fordi de ikke er blitt lastet ned."</string>
+    <!-- no translation found for message_compose_attachment_size (4401081828287333647) -->
+    <!-- no translation found for message_compose_attachment_size (8944461117941172986) -->
+    <skip />
     <string name="message_view_to_label">"Til:"</string>
     <string name="message_view_cc_label">"Kopi:"</string>
     <string name="message_view_attachment_view_action">"Åpne"</string>
@@ -89,6 +92,7 @@
     <skip />
     <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
     <skip />
+    <string name="message_view_display_attachment_toast">"Kan ikke vise vedlegget."</string>
     <string name="account_setup_basics_title">"Sett opp e-post"</string>
     <string name="account_setup_basics_instructions">"Skriv e-postadressen til kontoen din:"</string>
     <string name="account_setup_basics_email_hint">"E-postadresse"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b209fd167..0a04cd47c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Geciteerde tekst"</string>
     <string name="message_compose_error_no_recipients">"Je moet minstens één ontvanger toevoegen."</string>
     <string name="message_compose_attachments_skipped_toast">"Sommige bijlages kunnen niet worden doorgestuurd omdat ze niet zijn gedownload."</string>
+    <string name="message_compose_attachment_size">"Bestand is te groot om bij te voegen."</string>
     <string name="message_view_to_label">"Aan:"</string>
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Openen"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Bericht opgeslagen als concept."</string>
     <string name="add_contact_dlg_title">"Contactpersoon toevoegen"</string>
     <string name="add_contact_dlg_message_fmt">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contactpersonen"</string>
+    <string name="message_view_display_attachment_toast">"Deze bijlage kan niet worden verwijderd."</string>
     <string name="account_setup_basics_title">"E-mail instellen"</string>
     <string name="account_setup_basics_instructions">"Typ het e-mailadres van je account:"</string>
     <string name="account_setup_basics_email_hint">"E-mailadres"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3c1ca1da7..24c30d3ab 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Cytowany tekst"</string>
     <string name="message_compose_error_no_recipients">"Musisz dodać co najmniej jednego adresata."</string>
     <string name="message_compose_attachments_skipped_toast">"Nie można przekazać dalej niektórych załączników, ponieważ nie zostały one pobrane."</string>
+    <string name="message_compose_attachment_size">"Plik jest zbyt duży do załączenia."</string>
     <string name="message_view_to_label">"Do:"</string>
     <string name="message_view_cc_label">"DW:"</string>
     <string name="message_view_attachment_view_action">"Otwórz"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Wiadomość została zapisana jako wersja robocza."</string>
     <string name="add_contact_dlg_title">"Dodaj kontakt"</string>
     <string name="add_contact_dlg_message_fmt">"Dodaj adres „<xliff:g id="EMAIL">%s</xliff:g>” do kontaktów"</string>
+    <string name="message_view_display_attachment_toast">"Nie można wyświetlić tego załącznika."</string>
     <string name="account_setup_basics_title">"Skonfiguruj konto e-mail"</string>
     <string name="account_setup_basics_instructions">"Podaj adres e-mail swojego konta:"</string>
     <string name="account_setup_basics_email_hint">"Adres e-mail"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 58ee0cfa1..295a7d0a9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"Цитируемый текст"</string>
     <string name="message_compose_error_no_recipients">"Необходимо добавить хотя бы одного получателя."</string>
     <string name="message_compose_attachments_skipped_toast">"Некоторые приложения нельзя переслать, поскольку они не загружены."</string>
+    <string name="message_compose_attachment_size">"Файл имеет слишком большой размер и не может быть вложен."</string>
     <string name="message_view_to_label">"Кому:"</string>
     <string name="message_view_cc_label">"Копия:"</string>
     <string name="message_view_attachment_view_action">"Открыть"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"Письмо сохранено как черновик."</string>
     <string name="add_contact_dlg_title">"Добавить контакт"</string>
     <string name="add_contact_dlg_message_fmt">"Добавить адрес <xliff:g id="EMAIL">%s</xliff:g> в контакты"</string>
+    <string name="message_view_display_attachment_toast">"Не удается показать это приложение."</string>
     <string name="account_setup_basics_title">"Настройка электронной почты"</string>
     <string name="account_setup_basics_instructions">"Укажите почтовый адрес своего аккаунта:"</string>
     <string name="account_setup_basics_email_hint">"Адрес электронной почты"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2964b889c..c7fb33a6b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"引用文字"</string>
     <string name="message_compose_error_no_recipients">"您必须至少添加一个收件人。"</string>
     <string name="message_compose_attachments_skipped_toast">"某些附件尚未下载，因此无法转发。"</string>
+    <string name="message_compose_attachment_size">"文件太大，无法附加。"</string>
     <string name="message_view_to_label">"收件人："</string>
     <string name="message_view_cc_label">"抄送："</string>
     <string name="message_view_attachment_view_action">"打开"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"邮件已另存为草稿。"</string>
     <string name="add_contact_dlg_title">"添加联系人"</string>
     <string name="add_contact_dlg_message_fmt">"将“<xliff:g id="EMAIL">%s</xliff:g>”添加到通讯录中"</string>
+    <string name="message_view_display_attachment_toast">"此附件无法显示。"</string>
     <string name="account_setup_basics_title">"设置电子邮件"</string>
     <string name="account_setup_basics_instructions">"键入您的帐户电子邮件地址："</string>
     <string name="account_setup_basics_email_hint">"电子邮件地址"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 093ba286f..3946d53fa 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -75,6 +75,7 @@
     <string name="message_compose_quoted_text_label">"引用的文字"</string>
     <string name="message_compose_error_no_recipients">"您必須新增至少一位收件者。"</string>
     <string name="message_compose_attachments_skipped_toast">"尚未下載部分附件，因此無法予以轉寄。"</string>
+    <string name="message_compose_attachment_size">"檔案太大，超過附檔上限。"</string>
     <string name="message_view_to_label">"收件者："</string>
     <string name="message_view_cc_label">"副本："</string>
     <string name="message_view_attachment_view_action">"開啟"</string>
@@ -89,6 +90,7 @@
     <string name="message_saved_toast">"已儲存郵件草稿。"</string>
     <string name="add_contact_dlg_title">"新增聯絡人"</string>
     <string name="add_contact_dlg_message_fmt">"將「<xliff:g id="EMAIL">%s</xliff:g>」新增為聯絡人"</string>
+    <string name="message_view_display_attachment_toast">"無法顯示此附件。"</string>
     <string name="account_setup_basics_title">"設定電子郵件"</string>
     <string name="account_setup_basics_instructions">"請輸入您帳戶的電子郵件地址："</string>
     <string name="account_setup_basics_email_hint">"電子郵件地址"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 390501bb7..509fb6d1d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -158,8 +158,8 @@
     <!-- Toast that appears in the context of forwarding a message with attachment(s) -->
     <string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not downloaded.</string>
     <!-- Toast that appears when an attachment is too big to send.  Note, translation temporarily
-         borrowed from camera app (msgid="6989632611223725558") -->
-    <string name="message_compose_attachment_size" msgid="6989632611223725558">File too large to attach.</string>
+         borrowed from camera app (msgid="8944461117941172986") -->
+    <string name="message_compose_attachment_size" msgid="8944461117941172986">File too large to attach.</string>
     <!-- Label for To field in read message view -->
     <string name="message_view_to_label">To:</string>
     <!-- Label for CC field in read message view -->
@@ -193,7 +193,7 @@
     <!-- String that is displayed when the attachment could not be displayed.  TODO: Make local
          version and remove use of "borrowed" string. -->
     <string name="message_view_display_attachment_toast" 
-            msgid="6849630429576038532">This attachment cannot be displayed.</string>
+            msgid="2079093904785941494">This attachment cannot be displayed.</string>
 
     <!-- Title of screen when setting up new email account -->
     <string name="account_setup_basics_title">Set up email</string>