diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e4dca24f..6f40b181b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -144,7 +144,7 @@
     <string name="account_setup_options_mail_check_frequency_30min">"Každých 30 minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour">"Každou hodinu"</string>
     <string name="account_setup_options_default_label">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
-    <string name="account_setup_options_notify_label">"Upozornit mě na příchod e-mailu"</string>
+    <string name="account_setup_options_notify_label">"Upozornit mě na příchozí e-mail"</string>
     <string name="account_setup_failed_dlg_title">"Nastavení nelze dokončit"</string>
     <string name="account_setup_failed_dlg_auth_message">"Uživatelské jméno nebo heslo není správné"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt">"Uživatelské jméno nebo heslo není správné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
@@ -160,8 +160,8 @@
     <string name="account_settings_title_fmt">"Obecná nastavení"</string>
     <string name="account_settings_default_label">"Výchozí účet"</string>
     <string name="account_settings_default_summary">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
-    <string name="account_settings_notify_label">"E-mailová upozornění"</string>
-    <string name="account_settings_notify_summary">"Zobrazit upozornění na příchod e-mailu na stavovém řádku"</string>
+    <string name="account_settings_notify_label">"Upozornění na e-maily"</string>
+    <string name="account_settings_notify_summary">"Zobrazit upozornění na příchozí e-mail na stavovém řádku"</string>
     <string name="account_settings_mail_check_frequency_label">"Četnost kontrol e-mailů"</string>
     <string name="account_settings_incoming_label">"Nastavení příchozí pošty"</string>
     <string name="account_settings_outgoing_label">"Nastavení odchozí pošty"</string>
@@ -170,7 +170,7 @@
     <string name="account_settings_name_label">"Vaše jméno"</string>
     <string name="account_settings_notifications">"Nastavení upozornění"</string>
     <string name="account_settings_vibrate_enable">"Vibrovat"</string>
-    <string name="account_settings_vibrate_summary">"Při příchodu e-mailu také vibrovat"</string>
+    <string name="account_settings_vibrate_summary">"Při obdržení e-mailu také vibrovat"</string>
     <string name="account_settings_ringtone">"Zvolit vyzváněcí tón"</string>
     <string name="account_settings_servers">"Nastavení serveru"</string>
     <string name="account_delete_dlg_title">"Odebrat účet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ce4229b3a..1531f4eb5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -42,7 +42,7 @@
     <string name="accounts_action">"Konten"</string>
     <string name="mark_as_read_action">"Als gelesen markieren"</string>
     <string name="mark_as_unread_action">"Als ungelesen markieren"</string>
-    <string name="add_cc_bcc_action">"Feld \"Cc\"/\"Bcc\" hinzufügen"</string>
+    <string name="add_cc_bcc_action">"\"Cc\"/\"Bcc\" hinzufügen"</string>
     <string name="add_attachment_action">"Anhang hinzufügen"</string>
     <string name="dump_settings_action">"Einstellungen für Speicherauszug"</string>
     <string name="accounts_context_menu_title">"Kontooptionen"</string>
@@ -160,12 +160,12 @@
     <string name="account_settings_title_fmt">"Allgemeine Einstellungen"</string>
     <string name="account_settings_default_label">"Standardkonto"</string>
     <string name="account_settings_default_summary">"E-Mails standardmäßig von diesem Konto senden"</string>
-    <string name="account_settings_notify_label">"E-Mail-Benachrichtigungen"</string>
+    <string name="account_settings_notify_label">"E-Mail-Benachrichtigung"</string>
     <string name="account_settings_notify_summary">"Bei E-Mail-Eingang Benachrichtigung in der Statusleiste"</string>
     <string name="account_settings_mail_check_frequency_label">"Abrufhäufigkeit"</string>
