diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 72dde52..f5974c4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"في عدد: <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> من الحسابات"</item>
     <item quantity="other" msgid="2723797835410343458">"في عدد: <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> من الحسابات"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"البريد الوارد"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"إعداد البريد الإلكتروني"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"إعداد الحساب"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"إضافة حساب Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"إضافة حساب Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"جارٍ استرداد معلومات الحساب…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"جارٍ فحص إعدادات خادم البريد الوارد…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"جارٍ فحص إعدادات خادم البريد الصادر…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"إعداد البريد الإلكتروني"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"إعداد الحساب"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"تسمية هذا الحساب (اختياري)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"الاسم (يظهر في الرسائل الصادرة)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"إضافة حساب بريد إلكتروني جديد"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"إعداد الحساب"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ما نوع هذا الحساب؟"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"إعدادات خادم البريد الوارد"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"إعداد الحساب"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"إعدادات خادم البريد الوارد"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"اسم المستخدم"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"كلمة المرور"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"خادم POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"عند الحذف من بريد الوارد"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"بادئة مسار IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختياري"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"إعدادات خادم البريد الصادر"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"إعداد الحساب"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"إعدادات خادم البريد الصادر"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"خادم SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"المنفذ"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع الأمان"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"يلزم تسجيل الدخول."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"اسم المستخدم"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"كلمة المرور"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"إعدادات الخادم"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"إعداد الحساب"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"إعدادات الخادم"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"الخادم"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"نطاق/اسم المستخدم"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"استخدام اتصال آمن (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"قبول جميع شهادات طبقة المقابس الآمنة"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"خيارات الحساب"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"إعدادات الحساب"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"معدل الاطلاع على البريد الإلكتروني"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب بريد"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"حدد حسابًا"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"ترقية الحسابات"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"تتعذر ترقية الحساب"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"تتضمن بعض حسابات \"Plus\" الوصول عبر بروتوكول POP والذي يسمح لهذا البرنامج بالاتصال. إذا تعذر عليك تسجيل الدخول باستخدام عنوان البريد الإلكتروني وكلمة المرور الصحيحين، فقد تكون غير ممتلك لحساب \"Plus\" مدفوع. يُرجى تشغيل متصفح الويب لتتمكن من الدخول إلى حسابات البريد هذه."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 34c2658..457c091 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> профила"</item>
     <item quantity="other" msgid="2723797835410343458">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> профила"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Вх. поща"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройване на имейл"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка на профила"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавяне на нов профил от Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавяне на нов профил от Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Извлича се информация за профила..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Настройките на вх. сървър се проверяват..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Настройките на изх. сървър се проверяват..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройване на имейл"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка на профила"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именуване на този профил (незадължително)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Името ви (показвано в изходящи съобщения)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Добавяне на нов имейл профил"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Настройка на профила"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Какъв вид профил е това?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройки на вх. сървър"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройка на профила"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Настройки на входящия сървър"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Потребителско име"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Парола"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 сървър"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"При изтриване от „Вх. поща“"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"префикс на IMAP път"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По избор"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройки на изх. сървър"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройка на профила"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Настройки на изходящия сървър"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сървър"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Вид защита"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Изисква влизане в профил."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Потребителско име"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Парола"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройки на сървъра"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройка на профила"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Настройки на сървъра"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сървър"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домейн/Потребителско име"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Използване на сигурна връзка (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Приемане на всички SSL сертификати"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Опции за профила"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки на профила"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Честота на проверяване за имейл"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Имейл ад."</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Избор на профил"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Надстройка на профилите"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Неуспешно надстройване на профил"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Само някои „Plus“ профили включват достъп чрез POP, позволявайки на тази програма да се свърже. Ако не можете да влезете с правилния си имейл адрес и парола, може да не сте платили за такъв профил. Моля, стартирайте уеб браузъра, за да получите достъп до тези пощенски профили."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ec74a1b..4ba2195 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"a <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
     <item quantity="other" msgid="2723797835410343458">"a <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Safata d\'entrada"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuració del correu electrònic"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuració del compte"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Afegeix un compte d\'Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Afegeix un compte d\'Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"S\'està recuperant la informació del compte..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"S\'està comprovant la configuració del servidor d\'entrada…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"S\'està comprovant la configuració del servidor de sortida…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuració del correu electrònic"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuració del compte"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assigneu un nom al compte (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"El vostre nom (visualitzat als missatges de sortida)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Afegeix un compte de correu electrònic nou"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuració del compte"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quin tipus de compte es tracta?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuració del servidor d\'entrada"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuració del compte"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuració del servidor d\'entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'usuari"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contrasenya"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quan el suprimeixi de la safata d\'entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix de camí IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuració del servidor de sortida"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuració del compte"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configuració del servidor de sortida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipus de seguretat"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requereix l\'inici de sessió."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'usuari"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contrasenya"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuració del servidor"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuració del compte"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Configuració del servidor"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domini\\Nom d\'usuari"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilitza una connexió segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepta tots els certificats SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opcions del compte"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Configuració del compte"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Freqüència de comprovació de correu electrònic"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Compte"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selecciona un compte"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualitza els comptes"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"No es pot actualitzar el compte"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Només alguns comptes \"Plus\" inclouen l\'accés POP que permet que aquest programa s\'hi connecti. Si no podeu iniciar la sessió amb l\'adreça electrònica i la contrasenya correctes, pot ser que no tingueu un compte \"Plus\" de pagament. Inicieu el navegador web per accedir a aquests comptes de correu."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 99ad910..1e62bb6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
     <item quantity="other" msgid="2723797835410343458">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + další (<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>)"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + další (<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>)"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="5620484088786656170">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> <xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> <xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"Účet <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="8548760449976444566">"Počet účtů: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starší"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavit e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavení účtu"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Přidat účet Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Přidat účet Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailový účet"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítání informací o účtu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení serveru příchozí pošty..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení serveru odchozí pošty..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavit e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavení účtu"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Váš účet je nastaven, e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobrazované na odchozích zprávách)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Přidat nový e-mailový účet"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavení účtu"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Typ účtu"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O jaký typ účtu se jedná?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavení serveru příchozí pošty"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavení účtu"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavení serveru příchozí pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uživatelské jméno"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Při smazání z Doručené pošty"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Předpona cesty IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Nepovinné"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavení serveru odchozí pošty"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavení účtu"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Nastavení serveru odchozí pošty"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečení"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovat přihlášení"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uživatelské jméno"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavení serveru"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavení účtu"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Nastavení serveru"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Uživatelské jméno"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použít zabezpečené připojení (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Přijímat všechny certifikáty protokolu SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilního zařízení"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Možnosti účtu"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavení účtu"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Četnost kontroly doručené pošty"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikdy"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude z aplikace Email odebrán."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Odebrat účet"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Odebrat účet"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mailový účet"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Vybrat účet"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgradovat účty"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Účet nelze upgradovat"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Pouze některé účty typu Plus obsahují přístup POP umožňující připojení tohoto programu. Pokud se nemůžete přihlásit se správnou e-mailovou adresou a heslem, pravděpodobně nemáte placený účet Plus. Spusťte webový prohlížeč a vyhledejte přístup k těmto poštovním účtům."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normální"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velký"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velmi velký"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4fda78f..40371a9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konti"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konto"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konti"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ældre"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Opsæt e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguration af konto"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tilføj en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tilføj en Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailkonto"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontooplysninger ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerer indstillinger for indgående server ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerer indstillinger for udgående server ..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Opsæt e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguration af konto"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Din konto er oprettet, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Tilføj ny e-mail-konto"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konfiguration af konto"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotype"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Indstillinger for indgående server"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfiguration af konto"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Præfiks for IMAP-sti"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfrit"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Indstillinger for udgående server"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfiguration af konto"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Indstillinger for udgående server"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhedstype"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverindstillinger"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Konfiguration af konto"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Serverindstillinger"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domæne\\brugernavn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Brug sikker forbindelse (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter alle SSL-certifikater"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Id for mobilenhed"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontovalgmuligheder"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Indstillinger for konto"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontovalgmuligheder"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Kontrolfrekvens for indbakke"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fjernes fra E-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Fjern konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Fjern konto"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail-konto"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Vælg en konto"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Opgrader konti"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Kontoen kunne ikke opgraderes"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Det er kun nogle \"Plus\"-konti, der indeholder POP-adgang, som tillader dette program at oprette forbindelse. Hvis du ikke er i stand til at logge ind med din rigtige e-mail-adresse og adgangskode, har du muligvis ikke en betalt \"Plus\"-konto. Start webbrowseren igen for at få adgang til disse mail-konti."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kæmpestor"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e432f21..9c4bae9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> weitere"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> weitere"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> Konto"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> Konten"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Älter"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-Mail einrichten"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoeinrichtung"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-Konto hinzufügen"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-Konto hinzufügen"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-Mail-Konto"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kontoinformationen werden abgerufen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Einstellungen des Eingangsservers werden überprüft..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Einstellungen des Ausgangsservers werden überprüft..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-Mail einrichten"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoeinrichtung"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Ihr Konto ist nun eingerichtet."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Konto benennen (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird für ausgehende Nachrichten angezeigt)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Neues E-Mail-Konto hinzufügen"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoeinrichtung"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich hierbei?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Einstellungen für Eingangsserver"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoeinrichtung"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Einstellungen des Eingangsserver"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nutzername"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passwort"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-Server"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Wenn ich sie aus dem Posteingang lösche"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-Pfadpräfix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Einstellungen für Postausgangsserver"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoeinrichtung"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Einstellungen des Ausgangsserver"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-Server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sicherheitstyp"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Anmeldung erforderlich"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nutzername"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passwort"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Servereinstellungen"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoeinrichtung"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Servereinstellungen"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain-/Benutzername"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sichere Verbindung (SSL) verwenden"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-Zertifikate akzeptieren"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilgerät-ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontooptionen"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoeinstellungen"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Konto-Optionen"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Häufigkeit des E-Mail-Abrufs"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nie"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus Email entfernt."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Konto entfernen"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Konto entfernen"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-Mail-Konto"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Ein Konto auswählen"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgrade für Konten"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Konto-Upgrade nicht durchführbar"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Nur einige \"Plus\"-Konten ermöglichen einen POP-Zugang und damit diesem Programm, eine Verbindung aufzubauen. Sollten Sie nicht dazu in der Lage sein, sich mit Ihrer korrekten E-Mail-Adresse und dem richtigen Password anzumelden, verfügen Sie möglicherweise nicht über ein kostenpflichtiges \"Plus\"-Konto. Starten Sie Ihren Webbrowser, um Zugriff auf diese Konten zu erlangen."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groß"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a244933..7dea019 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"σε <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> λογαριασμούς"</item>
     <item quantity="other" msgid="2723797835410343458">"σε <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> λογαριασμούς"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> περισσότερα"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> περισσότερα"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> λογαριασμός"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> λογαριασμοί"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Παλαιότερα"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Προσθήκη λογαριασμού Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Προσθήκη λογαριασμού Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Λογαριασμός ηλεκτρονικού ταχυδρομείου"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ανάκτηση στοιχείων λογαριασμού..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Έλεγχος ρυθμίσεων διακομιστή εισερχομένων..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Έλεγχος ρυθμίσεων διακομιστή εξερχομένων..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Ο λογαριασμός σας ρυθμίστηκε και γίνεται λήψη μηνυμάτων ηλεκτρονικού ταχυδρομείου!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Δώστε σε αυτόν τον λογαριασμό ένα όνομα (προαιρετικό)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Το όνομά σας (προβάλλεται στα εξερχόμενα μηνύματα)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Προσθήκη νέου λογαριασμού ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Τύπος λογαριασμού"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Τι τύπος λογαριασμού είναι αυτός;"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ρύθμιση λογαριασμού"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Όνομα χρήστη"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Κωδικός πρόσβασης"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Διακομιστής POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Όταν διαγράφω από τα Εισερχόμενα"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Πρόθεμα διαδρομής IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Προαιρετικό"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ρυθμίσεις διακομιστή εξερχομένων"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ρύθμιση λογαριασμού"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ρυθμίσεις διακομιστή εξερχομένων"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Διακομιστής SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Θύρα"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Τύπος ασφάλειας"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Να απαιτείται σύνδεση."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Όνομα χρήστη"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Κωδικός πρόσβασης"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ρυθμίσεις διακομιστή"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Ρύθμιση λογαριασμού"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Ρυθμίσεις διακομιστή"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Διακομιστής"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Τομέας διαδικτύου\\Όνομα χρήστη"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Χρήση ασφαλούς σύνδεσης (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Αποδοχή όλων των πιστοποιητικών SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Αναγνωριστικό κινητής συσκευής"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Επιλογές λογαριασμού"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Ρυθμίσεις λογαριασμού"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Επιλογές λογαριασμού"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Συχνότητα ελέγχου εισερχομένων"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Ποτέ"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Ο λογαριασμός \"<xliff:g id="ACCOUNT">%s</xliff:g>\" θα καταργηθεί από το ηλεκτρονικό ταχυδρομείο."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Κατάργηση λογαριασμού"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Κατάργηση λογαριασμού"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Λογαριασμός ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Επιλογή λογαριασμού"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Αναβάθμιση λογαριασμών"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Δεν είναι δυνατή η αναβάθμιση του λογαριασμού"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Μόνο ορισμένοι λογαριασμοί \"Plus\" περιλαμβάνουν πρόσβαση POP και επιτρέπουν στο πρόγραμμα αυτό να συνδεθεί. Εάν δεν μπορείτε να συνδεθείτε με τη σωστή διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης, ενδέχεται να μην έχετε πληρωμένο λογαριασμό \"Plus\". Εκκινήστε το πρόγραμμα περιήγησης ιστού, για να αποκτήσετε πρόσβαση σε αυτούς τους λογαριασμούς ηλεκτρονικού ταχυδρομείου."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Κανονικό"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Μεγάλο"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Πολύ μεγάλο"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b4d9532..16d80b8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inbox"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Set up email"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Account setup"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Add an Exchange account"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Add an Exchange ActiveSync account"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Retrieving account information…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Checking incoming server settings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Checking outgoing server settings…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Set up email"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Account setup"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Give this account a name (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Your name (displayed on outgoing messages)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Add new email account"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Account setup"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"What type of account is this?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Incoming server settings"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Account setup"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Incoming server settings"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 server"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"When I delete from Inbox"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP path prefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Outgoing server settings"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Account setup"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Outgoing server settings"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Security type"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Require sign-in."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Server settings"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Account setup"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Server settings"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Use secure connection (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accept all SSL certificates"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Account options"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Account settings"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Email checking frequency"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Email account"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Select an account"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgrade accounts"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Unable to upgrade account"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Only some \"Plus\" accounts include POP access allowing this programme to connect. If you are not able to sign in with your correct email address and password, you may not have a paid \"Plus\" account. Please launch the web browser to gain access to these mail accounts."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2437abd..0768bb0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
     <item quantity="other" msgid="2723797835410343458">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"Cuenta <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> cuentas"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Antiguos"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar correo electrónico"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de la cuenta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cuenta de correo electrónico"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando configuración entrante de servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando configuración saliente de servidor…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar correo electrónico"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de la cuenta"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Se ha configurado tu cuenta, ¡y el correo electrónico está en camino!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Coloca un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (mostrado en mensajes salientes)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Agregar nueva cuenta de correo electrónico"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuración de la cuenta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de cuenta"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración entrante de servidor"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración de la cuenta"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuración del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuándo suprimo desde la bandeja de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración saliente de servidor"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración de la cuenta"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configuración del servidor de salida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requiere inicio de sesión."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuración del servidor"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuración de la cuenta"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Configuración del servidor"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\Nombre de usuario"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opciones de cuenta"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Configuración de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia de verificación de la bandeja de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" se eliminará de correo electrónico."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Eliminar cuenta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Eliminar cuenta"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Cuenta de correo electrónico"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleccionar una cuenta"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar cuentas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"No es posible actualizar la cuenta."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Sólo algunas cuentas \"Plus\" incluyen el acceso POP, que permite que este programa se conecte. Si no puedes acceder con tu dirección de correo electrónico y contraseña correcta, es posible que no tengas una cuenta \"Plus\" paga. Inicia el navegador web para acceder a estas cuentas de correo."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 313abee..596d4d4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
     <item quantity="other" msgid="2723797835410343458">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos <xliff:g id="SEPARATOR"> </xliff:g> para <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos <xliff:g id="SEPARATOR"> </xliff:g> para <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> cuenta"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> cuentas"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Anterior"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar correo electrónico"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de cuenta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Añadir una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Añadir una cuenta de Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cuenta de correo electrónico"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando la información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando la configuración del servidor de entrada..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando la configuración del servidor de salida..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar correo electrónico"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de cuenta"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asignar un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Añadir una cuenta de correo electrónico nueva"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuración de cuenta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de cuenta"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es ésta?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ajustes del servidor de entrada"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración de cuenta"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ajustes del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo algún mensaje de \"Bandeja de entrada\""</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ajustes del servidor de salida"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración de cuenta"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ajustes del servidor de salida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Acceso obligatorio"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ajustes del servidor"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuración de cuenta"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Ajustes del servidor"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\nombre de usuario"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opciones de cuenta"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Ajustes de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia comprobación de inbox"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Se va a eliminar la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" de \"Correo electrónico\"."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Eliminar cuenta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Eliminar cuenta"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Email"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleccionar cuenta"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar cuentas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"No se ha podido actualizar la cuenta."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Sólo algunas cuentas \"Plus\" incluyen el acceso POP, que permite que este programa se conecte. Si no puedes acceder con la dirección de correo electrónico y la contraseña adecuadas, es posible que no dispongas de una cuenta \"Plus\" de pago. Usa el navegador web para acceder a estas cuentas de correo."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4c8a3b2..a9887e4 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"در <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> حساب"</item>
     <item quantity="other" msgid="2723797835410343458">"در <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> حساب"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"صندوق ورودی"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"تنظیم ایمیل"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"تنظیم حساب"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"افزودن یک حساب Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"افزودن یک حساب Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"در حال بازیابی اطلاعات حساب..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"در حال بررسی تنظیمات سرور ورودی..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"در حال بررسی تنظیمات سرور خروجی..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"تنظیم ایمیل"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"تنظیم حساب"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"نامی به این حساب اختصاص دهید (اختیاری)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"نام شما (در پیام های خروجی نمایش داده می شود)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"افزودن حساب ایمیل جدید"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"تنظیم حساب"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"این چه نوع حسابی است؟"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"تنظیمات سرور ورودی"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"تنظیم حساب"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"تنظیمات سرور ورودی"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"نام کاربری"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"رمز ورود"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"سرور POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"هنگامی که من از صندوق ورودی حذف می کنم"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"پیشوند مسیر IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختیاری"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"تنظیمات سرور خروجی"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"تنظیم حساب"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"تنظیمات سرور خروجی"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"سرور SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"درگاه"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع امنیت"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"باید به سیستم وارد شوید."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"نام کاربری"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"رمز ورود"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"تنظیمات سرور"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"تنظیم حساب"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"تنظیمات سرور"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"سرور"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"دامنه/نام کاربری"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"از اتصال امن (SSL) استفاده شود"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"پذیرش همه گواهی های SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"گزینه های حساب"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"تنظیمات حساب"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"دفعات بررسی ایمیل"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب ایمیل"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"انتخاب یک حساب"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"ارتقا حساب ها"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"ارتقا حساب امکان پذیر نیست"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"فقط برخی از حساب های \"Plus\" از جمله دسترسی POP به این برنامه اجازه می دهند متصل شود. اگر شما نمی توانید با رمز ورود و آدرس ایمیل درست خود به سیستم وارد شوید، ممکن است فاقد یک حساب \"Plus\" پولی باشید. لطفاً مرورگر وب را برای دسترسی به این حساب های ایمیل راه اندازی کنید."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ac21215..4373d36 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tilissä"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tilissä"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Postilaatikko"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Sähköpostin määrittäminen"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Tilin asetukset"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lisää Exchange-tili"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lisää Exchange ActiveSync -tili"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Noudetaan tilin tietoja…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tarkistetaan saapuvan postin palvelimen asetuksia…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tarkistetaan lähtevän postin palvelimen asetuksia…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Sähköpostin määrittäminen"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Tilin asetukset"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna tilille nimi (valinnainen)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Oma nimi (näytetään lähtevissä viesteissä)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Lisää uusi sähköpostitili"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Tilin asetukset"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Millainen tili tämä on?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Saapuvan postin palvelimen asetukset"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Tilin asetukset"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Saapuvan postin palvelimen asetukset"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Käyttäjänimi"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Salasana"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-palvelin"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kun poistan viestin postilaatikosta"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-polun etuliite"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valinnainen"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Lähtevän postin palvelimen asetukset"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Tilin asetukset"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Lähtevän postin palvelimen asetukset"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-palvelin"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Portti"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Suojaustyyppi"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Edellytä kirjautumista."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Käyttäjänimi"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Salasana"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Palvelinasetukset"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Tilin asetukset"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Palvelinasetukset"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Palvelin"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Toimialue\\käyttäjänimi"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Käytä suojattua yhteyttä (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Hyväksy kaikki SSL-varmenteet"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Tiliasetukset"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Tilin asetukset"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Sähköpostin tarkistustiheys"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Sähköpostitili"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Valitse tili"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Tilien päivitys"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Tilin päivitys epäonnistui"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Vain joihinkin Plus-tileihin sisältyy POP-käyttö, joka sallii tämän ohjelman muodostaa yhteyden. Jos et pysty kirjautumaan tiliisi sähköpostiosoitteellasi ja salasanallasi, sinulla ei ehkä ole maksullista Plus-tiliä. Pääset käyttämään näitä sähköpostitilejä käynnistämällä verkkoselaimen."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 857144d..6fb0273 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
     <item quantity="other" msgid="2723797835410343458">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> autres"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> autres"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> compte"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> comptes"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Précédents"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuration de votre messagerie"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuration du compte"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ajouter un compte Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ajouter un compte Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Compte de messagerie"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Récupération des informations sur le compte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Vérification des paramètres de serveur entrant…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Vérification des paramètres de serveur sortant…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuration de votre messagerie"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuration du compte"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Votre compte est configuré et votre messagerie a été activée !"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nom du compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Votre nom (affiché sur les messages sortants)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Ajouter un compte de messagerie"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuration du compte"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Type de compte"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Paramètres de serveur entrant"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuration du compte"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Paramètres du serveur entrant"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mot de passe"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Serveur POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Si messages suppr. de boîte de récep."</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Préfixe du chemin IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultatif"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Paramètres de serveur sortant"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuration du compte"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Paramètres du serveur sortant"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serveur SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Type de sécurité"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Connexion obligatoire."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'utilisateur"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mot de passe"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Paramètres du serveur"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuration du compte"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Paramètres du serveur"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveur"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domaine\\Nom d\'utilisateur"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utiliser une connexion sécurisée (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter tous les certificats SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Numéro de périphérique mobile :"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Options de compte"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Paramètres du compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Options de compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Fréquence de consultation de la boîte de réception"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Jamais"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" va être supprimé de votre messagerie."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Supprimer le compte"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Supprimer le compte"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Messagerie"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Sélectionner un compte"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Mettre les comptes à niveau"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impossible de mettre le compte à niveau."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Seuls certains comptes \"Plus\" comportent un accès POP permettant à ce programme de se connecter. Si vous ne parvenez pas à vous connecter avec l\'adresse e-mail et le mot de passe corrects, vous ne disposez peut-être pas d\'un compte payant \"Plus\". Pour accéder à ces comptes de messagerie, lancez votre navigateur Web."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normale"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Très grande"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> sur <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 11ec7a1..75f6813 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"u <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računa"</item>
     <item quantity="other" msgid="2723797835410343458">"u <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računa"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Pristigla pošta"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Postavljanje e-pošte"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Postavljanje računa"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj Exchange račun"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj Exchange ActiveSync račun"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Učitavanje podataka o računu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Provjeravanje postavki dolaznog poslužitelja..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Provjeravanje postavki izlaznog poslužitelja..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Postavljanje e-pošte"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Postavljanje računa"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dodijelite ovom računu naziv (opcionalno)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano u izlaznim porukama)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Dodaj novi račun e-pošte"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Postavljanje računa"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Koja je ovo vrsta računa?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Postavke dolaznog poslužitelja"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Postavljanje računa"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Postavke dolaznog poslužitelja"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Korisničko ime"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Zaporka"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 poslužitelj"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kad izbrišem iz Pristigle pošte"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefiks IMAP putanje"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Izborno"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Postavke izlaznog poslužitelja"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Postavljanje računa"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Postavke odlaznog poslužitelja"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP poslužitelj"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta sigurnosti"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Zahtijevajte prijavu."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Korisničko ime"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Zaporka"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Postavke poslužitelja"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Postavljanje računa"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Postavke poslužitelja"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"poslužitelj"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\Korisničko ime"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Koristi sigurnu vezu (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prihvati sve SSL certifikate"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Mogućnosti računa"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Postavke računa"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Učestalost provjeravanja e-pošte"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"R. e-pošte"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Odaberite račun"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nadogradnja računa"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nadogradnja računa nije moguća"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Samo neki \"Plus\" računi uključuju POP pristup koji ovom programu omogućuje povezivanje. Ako se ne možete prijaviti sa svojom ispravnom adresom e-pošte i zaporkom, možda niste platili \"Plus\" račun. Pokrenite web-preglednik kako biste dobili pristup ovim računima e-pošte."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4e8de44..a99bd0a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> fiókban"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> fiókban"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Beérkezett üzenetek"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-mail beállítása"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Fiók beállítása"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-fiók hozzáadása"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-fiók hozzáadása"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Fiókadatok beolvasása..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Bejövő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kimenő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-mail beállítása"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Fiók beállítása"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Fiók elnevezése (opcionális)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Az Ön neve (a kimenő üzenetekben való megjelenítéshez)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Új e-mail fiók hozzáadása"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Fiók beállítása"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Milyen típusú ez a fiók?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Bejövő üzeneteket kezelő szerver beállításai"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Fiók beállítása"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Bejövő üzenetek szerverének beállításai"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Felhasználónév"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Jelszó"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-szerver"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"A Beérkező levelek mappából való törléskor"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-alapú elérési út előtagja"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcionális"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kimenő üzenetek szerverének beállításai"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Fiók beállítása"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Kimenő üzenetek szerverének beállításai"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-szerver"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Biztonság típusa"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Bejelentkezés szükséges."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Felhasználónév"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Jelszó"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Szerverbeállítások"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Fiók beállítása"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Szerverbeállítások"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Szerver"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\felhasználónév"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Biztonságos kapcsolat (SSL) használata"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Minden SSL-tanúsítvány elfogadása"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Fiókbeállítások"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Fiókbeállítások"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"E-mailek ellenőrzésének gyakorisága"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail fiók"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Fiók kiválasztása"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Fiókok frissítése"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"A fiókot nem lehet frissíteni"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Csak bizonyos \"Plus\" típusú fiókok rendelkeznek olyan POP-hozzáféréssel, amely lehetővé teszi a program számára a kapcsolódást. Ha nem tud bejelentkezni a megfelelő e-mail címmel és jelszóval, valószínűleg nem fizetett elő \"Plus\" típusú fiókra. Kérjük, indítsa el a webböngészőt az ilyen e-mail fiókok eléréséhez."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3da9cee..2f17271 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"dalam <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> akun"</item>
     <item quantity="other" msgid="2723797835410343458">"dalam <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> akun"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Kotak Masuk"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Siapkan email"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Penyiapan akun"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tambah akun Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tambahkan akun Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Mengambil informasi akun..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Memeriksa setelan server masuk…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Memeriksa setelan server keluar…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Siapkan email"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Penyiapan akun"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Beri nama akun ini (opsional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Nama (yang ditampilkan pada pesan keluar)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Tambah akun email baru"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Penyiapan akun"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jenis akun apakah ini?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setelan server masuk"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Penyiapan akun"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setelan server masuk"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nama Pengguna"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Sandi"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Jika saya hapus dari Kotak Masuk"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Awalan jalur IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Setelan server keluar"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Penyiapan akun"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Setelan server keluar"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Jenis keamanan"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Harus masuk"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nama Pengguna"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Sandi"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Setelan server"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Penyiapan akun"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Setelan server"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Nama Pengguna"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gunakan sambungan aman (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Terima semua sertifikat SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opsi akun"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Setelan akun"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekuensi pemeriksaan email"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Akun email"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pilih akun"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Meningkatkan versi akun"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Tidak dapat meningkatkan versi akun"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Hanya beberapa akun \"Plus\" termasuk akses POP yang memungkinkan program ini terhubung. Jika tidak dapat masuk dengan alamat dan sandi email yang benar, Anda mungkin tidak memiliki akun \"Plus\" berbayar. Buka peramban Web untuk mendapat akses ke akun surat ini."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d3398df..51067ff 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + altri <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + altri <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> account"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> account"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Meno recenti"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Imposta email"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Impostazione account"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Aggiungi un account Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Aggiungi un account Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Account email"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account in corso…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica delle impostazioni del server della posta in arrivo in corso…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verifica impostazioni server posta in uscita…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Imposta email"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Impostazione account"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assegna un nome all\'account (facoltativo)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Il tuo nome (visualizzato nei messaggi in uscita)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Aggiungi un nuovo account email"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Impostazione account"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo di account"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Di quale tipo di account si tratta?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Impostazioni server della Posta in arrivo"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Impostazione account"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Impostazioni server Posta in arrivo"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome utente"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da Posta in arrivo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefisso percorso IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facoltativo"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Impostazioni server posta in uscita"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Impostazione account"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Impostazioni server Posta in uscita"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo di protezione"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Richiedi accesso"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome utente"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Impostazioni server"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Impostazione account"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Impostazioni server"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio/nome utente"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizza connessione sicura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accetta tutti i certificati SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispositivo mobile"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opzioni account"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Impostazioni account"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opzioni account"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequenza di controllo Posta in arrivo"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"L\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" verrà rimosso da Email."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Rimuovi account"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Rimuovi account"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Account email"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleziona un account"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Esegui l\'upgrade degli account"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impossibile eseguire l\'upgrade dell\'account"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Solo alcuni account \"Plus\" includono l\'accesso POP che consente la connessione del programma. Se non riesci ad accedere con l\'indirizzo email e la password corretti, potresti non disporre di un account \"Plus\" a pagamento. Avvia il browser web per avere accesso a questi account di posta."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normali"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grandi"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Molto grandi"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> di <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3edb420..d455d5e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
     <item quantity="other" msgid="2723797835410343458">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"תיבת דואר נכנס"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"הגדר דוא\"ל"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"הגדרת חשבון"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"הוספת חשבון Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"הוסף חשבון Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"מאחזר פרטי חשבון..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"בודק הגדרות שרת דואר נכנס..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"בודק הגדרות שרת דואר יוצא..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"הגדרת דוא\"ל"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"הגדרת חשבון"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"תן שם לחשבון זה (אופציונלי)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"שמך (מוצג בהודעות יוצאות)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"הוספת חשבון דוא\"ל חדש"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"הגדרת חשבון"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"איזה סוג חשבון זה?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"הגדרות שרת דואר נכנס"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"הגדרת חשבון"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"הגדרות שרת דואר נכנס"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"שם משתמש"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"סיסמה"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"שרת POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"בעת מחיקה מדואר נכנס"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"קידומת נתיב IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"אופציונלי"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"הגדרות שרת דואר יוצא"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"הגדרת חשבון"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"הגדרות שרת דואר יוצא"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"שרת SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"יציאה"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"סוג אבטחה"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"דרוש כניסה."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"שם משתמש"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"סיסמה"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"הגדרות שרת"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"הגדרת חשבון"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"הגדרות שרת"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"שרת"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"דומיין/שם משתמש"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"השתמש בחיבור מאובטח (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"קבל את כל אישורי SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"אפשרויות חשבון"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"הגדרות חשבון"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"תדירות בדיקת דוא\"ל"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"חשבון דוא\"ל"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"בחר חשבון"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"שדרוג חשבונות"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"אין אפשרות לשדרג את החשבון"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"רק מספר חשבונות Plus כוללים גישה ל-POP המאפשרת לתוכנית זו להתחבר. אם אינך יכול להיכנס עם כתובת הדוא\"ל והסיסמה הנכונות שלך, ייתכן שאין לך חשבון Plus בתשלום. הפעל את דפדפן האינטרנט כדי לקבל גישה לחשבונות דואר אלה."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 78cbd2c..7d53a80 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</item>
     <item quantity="other" msgid="2723797835410343458">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>と他<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>件"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>と他<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>件"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="5620484088786656170">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>個のアカウント"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>個のアカウント"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"前"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"メールアカウントの登録"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"アカウント設定"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchangeアカウントを追加"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSyncアカウントを追加"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"メールアカウント"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"アカウント情報を取得中..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"受信サーバーの設定を確認中..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"送信サーバーの設定を確認中..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"メールアカウントの登録"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"アカウント設定"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"アカウントの設定が完了しました。"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"このアカウントに名前を付ける (省略可):"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"あなたの名前（送信メールに表示されます）"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"新しいメールアカウントを追加"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"アカウント設定"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"アカウントの種類"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"このアカウントのタイプ"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"受信サーバーの設定"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"アカウント設定"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"受信サーバーの設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ユーザー名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"パスワード"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3サーバー"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"受信トレイから削除したとき"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAPパスのプレフィックス"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"省略可"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"送信サーバーの設定"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"アカウント設定"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"送信サーバーの設定"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTPサーバー"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ポート"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"セキュリティの種類"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ログインが必要"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ユーザー名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"パスワード"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"サーバー設定"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"アカウント設定"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"サーバー設定"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"サーバー"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"ドメイン\\ユーザー名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"安全な接続（SSL）を使用する"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"すべてのSSL証明書を承認"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"携帯端末ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"アカウントのオプション"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"アカウントの設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"アカウントのオプション"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"受信トレイを確認する頻度"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"自動確認しない"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"アカウント\"<xliff:g id="ACCOUNT">%s</xliff:g>\"をEメールから削除しますか。"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"アカウントの削除"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"アカウントを削除"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"メール"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"アカウントを選択"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"アカウントをアップグレード"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"アカウントをアップグレードできません"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"このプログラムでPOPアクセスが許可されているのは一部の「Plus」アカウントだけです。有料の「Plus」アカウントがなければ、正しいメールアドレスとパスワードを入力してもログインできません。これらのアカウントにはブラウザからアクセスしてください。"</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"標準"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"極大"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d7060b7..71fbac6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>님의 메일 + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>개"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>님의 메일 + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>개"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개"</item>
-    <item quantity="other" msgid="5620484088786656170">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"계정 <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>개"</item>
     <item quantity="other" msgid="8548760449976444566">"계정 <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>개"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"이전"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"이메일 설정"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"계정 설정"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange 계정 추가"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync 계정 추가"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"이메일 계정"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"계정 정보 검색 중..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"받는 서버 설정 확인 중..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"발신 서버 설정 확인 중..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"이메일 설정"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"계정 설정"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"계정이 설정되었으며 이메일을 사용할 수 있습니다."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(발신 메시지에 표시)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"새 이메일 계정 추가"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"계정 설정"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"계정 유형"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형이 무엇입니까?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"수신 서버 설정"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"계정 설정"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"수신 서버 설정"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 서버"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"받은편지함에서 삭제할 때"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 경로 접두어"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"선택사항"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"발신 서버 설정"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"계정 설정"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"발신 서버 설정"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 서버"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"포트"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"보안 유형"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"로그인 필요"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"사용자 이름"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"비밀번호"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"서버 설정"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"계정 설정"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"서버 설정"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"서버"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"도메인\\사용자 이름"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"보안 연결(SSL) 사용"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"모든 SSL 인증서 수락"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"휴대기기 ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"계정 옵션"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"계정 설정"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"계정 옵션"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"받은편지함 확인 빈도"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"안함"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"<xliff:g id="ACCOUNT">%s</xliff:g> 계정이 이메일에서 삭제됩니다."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"계정 삭제"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"계정 삭제"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"이메일 계정"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"계정 선택"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"계정 업그레이드"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"계정을 업그레이드할 수 없음"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"일부 \'Plus\' 계정에만 이 프로그램에 연결할 수 있는 POP 액세스 권한이 있습니다. 올바른 이메일 주소와 비밀번호를 입력해도 로그인이 되지 않으면 유료 \'Plus\' 계정이 없기 때문일 수 있습니다. 이러한 메일 계정에 액세스하려면 웹브라우저를 실행하세요."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"보통"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"크게"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"아주 크게"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4d365c6..fdb23b1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> paskyrose (-ų)"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> paskyrose (-ų)"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Gautų laiškų aplankas"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nustatyti el. paštą"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Paskyros sąranka"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridėti „Exchange“ paskyrą"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridėti „Exchange ActiveSync“ paskyrą"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Nuskaitoma paskyros informacija..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tikrinami gaunamų laiškų serverio nustatymai..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tikrinami siunčiamo serverio nustatymai..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nustatyti el. paštą"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Paskyros sąranka"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Suteikti šiai paskyrai pavadinimą (pasirenkama)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsų vardas ir pavardė (pateikiami siunčiamuose pranešimuose)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Pridėti naują el. pašto paskyrą"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Paskyros sąranka"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kokio tipo tai paskyra?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Gaunamų laiškų serverio nustatymai"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Paskyros sąranka"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gaunamų laiškų serverio nustatymai"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Naudotojo vardas"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Slaptažodis"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 serveris"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kai ištrinu iš gautų laiškų aplanko"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP prieigos kelio kodas"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Pasirenkama"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Siunčiamų laiškų serverio nustatymai"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Paskyros sąranka"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Siunčiamų laiškų serverio nustatymai"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Prievadas"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Saugos tipas"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Reikalauti prisijungti."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Naudotojo vardas"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Slaptažodis"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverio nustatymai"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Paskyros sąranka"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Serverio nustatymai"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveris"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domenas / naudotojo vardas"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Naudoti saugų ryšį (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Priimti visus SSL sertifikatus"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Paskyros parinktys"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Paskyros nustatymai"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"El. pašto tikrinimo dažnumas"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"El. p. pask."</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pasirinkti paskyrą"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Naujovinti paskyras"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Neįmanoma naujovinti paskyros"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Tik kai kuriose „Plus“ paskyrose yra POP prieiga, leidžianti prisijungti šiai programai. Jei negalite prisijungti su teisingu el. pašto adresu ir slaptažodžiu, galbūt neapmokėjote „Plus“ paskyros. Paleiskite žiniatinklio naršyklę, kad gautumėte prieigą prie šių pašto paskyrų."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7daf2e7..1c68927 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontā(-os)"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontā(-os)"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Iesūtne"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-pasta iestatīšana"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konta iestatīšana"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange konta pievienošana"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pievienot Exchange ActiveSync kontu"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Notiek konta informācijas izgūšana..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Notiek servera ienākošo datu iestatījumu pārbaude..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Notiek servera izejošo datu iestatījumu pārbaude…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-pasta iestatīšana"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Konta iestatīšana"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ievadiet konta nosaukumu (neobligāti)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsu vārds (attēlots izejošajos ziņojumos)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Jauna e-pasta konta pievienošana"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konta iestatīšana"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kāds ir šī konta veids?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Servera ienākošo datu iestatījumi"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konta iestatīšana"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ienākošā servera iestatījumi"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Lietotājvārds"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parole"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 serveris"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kad es dzēšu no iesūtnes"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP ceļa prefikss"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobligāti"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Servera izejošo datu iestatījumi"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konta iestatīšana"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Izejošā servera iestatījumi"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Ports"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Drošības veids"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Pieprasīt pierakstīšanos."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Lietotājvārds"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parole"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Servera iestatījumi"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Konta iestatīšana"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Servera iestatījumi"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveris"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domēns\\lietotājvārds"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Lietot drošu savienojumu (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Pieņemt visus SSL sertifikātus"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Konta opcijas"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Konta iestatījumi"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"E-pasta pārbaudes biežums"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-pasta k."</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Atlasīt kontu"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Kontu jaunināšana"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nevar jaunināt kontu"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Tikai dažiem “Plus” kontiem ir POP piekļuve, kas ļauj šai programmai izveidot savienojumu. Ja nevarat pierakstīties, izmantojot pareizu e-pasta adresi un paroli, iespējams, jums nav apmaksāta “Plus” konta. Lūdzu, palaidiet tīmekļa pārlūkprogrammu, lai piekļūtu šiem pasta kontiem."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 42a9c59..e5a61b8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontoer"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontoer"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konto"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> kontoer"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Eldre"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Sett opp e-post"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfigurering av konto"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Legg til en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Legg til en Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-postkonto"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontoinformasjon…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sjekker tjenerinnstillinger for inngående e-post…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sjekker tjenerinnstillinger for utgående e-post…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Sett opp e-post"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Konfigurering av konto"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Kontoen din er konfigurert, og e-post er på vei!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gi denne kontoen et navn (valgfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Navnet ditt (vises i utgående meldinger)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Legg til ny e-postkonto"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konfigurering av konto"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotype"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hva slags konto er dette?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Tjenerinnstillinger for inngående e-post"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfigurering av konto"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Tjenerinnstillinger for innkommende e-postmelding"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brukernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passord"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-tjener"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter den fra innboksen"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-stiprefiks"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfritt"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Tjenerinnstillinger for utgående e-post"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfigurering av konto"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Tjenerinnstillinger for utgående e-postmelding"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Innstillinger for tjener"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Konfigurering av konto"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Innstillinger for tjener"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Tjener"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domene\\brukernavn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Bruk sikker tilkobling (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Godkjenn alle SSL-sertifikater"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilenhets-ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinnstillinger"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinnstillinger"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Alternativer for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekvens for kontroll av innboks"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldri"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» vil bli fjernet fra e-postapplikasjonen."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Fjern konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Fjern konto"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-postkonto"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Velg en konto"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Oppgrader kontoer"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Får ikke oppgradert konto"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Bare noen «pluss-kontoer» tilbyr POP-tilgang som dette programmet trenger for å koble til. Hvis du ikke klarer å logge på med riktig e-postadresse og passord, kan det være du ikke har en betalt «pluss»-tilgang. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kjempestor"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7a45baa..6d26a39 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> meer"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> meer"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> account"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> accounts"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ouder"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-mail instellen"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Accountinstellingen"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Een Exchange-account toevoegen"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Een Exchange ActiveSync-account toevoegen"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailaccount"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Accountinformatie ophalen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Serverinstellingen inkomende e-mail controleren..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Serverinstellingen uitgaande e-mail controleren..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-mail instellen"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Accountinstellingen"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Uw account is ingesteld en er is e-mail onderweg."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Geef dit account een naam (optioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nieuw e-mailaccount toevoegen"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Accountinstellingen"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Accounttype"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Welk type account is dit?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Serverinstellingen inkomende e-mail"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Accountinstellingen"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Instellingen voor de inkomende server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikersnaam"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wachtwoord"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Als ik verwijder uit mijn Postvak IN"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Voorvoegsel IMAP-pad"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optioneel"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Serverinstellingen uitgaande e-mail"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Accountinstellingen"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Instellingen voor de uitgaande server"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Poort"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Beveiligingstype"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Aanmelden vereist"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikersnaam"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wachtwoord"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverinstellingen"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Accountinstellingen"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Serverinstellingen"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domein/gebruikersnaam"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Beveiligde verbinding (SSL) gebruiken"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-certificaten accepteren"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiele apparaat-id"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Accountopties"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Accountinstellingen"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Accountopties"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Controlefrequentie inbox"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nooit"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"De account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Account verwijderen"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Account verwijderen"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mailaccount"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selecteer een account"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Accounts upgraden"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Kan account niet upgraden"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Alleen sommige Plus-accounts hebben POP-toegang waarmee dit programma verbinding kan maken. Als u zich niet kunt aanmelden met het juiste e-mailadres en wachtwoord, heeft u mogelijk niet betaald voor uw Plus-account. Start de webbrowser voor toegang tot deze e-mailaccounts."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normaal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorm"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b4f6e60..3e5272a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</item>
     <item quantity="other" msgid="2723797835410343458">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> więcej"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> więcej"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="5620484088786656170">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konto"</item>
     <item quantity="other" msgid="8548760449976444566">"Konta: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starsze"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Skonfiguruj konto e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguracja konta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj konto Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj konto Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Konto e-mail"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pobieranie informacji o koncie…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sprawdzanie ustawień serwera poczty przychodzącej…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sprawdzanie ustawień serwera poczty wychodzącej…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguracja konta e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguracja konta"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Konto zostało skonfigurowane, a wiadomości e-mail są w drodze!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nazwa konta (opcjonalnie)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Twoja nazwa (wyświetlana w wiadomościach wychodzących)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Dodaj nowe konto e-mail"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konfiguracja konta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Typ konta"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jakiego typu jest to konto?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ustawienia serwera poczty przychodzącej"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfiguracja konta"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ustawienia serwera poczty przychodzącej"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nazwa użytkownika"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Hasło"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Serwer POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Po usunięciu z folderu Odebrane"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefiks ścieżki IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcjonalnie"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ustawienia serwera poczty wychodzącej"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfiguracja konta"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Ustawienia serwera poczty wychodzącej"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serwer SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpieczeń"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Wymagaj zalogowania się."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nazwa użytkownika"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Hasło"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ustawienia serwera"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Konfiguracja konta"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Ustawienia serwera"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serwer"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\nazwa użytkownika"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Użyj bezpiecznego połączenia (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Akceptuj wszystkie certyfikaty SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Identyfikator telefonu komórkowego"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opcje konta"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Ustawienia konta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcje konta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Częstotliwość sprawdzania skrzynki odbiorczej"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nigdy"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> zostanie usunięte z usługi poczty e-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Usuń konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Usuń konto"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Konto e-mail"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Wybierz konto"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Uaktualnij konta"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nie można uaktualnić konta"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Tylko niektóre konta typu Plus zawierają funkcję dostępu POP, która umożliwia nawiązywanie połączenia za pomocą tego programu. Jeśli nie możesz zalogować się przy użyciu poprawnego adresu e-mail i hasła, to być może nie posiadasz płatnego konta typu Plus. Uruchom przeglądarkę internetową, aby uzyskać dostęp do tych kont pocztowych."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normalny"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6892b40..010556d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
     <item quantity="other" msgid="2723797835410343458">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + mais <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + mais <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas"</item>
-    <item quantity="other" msgid="5620484088786656170">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas<xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas<xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> conta"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> contas"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mais antigas"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de e-mail"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"A obter informações da conta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"A verificar definições do servidor de recepção..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"A verificar definições do servidor de envio..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"A sua conta está configurada e o e-mail vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Adicionar nova conta de e-mail"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuração da conta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de conta"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é este?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Definições do servidor de recepção"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuração da conta"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Definições do servidor de recepção"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de utilizador"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Palavra-passe"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da pasta A Receber"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo de caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Definições de servidor de envio"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuração da conta"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Definições de servidor de envio"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitar início de sessão."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de utilizador"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Palavra-passe"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Definições do servidor"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuração da conta"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Definições do servidor"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio/Nome de utilizador"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar ligação segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SLL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do dispositivo móvel"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opções da conta"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Definições da conta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequência de verificação de caixa de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida do E-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Remover conta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Remover conta"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Conta de e-mail"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleccione uma conta"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar contas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Não é possível actualizar a conta"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Apenas algumas contas \"Plus\" incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o seu endereço de e-mail e a palavra-passe correctos, é possível que não tenha uma conta \"Plus\" paga. Inicie o browser para obter acesso a essas contas de correio."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index afac371..86d8cf8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
     <item quantity="other" msgid="2723797835410343458">"em <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contas"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> mais"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> mais"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> conta"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> contas"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mais antigos"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de e-mail"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando informações sobre a conta"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verificando as configurações de entrada do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verificando as configurações de saída do servidor..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Sua conta está configurada e o e-mail está a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Seu nome (exibido nas mensagens enviadas)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Adicionar nova conta de e-mail"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuração da conta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de conta"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é esta?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configurações de entrada do servidor"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuração da conta"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configurações de entrada do servidor"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de usuário"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Senha"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando eu excluir da Caixa de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo do caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configurações de servidor enviadas"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuração da conta"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configurações de saída do servidor"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requer login."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de usuário"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Senha"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configurações do servidor"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuração da conta"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Configurações do servidor"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio\\Nome de usuário"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Usar conexão segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do aparelho celular"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opções da conta"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Configurações da conta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequência de verificação da caixa de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida deste e-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Remover conta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Remover conta"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Con e-mail"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selecione uma conta"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Atualizar contas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Não é possível atualizar a conta."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Somente algumas contas \"Plus\" incluem o acesso POP permitindo que este programa seja conectado. Se não for possível fazer login com seu endereço de e-mail e senha corretos, você talvez não tenha uma conta \"Plus\" paga. Inicie o navegador da web para acessar estas contas de email."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1a98eb9..3de0296 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -81,12 +81,8 @@
     <item quantity="few" msgid="1991747245324120305">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contos"</item>
     <item quantity="other" msgid="2723797835410343458">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> contos"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posta entrada"</string>
@@ -430,6 +426,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index db9de03..a274117 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"în <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (de) conturi"</item>
     <item quantity="other" msgid="2723797835410343458">"în <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (de) conturi"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Mesaje primite"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuraţi un cont de e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurare cont"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adăugaţi un cont Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adăugaţi un cont Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Se preiau informaţiile despre cont..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Se verifică setările pentru serverul mesajelor de intrare..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Se verifică setările serverului de mesaje de ieşire..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuraţi un cont de e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Configurare cont"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Daţi un nume acestui cont (opţional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Numele dvs. (afişat în mesajele de trimitere)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Adăugaţi un cont de e-mail nou"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configurare cont"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Ce tip de cont este acesta?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setări pentru serverul de mesaje de intrare"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configurare cont"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setări pentru serverul de mesaje de intrare"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nume de utilizator"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parolă"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Când şterg un mesaj din Mesaje primite"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixul de cale pentru accesul IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opţional"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Setările serverului de ieşire"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configurare cont"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Setări pentru serverul de mesaje de ieşire"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipul de securitate"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitaţi conectarea."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nume de utilizator"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parolă"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Setări server"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Configurare cont"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Setări server"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domeniu\\Nume de utilizator"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizaţi o conexiune securizată (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptaţi toate certificatele SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opţiunile contului"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Setări cont"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecvenţa de verificare a mesajelor de e-mail"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"C. e-mail"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selectaţi un cont"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Treceţi conturile la o versiune superioară"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Contul nu poate fi trecut la o versiune superioară"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Numai unele conturi de tip „Plus” includ accesul de tip POP, permiţând conectarea acestui program. Dacă nu reuşiţi să vă conectaţi cu adresa de e-mail şi parola corecte, este posibil să nu aveţi un cont de tip „Plus” plătit. Lansaţi browserul web pentru a obţine accesul la aceste conturi de e-mail."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e05573b..7a4d9a9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> аккаунтах"</item>
     <item quantity="other" msgid="2723797835410343458">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> аккаунтах"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> и еще <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> и еще <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="5620484088786656170">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"Число аккаунтов: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="8548760449976444566">"Число аккаунтов: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"След."</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка электронной почты"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка аккаунта"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавить аккаунт Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавить аккаунт Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Аккаунт эл. почты"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Получение информации аккаунта..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Проверка настроек сервера входящих сообщений..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Проверка настроек сервера исходящих сообщений..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка электронной почты"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка аккаунта"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Ваш аккаунт настроен, ждите сообщений!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Присвойте этому аккаунту название (по желанию)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше имя (показывается в исходящих сообщениях)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Добавить новый аккаунт электронной почты"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Настройка аккаунта"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Тип аккаунта"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Что это за аккаунт?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройки сервера входящих сообщений"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройка аккаунта"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Настройки сервера входящих сообщений"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Имя пользователя"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Сервер POP3"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"При удалении из входящих"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Префикс пути IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По желанию"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройки сервера исходящих сообщений"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройка аккаунта"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Настройки сервера исходящих сообщений"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безопасности"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Требовать входа в аккаунт."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Имя пользователя"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройки сервера"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройка аккаунта"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Настройки сервера"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\Имя пользователя"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Использовать защищенное соединение (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Принимать все сертификаты SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идентификатор мобильного устройства"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Параметры аккаунта"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки аккаунта"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметры аккаунта"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота проверки папки \"Входящие\""</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Никогда"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" будет удален из Email."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Удалить аккаунт"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Удалить аккаунт"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Аккаунт эл. почты"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Выберите аккаунт"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Обновить аккаунты"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Не удается обновить аккаунт"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Доступ по протоколу POP, позволяющий этой программе подключаться, разрешен только в некоторых аккаунтах Plus. Если вам не удается войти со своим адресом электронной почты и паролем, скорее всего, у вас бесплатный аккаунт (не Plus). Доступ к такому аккаунту возможен через браузер."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Обычный"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Крупный"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромный"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> из <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b76e433..86352cb 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtoch"</item>
     <item quantity="other" msgid="2723797835410343458">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtoch"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Doručená pošta"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastaviť e-mail"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavenie účtu"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridať účet Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridať účet Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítavajú sa informácie o účte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení servera prichádzajúcej pošty…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení servera odchádzajúcej pošty…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastaviť e-mail"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavenie účtu"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenovať tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Pridať nový e-mailový účet"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavenie účtu"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O aký typ účtu ide?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavenia servera prichádzajúcej pošty"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavenie účtu"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavenia servera prichádzajúcej pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Používateľské meno"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Pri odstránení z Doručenej pošty"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Predpona cesty IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Voliteľné"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavenia servera odchádzajúcej pošty"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavenie účtu"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Nastavenia servera odchádzajúcej pošty"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečenia"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovať prihlásenie"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Používateľské meno"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavenia servera"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavenie účtu"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Nastavenia servera"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Používateľské meno"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použiť zabezpečené pripojenie (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prijímať všetky certifikáty protokolu SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Možnosti účtu"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavenia účtu"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Četnost kontrol e-mailů"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail. účet"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Výber účtu"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Inovovať účty"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Účet nie je možné inovovať"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Prístup prostredníctvom protokolu POP, umožňujúci pripojenie tohto programu, obsahujú iba niektoré účty Plus. Ak sa nemôžete prihlásiť so správnou e-mailovou adresou a heslom, pravdepodobne nemáte platený účet Plus. Ak chcete pristupovať k týmto poštovým účtom, vykonajte to prostredníctvom webového prehliadača."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1d1eef2..ece624b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računih"</item>
     <item quantity="other" msgid="2723797835410343458">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računih"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Prejeto"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavitev e-pošte"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavitev računa"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj račun Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj račun Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pridobivanje podatkov o računu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Preverjanje nastavitev strežnika za dohodno pošto..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Preverjanje nastavitev strežnika za odhodno pošto..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavitev e-pošte"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavitev računa"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Poimenujte račun (neobvezno)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano v odhodnih sporočilih)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Dodaj nov e-poštni račun"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavitev računa"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Katera vrsta računa je to?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavitve strežnika za dohodno pošto"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavitev računa"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavitve strežnika za dohodno pošto"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uporabniško ime"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Geslo"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Strežnik POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Ko sporočilo izbrišem iz nabiralnika"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Predpona poti IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobvezno"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavitve strežnika za odhodno pošto"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavitev računa"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Nastavitve strežnika za odhodno pošto"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Strežnik SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Vrata"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta varnosti"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Potrebna je prijava."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uporabniško ime"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Geslo"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavitve strežnika"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavitev računa"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Nastavitve strežnika"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Strežnik"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena/uporabniško ime"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Uporabi varno povezavo (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Sprejmi vsa potrdila SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Možnosti računa"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavitve računa"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Pogostost preverjanja e-pošte"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-pošti račun"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Izberite račun"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nadgradi račune"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Računa ni mogoče nadgraditi"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Samo nekateri računi »Plus« vsebujejo tudi dostop do strežnika POP, da se ta program lahko poveže. Če ste pravilno vnesli svoj e-poštni naslov in geslo in se ne morete prijaviti, morda nimate plačljivega računa »Plus«. Zaženite brskalnik, če želite dostopati do teh e-poštnih računov."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a900bfa..e7715dc 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"на <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> налога"</item>
     <item quantity="other" msgid="2723797835410343458">"на <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> налога"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Примљене"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Конфигурисање е-поште"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Подешавање налога"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додавање Exchange налога"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додајте Exchange ActiveSync налог"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Преузимање информација о налогу је у току…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"У току је провера подешавања сервера за долазну пошту…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"У току је провера подешавања одлазног сервера…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Конфигурисање е-поште"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Подешавање налога"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именујте овај налог (опционално)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше име (приказано у одлазним порукама)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Додај нови налог е-поште"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Подешавање налога"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Који је ово тип налога?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Подешавања сервера за долазну пошту"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Подешавање налога"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Подешавања сервера за долазну пошту"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Корисничко име"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Лозинка"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 сервер"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Када избришем из пријемног сандучета"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"префикс IMAP путање"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Опционално"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Подешавања одлазног сервера"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Подешавање налога"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Подешавања сервера за одлазну пошту"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сервер"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безбедности"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Захтева пријављивање."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Корисничко име"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Лозинка"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Подешавања сервера"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Подешавање налога"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Подешавања сервера"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен/корисничко име"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Користите безбедну везу (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прихвати све SSL сертификате"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Опције налога"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Подешавања налога"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Учесталост провере е-поште"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Е-пошта"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Избор налога"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Надоградња налога"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Није могуће надоградити налог."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну адресу е-поште и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c341a0f..d28f10c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item>
     <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> till"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> till"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konto"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konton"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Äldre"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Skapa e-postkonto"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoinställningar"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lägg till ett Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lägg till ett Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-postkonto"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hämtar kontoinformation…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerar inkommande serverinställningar…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerar utgående serverinställningar…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Skapa e-postkonto"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoinställningar"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ge kontot ett namn (valfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ditt namn (visas för utgående meddelanden)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Lägg till nytt konto"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoinställningar"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Vilken typ av konto är det här?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Inkommande serverinställningar"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoinställningar"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Inkommande serverinställningar"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Användarnamn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Lösenord"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"När jag tar bort något från min Inkorg"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-sökvägsprefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valfritt"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Utgående serverinställningar"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoinställningar"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Utgående serverinställningar"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Säkerhetstyp"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kräv inloggning"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverinställningar"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoinställningar"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Serverinställningar"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domän\\Användarnamn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Använd säker anslutning (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptera alla SSL-certifikat"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Den mobila enhetens ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoalternativ"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinställningar"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontoalternativ"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Intervall för e-postkontroll"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontot <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från E-post."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Ta bort konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Ta bort konto"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Epostkonto"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Välj ett konto"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Uppgradera konton"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Det går inte att uppgradera kontot"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"POP-åtkomst, som gör så att detta program kan ansluta, ingår bara i vissa pluskonton. Om det inte går att logga in med rätt e-postadress och lösenord kanske du inte har betalat för ett pluskonto. Öppna webbläsaren igen om du vill få åtkomst tills dessa e-postkonton."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Jättestor"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index cec323c..23ed8f2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"ในบัญชี <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> บัญชี"</item>
     <item quantity="other" msgid="2723797835410343458">"ในบัญชี <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> บัญชี"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"กล่องจดหมาย"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"ตั้งค่าอีเมล"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"เพิ่มบัญชี Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"เพิ่มบัญชี Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"กำลังเรียกข้อมูลบัญชี..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาเข้า..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาออก..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"ตั้งค่าอีเมล"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"การตั้งค่าบัญชี"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ตั้งชื่อให้กับบัญชีนี้ (เป็นตัวเลือก)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"ชื่อของคุณ (แสดงในข้อความขาออก)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"เพิ่มบัญชีอีเมลใหม่"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"การตั้งค่าบัญชี"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"บัญชีนี้เป็นบัญชีประเภทใด"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"การตั้งค่าเซิร์ฟเวอร์ขาเข้า"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"การตั้งค่าบัญชี"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"การตั้งค่าเซิร์ฟเวอร์ขาเข้า"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ชื่อผู้ใช้"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"รหัสผ่าน"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"เซิร์ฟเวอร์ POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"เมื่อฉันลบจากกล่องจดหมาย"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"ส่วนนำของพาธ IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"เป็นตัวเลือก"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"การตั้งค่าเซิร์ฟเวอร์ขาออก"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"การตั้งค่าบัญชี"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"การตั้งค่าเซิร์ฟเวอร์ขาออก"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"เซิร์ฟเวอร์ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"พอร์ต"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ประเภทการรักษาความปลอดภัย"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ต้องลงชื่อเข้าใช้"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ชื่อผู้ใช้"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"รหัสผ่าน"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"การตั้งค่าเซิร์ฟเวอร์"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"การตั้งค่าบัญชี"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"การตั้งค่าเซิร์ฟเวอร์"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"เซิร์ฟเวอร์"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"โดเมน\\ชื่อผู้ใช้"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"ใช้การเชื่อมต่อที่ปลอดภัย (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"ยอมรับใบรับรอง SSL ทั้งหมด"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"ตัวเลือกของบัญชี"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"การตั้งค่าบัญชี"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ความถี่ในการเช็คอีเมล"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"บัญชีอีเมล"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"เลือกบัญชี"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"อัปเกรดบัญชี"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"อัปเกรดบัญชีไม่ได้"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"มีเพียงบัญชีแบบ \"Plus\" บางประเภทเท่านั้นที่มีการเข้าถึงแบบ POP ที่โปรแกรมสามารถเชื่อมต่อได้ ถ้าคุณไม่สามารถลงชื่อเข้าใช้ด้วยที่อยู่อีเมลและรหัสผ่านที่ถูกต้อง อาจเป็นเพราะคุณไม่มีบัญชี \"Plus\" แบบมีค่าใช้จ่าย โปรดเปิดเว็บเบราว์เซอร์เพื่อเข้าถึงบัญชีอีเมลเหล่านี้"</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 291a86b..74be7f5 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"sa <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (na) account"</item>
     <item quantity="other" msgid="2723797835410343458">"sa <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (na) account"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inbox"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"I-set up ang email"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Setup ng account"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Magdagdag ng Exchange account"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Magdagdag ng Exchange ActiveSync account"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Binabawi ang impormasyon ng account…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sinusuri ang mga setting ng papasok na server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sinusuri ang mga setting ng papalabas na server…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"I-set up ang email"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Setup ng account"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bigyan ng pangalan ang account na ito (opsyonal)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Iyong pangalan (na ipinapakita sa mga papalabas na mensahe)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Magdagdag ng bagong email account"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Setup ng account"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Anong uri ng account ito?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Mga setting ng papasok na server"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setup ng account"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mga setting ng papasok na server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 server"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kapag nagtanggal ako mula sa Inbox"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix ng path ng IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsyonal"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Mga setting ng papalabas na server"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Setup ng account"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Mga setting ng papalabas na server"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uri ng seguridad"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Nangangailangan ng pag-sign-in."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Mga setting ng server"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Setup ng account"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Mga setting ng server"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gumamit ng secure na koneksyon (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tanggapin ang lahat ng mga SSL certificate"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Mga pagpipilian sa account"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Mga setting ng account"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Dalas ng pagsusuri ng email"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Email account"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pumili ng account"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"I-upgrade ang mga account"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Hindi magawang mag-upgrade ng account"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Ang ilan lang na \"Plus\" account ang kinabibilangan ng access sa POP at nagbibigay-daan sa programang ito na makakonekta. Kung hindi mo magawang mag-sign in gamit ang iyong tamang email address at password, maaaring wala kang bayad na \"Plus\" account. Pakilunsad ang Web browser upang makakuha ng access sa mga mail account na ito."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ff12a1b..134ca14 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> hesapta"</item>
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> hesapta"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> kişi daha"</item>
-    <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> kişi daha"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> hesap"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> hesap"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Daha eski"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-posta ayarla"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Hesap kurulumu"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Bir Exchange hesabı ekleyin"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Bir Exchange ActiveSync hesabı ekleyin"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-posta hesabı"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hesap bilgileri alınıyor..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Gelen sunucu ayarları denetleniyor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Giden sunucu ayarları denetleniyor..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-posta ayarla"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Hesap kurulumu"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Hesabınız ayarlandı ve e-posta gönderildi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bu hesaba bir ad ver (isteğe bağlı)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Adınız (giden iletilerde görüntülenir)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Yeni e-posta hesabı ekle"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Hesap kurulumu"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Hesap türü"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Bu hesabın türü nedir?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Gelen sunucu ayarları"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Hesap kurulumu"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gelen sunucu ayarları"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kullanıcı adı"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Şifre"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 sunucusu"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Gelen Kutusundan sildiğimde"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP yolu öneki"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"İsteğe bağlı"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Giden sunucu ayarları"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Hesap kurulumu"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Giden sunucu ayarları"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP sunucusu"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Bağlantı Noktası"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Güvenlik türü"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Oturum açılmasını gerektiriyor."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kullanıcı adı"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Şifre"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Sunucu ayarları"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Hesap kurulumu"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Sunucu ayarları"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Sunucu"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Alan adı/Kullanıcı adı"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Güvenli bağlantıyı kullan (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tüm SSL sertifikalarını kabul et"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobil Cihaz Kimliği"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Hesap seçenekleri"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Hesap ayarları"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Hesap seçenekleri"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Gelen kutusunu denetleme sıklığı"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Hiçbir zaman"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı E-postadan kaldırılacak."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Hesabı kaldır"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Hesabı kaldır"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Eposta hes"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Bir hesap seçin"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Hesapların yeni sürümüne geç"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Hesabın yeni sürümüne geçilemiyor"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Yalnızca bazı \"Plus\" hesapları bu programın bağlanmasına izin veren POP erişimi içerir. Doğru e-posta adresinizle ve şifrenizle oturum açamıyorsanız, ödemeli bir \"Plus\" hesabına sahip olmayabilirsiniz. Lütfen bu posta hesaplarına erişmek için Web tarayıcıyı başlatın."</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Büyük"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Çok büyük"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ddc1854..88ec302 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"у <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> обл. записах"</item>
     <item quantity="other" msgid="2723797835410343458">"у <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> обл. записах"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Вхідні"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Налашт. ел.адр."</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Налаштування облікового запису"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додати обл. запис Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додати обл. запис Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Отримання інфо про облік. запис…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Перевірка налашт-нь вихід. сервера…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Перевірка налашт-нь вихід. сервера…"</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Налашт. ел.адр."</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Налаштування облікового запису"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Назвіть цей обл. запис. (додатково)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше ім\'я (відображено у вихідних повідомл.)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Дод. нов. обл. зап. пошти"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Налаштування облікового запису"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Тип облікового запису?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Налашт. сервера вхід. повід."</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Налаштування облікового запису"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Параметри сервера вхідних повідомлень"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Ім\'я корист."</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Cервер POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Коли видалено з вхідних"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Префікс шляху IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Додатково"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Налашт. сервера вихід. пов."</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Налаштування облікового запису"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Параметри сервера вихідних повідомлень"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безпеки"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Необхідно ввійти."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Ім\'я корист."</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Налашт-ня сервера"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Налаштування облікового запису"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Параметри сервера"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\ім\'я корист."</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Викор. безпеч. з\'єднання (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прийняти всі сертифікати SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Парам. облік. зап."</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Параметри облікового запису"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота перевірки ел. пошти"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Обл.зап.пошти"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Вибрати облік. запис"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Онов. облік. записи"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Неможл. оновити облік. запис"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Лише деякі обл. записи класу \"Plus\" уключ. доступ до серв. POP, що дозвол. цій прогр. підключ. Якщо ви не можете ввійти за доп. правильної ел.адр. і пароля, можливо, у вас немає платн. обл. запису \"Plus\". Запуст. переглядач, щоб мати доступ до цих обл. записів пошти."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d79674a..b0d5dae 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -82,12 +82,8 @@
     <item quantity="few" msgid="1991747245324120305">"trong <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tài khoản"</item>
     <item quantity="other" msgid="2723797835410343458">"trong <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tài khoản"</item>
   </plurals>
-    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
-    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
     <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
     <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Hộp thư đến"</string>
@@ -208,7 +204,7 @@
     <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Thiết lập email"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Thiết lập tài khoản"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Thêm tài khoản Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Thêm tài khoản Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
@@ -228,18 +224,17 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Đang truy xuất thông tin tài khoản…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Đang kiểm tra cài đặt máy chủ thư đến..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Đang kiểm tra cài đặt máy chủ thư đi..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Thiết lập email"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Thiết lập tài khoản"</string>
     <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Đặt tên cho tài khoản này (tuỳ chọn)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tên bạn (được hiển thị trong tin nhắn đi)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Thêm tài khoản email mới"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Thiết lập tài khoản"</string>
     <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
     <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Đây loại tài khoản gì?"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Cài đặt máy chủ thư đến"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Thiết lập tài khoản"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Cài đặt máy chủ thư đến"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Tên người dùng"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mật khẩu"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Máy chủ POP3"</string>
@@ -256,25 +251,23 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Khi tôi xoá khỏi Hộp thư đến"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Tiền tố đường dẫn IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Tuỳ chọn"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Cài đặt máy chủ thư đi"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Thiết lập tài khoản"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Cài đặt máy chủ thư đi"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Máy chủ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Cổng"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Loại bảo mật"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Yêu cầu đăng nhập."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Tên người dùng"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mật khẩu"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Cài đặt máy chủ"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Thiết lập tài khoản"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Cài đặt máy chủ"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Máy chủ"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Tên miền\\Tên người dùng"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sử dụng kết nối bảo mật (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Chấp nhận tất cả chứng chỉ SSL"</string>
     <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
     <skip />
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Tuỳ chọn tài khoản"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"Cài đặt tài khoản"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Tần suất kiểm tra email"</string>
@@ -373,10 +366,8 @@
     <skip />
     <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
     <skip />
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Tài khoản email"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Chọn tài khoản"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nâng cấp tài khoản"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Không thể nâng cấp tài khoản"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Chỉ một số tài khoản \"Plus\" mới có quyền truy cập POP nhằm cho phép chương trình này kết nối. Nếu bạn không thể đăng nhập bằng địa chỉ email và mật khẩu chính xác của mình, bạn có thể không có tài khoản \"Plus\" trả tiền. Vui lòng khởi chạy trình duyệt Web để yêu cầu quyền truy cập vào các tài khoản thư này."</string>
@@ -438,6 +429,10 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for widget_other_views (2924270018204427009) -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c7b667d..cd42647 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</item>
     <item quantity="other" msgid="2723797835410343458">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"发件人：<xliff:g id="SENDER_NAME">%1$s</xliff:g>，还有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
-    <item quantity="other" msgid="4440886271354944083">"发件人：<xliff:g id="SENDER_NAME">%1$s</xliff:g>，还有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> 个帐户"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> 个帐户"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"更早"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"设置电子邮件"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"帐户设置"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"添加 Exchange 帐户"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"添加 Exchange ActiveSync 帐户"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"电子邮件帐户"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在检查接收服务器设置..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在检查外发服务器设置..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"设置电子邮件"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"帐户设置"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"您的帐户已设置完毕，可以收发电子邮件了！"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"为此帐户创建名称（可选）"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名（显示在外发邮件上）"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"添加新电子邮件帐户"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"帐户设置"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"帐户类型"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"这是什么类型的帐户？"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"接收服务器设置"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"帐户设置"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"接收服务器设置"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"用户名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密码"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 服务器"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当从收件箱中删除时"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"外发服务器设置"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帐户设置"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"外发服务器设置"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 服务器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"端口"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全类型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"需要登录。"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"用户名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密码"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"服务器设置"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"帐户设置"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"服务器设置"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"服务器"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"域名\\用户名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"采用安全连接 (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有 SSL 证书"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备 ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户选项"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"帐户设置"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帐户选项"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"收件箱检查频率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"一律不"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"将会从电子邮件中删除“<xliff:g id="ACCOUNT">%s</xliff:g>”帐户。"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"删除帐户"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"删除帐户"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"电子邮件帐户"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"选择帐户"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"升级帐户"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"无法升级帐户"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"只有某些“Plus”帐户支持 POP 访问而允许此程序进行连接。如果您使用正确的电子邮件地址和密码无法登录，则可能还未开通付费的“Plus”帐户。请启动网络浏览器以获取对这些邮件帐户的访问权限。"</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"正常"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"超大"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4713b85..77f5c62 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -78,18 +78,8 @@
     <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶"</item>
     <item quantity="other" msgid="2723797835410343458">"於 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶"</item>
   </plurals>
-  <plurals name="notification_sender_name_multi_messages">
-    <item quantity="one" msgid="3212542153806717105">"寄件者：<xliff:g id="SENDER_NAME">%1$s</xliff:g>，還有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
-    <item quantity="other" msgid="4440886271354944083">"寄件者：<xliff:g id="SENDER_NAME">%1$s</xliff:g>，還有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_single_account">
-    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件"</item>
-    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件"</item>
-  </plurals>
-  <plurals name="notification_num_new_messages_multi_account">
-    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
-  </plurals>
+    <!-- no translation found for notification_to_account (2078557719010667913) -->
+    <skip />
   <plurals name="number_of_accounts">
     <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> 個帳戶"</item>
     <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> 個帳戶"</item>
@@ -204,7 +194,7 @@
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"較舊"</string>
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"設定電子郵件"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"帳戶設定"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"新增 Exchange 帳戶"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"新增 Exchange ActiveSync 帳戶"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"電子郵件帳戶"</string>
@@ -223,16 +213,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在擷取帳戶資訊..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在檢查收信伺服器設定..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在檢查外寄伺服器設定..."</string>
-    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"設定電子郵件"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"帳戶設定"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"您的帳戶已設定完成，可以收發電子郵件了！"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"設定帳戶名稱 (選擇性)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名 (顯示於外寄郵件)"</string>
-    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"新增電子郵件帳戶"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"帳戶設定"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"帳戶類型"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"帳戶類型為何？"</string>
-    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"收信伺服器設定"</string>
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"帳戶設定"</string>
+    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"內送伺服器設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"使用者名稱"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密碼"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 伺服器"</string>
@@ -249,24 +238,22 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"當我從收件匣刪除時"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路徑字首"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"選用"</string>
-    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"外寄伺服器設定"</string>
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帳戶設定"</string>
+    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"外寄伺服器設定"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 伺服器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"通訊埠"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全性類型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"必須登入。"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"使用者名稱"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密碼"</string>
-    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"伺服器設定"</string>
-    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
-    <skip />
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"帳戶設定"</string>
+    <string name="account_setup_exchange_headline" msgid="6099049671599242131">"伺服器設定"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"伺服器"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"網域\\使用者名稱"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"使用安全連線 (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有安全資料傳輸層 (SSL) 憑證"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"行動裝置 ID"</string>
-    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶選項"</string>
+    <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帳戶選項"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"查看收件匣頻率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"不要檢查"</string>
@@ -354,10 +341,8 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"系統將從 [電子郵件] 中移除帳戶「<xliff:g id="ACCOUNT">%s</xliff:g>」。"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"移除帳戶"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"移除帳戶"</string>
-    <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
-    <skip />
-    <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
-    <skip />
+    <string name="account_shortcut_picker_name" msgid="1994861845225243190">"電子郵件帳戶"</string>
+    <string name="account_shortcut_picker_title" msgid="8799411733165525683">"選取帳戶"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"升級帳戶"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"無法升級帳戶"</string>
     <string name="provider_note_live" msgid="3584841823811425060">"只有部分包含 POP 存取功能的「Plus」帳戶能與這個程式連線。如果您輸入的電子郵件地址和密碼無誤，卻仍無法登入，表示您可能尚未購買「Plus」帳戶。請啟動網頁瀏覽器，以存取這些電子郵件帳戶。"</string>
@@ -406,6 +391,10 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"適中"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
+    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
+    <skip />
+    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <!-- no translation found for widget_other_views (2924270018204427009) -->
     <skip />