-    <string name="account_settings_incoming_label">"Einstellungen für eingehende Nachrichten"</string>
-    <string name="account_settings_outgoing_label">"Einstellungen für ausgehende Nachrichten"</string>
-    <string name="account_settings_add_account_label">"Weiteres Konto hinzufügen"</string>
+    <string name="account_settings_incoming_label">"Eingehende Nachrichten"</string>
+    <string name="account_settings_outgoing_label">"Ausgehende Nachrichten"</string>
+    <string name="account_settings_add_account_label">"Konto hinzufügen"</string>
     <string name="account_settings_description_label">"Kontoname"</string>
     <string name="account_settings_name_label">"Ihr Name"</string>
     <string name="account_settings_notifications">"Benachrichtigungseinstellungen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 30f1fd907..2a1e9abdd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"Mensaje guardado como borrador"</string>
     <string name="add_contact_dlg_title">"Añadir contacto"</string>
     <string name="add_contact_dlg_message_fmt">"Añadir \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos"</string>
-    <string name="message_view_display_attachment_toast">"No se puede mostrar este archivo adjunto."</string>
+    <string name="message_view_display_attachment_toast">"No se puede mostrar el archivo adjunto."</string>
     <string name="account_setup_basics_title">"Configurar correo electrónico"</string>
     <string name="account_setup_basics_instructions">"Introduce la dirección de correo electrónico de tu cuenta:"</string>
     <string name="account_setup_basics_email_hint">"Dirección de correo electrónico"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 734d1e65c..558b4c139 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -162,7 +162,7 @@
     <string name="account_settings_default_summary">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_settings_notify_label">"Notifications d\'e-mails"</string>
     <string name="account_settings_notify_summary">"Afficher une notification dans la barre d\'état lors de la réception d\'un e-mail"</string>
-    <string name="account_settings_mail_check_frequency_label">"Fréquence de vérification des e-mails"</string>
+    <string name="account_settings_mail_check_frequency_label">"Fréquence de vérification"</string>
     <string name="account_settings_incoming_label">"Paramètres de réception"</string>
     <string name="account_settings_outgoing_label">"Paramètres d\'envoi"</string>
     <string name="account_settings_add_account_label">"Ajouter un autre compte"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 76743debf..156445902 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"Messaggio salvato come bozza."</string>
     <string name="add_contact_dlg_title">"Aggiungi contatto"</string>
     <string name="add_contact_dlg_message_fmt">"Aggiungi \"<xliff:g id="EMAIL">%s</xliff:g>\" ai contatti"</string>
-    <string name="message_view_display_attachment_toast">"Impossibile visualizzare l\'allegato."</string>
+    <string name="message_view_display_attachment_toast">"Impossibile visualizzare questo allegato."</string>
     <string name="account_setup_basics_title">"Imposta email"</string>
     <string name="account_setup_basics_instructions">"Digita l\'indirizzo email del tuo account:"</string>
     <string name="account_setup_basics_email_hint">"Indirizzo email"</string>
@@ -117,7 +117,7 @@
     <string name="account_setup_incoming_imap_server_label">"Server IMAP"</string>
     <string name="account_setup_incoming_port_label">"Porta"</string>
     <string name="account_setup_incoming_security_label">"Tipo di protezione"</string>
-    <string name="account_setup_incoming_security_none_label">"Nessuno"</string>
+    <string name="account_setup_incoming_security_none_label">"Nessuna"</string>
     <string name="account_setup_incoming_security_ssl_optional_label">"SSL (se disponibile)"</string>
     <string name="account_setup_incoming_security_ssl_label">"SSL (sempre)"</string>
     <string name="account_setup_incoming_security_tls_optional_label">"TLS (se disponibile)"</string>
@@ -125,7 +125,7 @@
     <string name="account_setup_incoming_delete_policy_label">"Elimina email da server"</string>
     <string name="account_setup_incoming_delete_policy_never_label">"Mai"</string>
     <string name="account_setup_incoming_delete_policy_7days_label">"Dopo 7 giorni"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label">"Quando elimino dalla Posta in arrivo"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">"Quando elimino da Posta in arrivo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label">"Prefisso percorso IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint">"Facoltativo"</string>
     <string name="account_setup_outgoing_title">"Impostazioni server posta in uscita"</string>
@@ -163,9 +163,9 @@
     <string name="account_settings_notify_label">"Notifiche email"</string>
     <string name="account_settings_notify_summary">"Notifica sulla barra di stato l\'arrivo di email"</string>
     <string name="account_settings_mail_check_frequency_label">"Frequenza di controllo email"</string>
-    <string name="account_settings_incoming_label">"Impostazioni posta in arrivo"</string>
-    <string name="account_settings_outgoing_label">"Impostazioni posta in uscita"</string>
-    <string name="account_settings_add_account_label">"Aggiungi un altro account"</string>
+    <string name="account_settings_incoming_label">"Impost. posta in arrivo"</string>
+    <string name="account_settings_outgoing_label">"Impost. posta in uscita"</string>
+    <string name="account_settings_add_account_label">"Aggiungi altro account"</string>
     <string name="account_settings_description_label">"Nome account"</string>
     <string name="account_settings_name_label">"Nome"</string>
     <string name="account_settings_notifications">"Impostazioni notifica"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a5c762c73..3ea4feba7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"메일을 임시로 저장했습니다."</string>
     <string name="add_contact_dlg_title">"주소 추가"</string>
     <string name="add_contact_dlg_message_fmt">"주소록에 \'<xliff:g id="EMAIL">%s</xliff:g>\' 추가"</string>
-    <string name="message_view_display_attachment_toast">"이 첨부파일은 표시할 수 없습니다."</string>
+    <string name="message_view_display_attachment_toast">"첨부파일을 표시할 수 없습니다."</string>
     <string name="account_setup_basics_title">"이메일 설정"</string>
     <string name="account_setup_basics_instructions">"계정 이메일 주소 입력:"</string>
     <string name="account_setup_basics_email_hint">"이메일 주소"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0a04cd47c..ef0808724 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,17 +16,17 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"Bijlages van e-mail lezen"</string>
-    <string name="read_attachment_desc">"Staat deze toepassing toe om je E-mail-bijlages te lezen."</string>
+    <string name="read_attachment_desc">"Staat deze toepassing toe om uw E-mail-bijlages te lezen."</string>
     <string name="app_name">"E-mail"</string>
-    <string name="accounts_title">"Je accounts"</string>
+    <string name="accounts_title">"Uw accounts"</string>
     <string name="compose_title">"Opstellen"</string>
     <string name="debug_title">"Foutopsporing"</string>
     <string name="next_action">"Volgende"</string>
     <string name="okay_action">"OK"</string>
     <string name="cancel_action">"Annuleren"</string>
     <string name="send_action">"Verzenden"</string>
-    <string name="reply_action">"Beantwoorden"</string>
-    <string name="reply_all_action">"Allen beantwoorden"</string>
+    <string name="reply_action">"Antwoord"</string>
+    <string name="reply_all_action">"Allen antwoord"</string>
     <string name="delete_action">"Verwijderen"</string>
     <string name="forward_action">"Doorsturen"</string>
     <string name="done_action">"Gereed"</string>
@@ -60,7 +60,7 @@
     <item quantity="other">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
   </plurals>
     <string name="special_mailbox_name_inbox">"Postvak IN"</string>
-    <string name="accounts_welcome">"Welkom bij E-mail instellen."\n\n"Je kunt elke account gebruiken met E-mail."\n\n"De meest populaire e-mailaccounts kunnen in twee stappen worden ingesteld."</string>
+    <string name="accounts_welcome">"Welkom bij E-mail instellen."\n\n"U kunt elk account gebruiken met E-mail."\n\n"De meest populaire e-mailaccounts kunnen in twee stappen worden ingesteld."</string>
     <string name="debug_version_fmt">"Versie: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="debug_enable_debug_logging_label">"Extra logboek voor probleemoplossing bij gevoelige informatie maken?"</string>
     <string name="debug_enable_sensitive_logging_label">"Probleemoplossing bij gevoelige informatie vastleggen? (Mogelijk worden er wachtwoorden weergegeven in de logboeken.)"</string>
@@ -73,7 +73,7 @@
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Oorspronkelijk bericht --------"\n"Onderwerp: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Van: <xliff:g id="SENDER">%s</xliff:g>"\n"Aan: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Geciteerde tekst"</string>
-    <string name="message_compose_error_no_recipients">"Je moet minstens één ontvanger toevoegen."</string>
+    <string name="message_compose_error_no_recipients">"U moet minstens één ontvanger toevoegen."</string>
     <string name="message_compose_attachments_skipped_toast">"Sommige bijlages kunnen niet worden doorgestuurd omdat ze niet zijn gedownload."</string>
     <string name="message_compose_attachment_size">"Bestand is te groot om bij te voegen."</string>
     <string name="message_view_to_label">"Aan:"</string>
@@ -88,34 +88,34 @@
     <string name="message_deleted_toast">"Bericht verwijderd."</string>
     <string name="message_discarded_toast">"Bericht wordt verwijderd"</string>
     <string name="message_saved_toast">"Bericht opgeslagen als concept."</string>
-    <string name="add_contact_dlg_title">"Contactpersoon toevoegen"</string>
-    <string name="add_contact_dlg_message_fmt">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contactpersonen"</string>
-    <string name="message_view_display_attachment_toast">"Deze bijlage kan niet worden verwijderd."</string>
+    <string name="add_contact_dlg_title">"Contact toevoegen"</string>
+    <string name="add_contact_dlg_message_fmt">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contacten"</string>
+    <string name="message_view_display_attachment_toast">"Deze bijlage kan niet worden weergegeven."</string>
     <string name="account_setup_basics_title">"E-mail instellen"</string>
-    <string name="account_setup_basics_instructions">"Typ het e-mailadres van je account:"</string>
+    <string name="account_setup_basics_instructions">"Typ het e-mailadres van uw account:"</string>
     <string name="account_setup_basics_email_hint">"E-mailadres"</string>
     <string name="account_setup_basics_password_hint">"Wachtwoord"</string>
-    <string name="account_setup_basics_default_label">"E-mail standaard vanaf deze account versturen"</string>
+    <string name="account_setup_basics_default_label">"E-mail standaard vanaf dit account versturen"</string>
     <string name="account_setup_basics_manual_setup_action">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast">"Typ een geldig e-mailadres en wachtwoord"</string>
     <string name="account_setup_check_settings_retr_info_msg">"Accountinformatie ophalen..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg">"Serverinstellingen voor binnenkomende e-mail controleren..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg">"Serverinstellingen voor uitgaande e-mail controleren..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg">"Serverinstellingen inkomende e-mail controleren..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">"Serverinstellingen uitgaande e-mail controleren..."</string>
     <string name="account_setup_check_settings_canceling_msg">"Annuleren..."</string>
     <string name="account_setup_names_title">"E-mail instellen"</string>
-    <string name="account_setup_names_instructions">"Je account is ingesteld en er is e-mail onderweg."</string>
-    <string name="account_setup_names_account_name_label">"Geef deze account een naam (optioneel)"</string>
-    <string name="account_setup_names_user_name_label">"Je naam (wordt weergegeven in uitgaande berichten)"</string>
+    <string name="account_setup_names_instructions">"Uw account is ingesteld en er is e-mail onderweg."</string>
+    <string name="account_setup_names_account_name_label">"Geef dit account een naam (optioneel)"</string>
+    <string name="account_setup_names_user_name_label">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
     <string name="account_setup_account_type_title">"Nieuwe e-mailaccount toevoegen"</string>
     <string name="account_setup_account_type_instructions">"Welk type account is dit?"</string>
     <string name="account_setup_account_type_pop_action">"POP3-account"</string>
     <string name="account_setup_account_type_imap_action">"IMAP-account"</string>
-    <string name="account_setup_incoming_title">"Serverinstellingen voor binnenkomende e-mail"</string>
+    <string name="account_setup_incoming_title">"Serverinstellingen inkomende e-mail"</string>
     <string name="account_setup_incoming_username_label">"Gebruikersnaam"</string>
     <string name="account_setup_incoming_password_label">"Wachtwoord"</string>
     <string name="account_setup_incoming_pop_server_label">"POP3-server"</string>
     <string name="account_setup_incoming_imap_server_label">"IMAP-server"</string>
-    <string name="account_setup_incoming_port_label">"Port"</string>
+    <string name="account_setup_incoming_port_label">"Poort"</string>
     <string name="account_setup_incoming_security_label">"Beveiligingstype"</string>
     <string name="account_setup_incoming_security_none_label">"Geen"</string>
     <string name="account_setup_incoming_security_ssl_optional_label">"SSL (indien beschikbaar)"</string>
@@ -128,7 +128,7 @@
     <string name="account_setup_incoming_delete_policy_delete_label">"Als ik verwijder uit mijn Postvak IN"</string>
     <string name="account_setup_incoming_imap_path_prefix_label">"Voorvoegsel IMAP-pad"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint">"Optioneel"</string>
-    <string name="account_setup_outgoing_title">"Serverinstellingen voor uitgaande e-mail"</string>
+    <string name="account_setup_outgoing_title">"Serverinstellingen uitgaande e-mail"</string>
     <string name="account_setup_outgoing_smtp_server_label">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label">"Poort"</string>
     <string name="account_setup_outgoing_security_label">"Beveiligingstype"</string>
@@ -136,14 +136,14 @@
     <string name="account_setup_outgoing_username_label">"Gebruikersnaam"</string>
     <string name="account_setup_outgoing_password_label">"Wachtwoord"</string>
     <string name="account_setup_options_title">"Accountopties"</string>
-    <string name="account_setup_options_mail_check_frequency_label">"Frequentie voor het controleren op nieuwe berichten"</string>
+    <string name="account_setup_options_mail_check_frequency_label">"Frequentie voor controle op nieuwe berichten"</string>
     <string name="account_setup_options_mail_check_frequency_never">"Nooit"</string>
     <string name="account_setup_options_mail_check_frequency_5min">"Elke 5 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_10min">"Elke 10 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_15min">"Elke 15 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_30min">"Elke 30 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_1hour">"Elk uur"</string>
-    <string name="account_setup_options_default_label">"E-mail standaard vanaf deze account versturen"</string>
+    <string name="account_setup_options_default_label">"E-mail standaard vanaf dit account versturen"</string>
     <string name="account_setup_options_notify_label">"Stuur me een melding wanneer er e-mail binnenkomt."</string>
     <string name="account_setup_failed_dlg_title">"Instellen is niet voltooid"</string>
     <string name="account_setup_failed_dlg_auth_message">"Gebruikersnaam of wachtwoord onjuist"</string>
@@ -159,24 +159,24 @@
     <string name="account_setup_failed_dlg_edit_details_action">"Details bewerken"</string>
     <string name="account_settings_title_fmt">"Algemene instellingen"</string>
     <string name="account_settings_default_label">"Standaardaccount"</string>
-    <string name="account_settings_default_summary">"E-mail standaard vanaf deze account versturen"</string>
+    <string name="account_settings_default_summary">"E-mail standaard vanaf dit account versturen"</string>
     <string name="account_settings_notify_label">"Meldingen via e-mail"</string>
-    <string name="account_settings_notify_summary">"Melding in statusbalk wanneer er e-mail binnenkomt"</string>
-    <string name="account_settings_mail_check_frequency_label">"Frequentie voor het controleren op nieuwe e-mail"</string>
-    <string name="account_settings_incoming_label">"Instellingen voor binnenkomende e-mail"</string>
-    <string name="account_settings_outgoing_label">"Instellingen voor uitgaande e-mail"</string>
-    <string name="account_settings_add_account_label">"Nieuwe account toevoegen"</string>
+    <string name="account_settings_notify_summary">"Melding in statusbalk als e-mail binnenkomt"</string>
+    <string name="account_settings_mail_check_frequency_label">"Frequentie voor controle op nieuwe e-mail"</string>
+    <string name="account_settings_incoming_label">"Instellingen inkomende e-mail"</string>
+    <string name="account_settings_outgoing_label">"Instellingen uitgaande e-mail"</string>
+    <string name="account_settings_add_account_label">"Nieuw account toevoegen"</string>
     <string name="account_settings_description_label">"Accountnaam"</string>
-    <string name="account_settings_name_label">"Je naam"</string>
+    <string name="account_settings_name_label">"Uw naam"</string>
     <string name="account_settings_notifications">"Instellingen voor meldingen"</string>
     <string name="account_settings_vibrate_enable">"Trillen"</string>
     <string name="account_settings_vibrate_summary">"Ook trillen bij ontvangst van e-mail"</string>
     <string name="account_settings_ringtone">"Beltoon selecteren"</string>
     <string name="account_settings_servers">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title">"Account verwijderen"</string>
-    <string name="account_delete_dlg_instructions_fmt">"De account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
-    <string name="provider_note_yahoo">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, ga je naar yahoo.com voor meer informatie."</string>
-    <string name="provider_note_yahoo_uk">"Ga voordat je deze e-mailaccount instelt naar de website van Yahoo! en schakel toegang met POP3 in voor deze account."</string>
-    <string name="provider_note_live">"Alleen sommige Plus-accounts hebben POP-toegang waarmee dit programma verbinding kan maken. Als je je niet kunt aanmelden met het juiste e-mailadres en wachtwoord, heb je mogelijk niet betaald voor je Plus-account. Start de webbrowser voor toegang tot deze e-mailaccounts."</string>
-    <string name="provider_note_t_online">"Voordat je deze e-mailaccount instelt, ga je naar de website van T-Online en maak je een wachtwoord voor toegang tot e-mail via POP3."</string>
+    <string name="account_delete_dlg_instructions_fmt">"Het account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
+    <string name="provider_note_yahoo">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, gaat u naar yahoo.com voor meer informatie."</string>
+    <string name="provider_note_yahoo_uk">"Ga voordat u dit e-mailaccount instelt naar de website van Yahoo! en schakel toegang met POP3 in voor dit account."</string>
+    <string name="provider_note_live">"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>
+    <string name="provider_note_t_online">"Voordat u dit e-mailaccount instelt, gaat u naar de website van T-Online en maakt u een wachtwoord voor toegang tot e-mail via POP3."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 24c30d3ab..f68ef751c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,7 +17,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"odczyt załączników w wiadomościach e-mail"</string>
     <string name="read_attachment_desc">"Umożliwia tej aplikacji odczyt załączników poczty e-mail."</string>
-    <string name="app_name">"Poczta e-mail"</string>
+    <string name="app_name">"Poczta"</string>
     <string name="accounts_title">"Twoje konta"</string>
     <string name="compose_title">"Utwórz"</string>
     <string name="debug_title">"Debuguj"</string>
@@ -41,7 +41,7 @@
     <string name="remove_account_action">"Usuń konto"</string>
     <string name="accounts_action">"Konta"</string>
     <string name="mark_as_read_action">"Oznacz jako przeczytane"</string>
-    <string name="mark_as_unread_action">"Oznacz jako nieprzeczytane"</string>
+    <string name="mark_as_unread_action">"Oznacz jako nieprzeczyt."</string>
     <string name="add_cc_bcc_action">"Dodaj DW/UDW"</string>
     <string name="add_attachment_action">"Dodaj załącznik"</string>
     <string name="dump_settings_action">"Zrzut ustawień"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 295a7d0a9..32de2e413 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -90,7 +90,7 @@
     <string name="message_saved_toast">"Письмо сохранено как черновик."</string>
     <string name="add_contact_dlg_title">"Добавить контакт"</string>
     <string name="add_contact_dlg_message_fmt">"Добавить адрес <xliff:g id="EMAIL">%s</xliff:g> в контакты"</string>
-    <string name="message_view_display_attachment_toast">"Не удается показать это приложение."</string>
+    <string name="message_view_display_attachment_toast">"Это вложение нельзя просмотреть."</string>
     <string name="account_setup_basics_title">"Настройка электронной почты"</string>
     <string name="account_setup_basics_instructions">"Укажите почтовый адрес своего аккаунта:"</string>
     <string name="account_setup_basics_email_hint">"Адрес электронной почты"</string>