diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 400f14a20..83048e203 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Maca\'ls tots com a llegits</string>
     <string name="global_settings_confirm_action_send">Envia</string>
 
-    <string name="global_settings_privacy_mode_title">Bloca notificacions</string>
-    <string name="global_settings_privacy_mode_summary">No mostris l’assumpte del missatge a la barra de notificacions quan el telèfon estigui blocat</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -547,6 +549,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (es conservaran el format i les imatges)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -830,6 +835,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Sempre</string>
     <string name="background_ops_enabled">Quan s’està comprovant \'Dades en segon pla\'</string>
     <string name="background_ops_auto_sync">Quan s’està comprovant \'Dades en segon pla\' i \'Auto sincronització\'</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">No s’ha seleccionat cap missatge</string>
 
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 073526546..6a079c649 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -328,8 +328,10 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
     <string name="global_settings_confirm_action_send">Odesílání</string>
 
-    <string name="global_settings_privacy_mode_title">Oznámení při zamčené obrazovce</string>
-    <string name="global_settings_privacy_mode_summary">Nezobrazovat v oznámení předmět zpráv, když je systém zamčen</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -552,6 +554,9 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -835,6 +840,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Vždy</string>
     <string name="background_ops_enabled">Je-li \'Data na pozadí\' zaškrtnuto</string>
     <string name="background_ops_auto_sync">Jsou-li \'Data na pozadí\' a \'Aut. synchronizace\' zaškrtnuty</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Žádná zpráva není vybrána</string>
 
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8b1b6c034..95f91ba9f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Marker alle som læst</string>
     <string name="global_settings_confirm_action_send">Send</string>
 
-    <string name="global_settings_privacy_mode_title">Meddelelse på låst skærm</string>
-    <string name="global_settings_privacy_mode_summary">Vis ikke mailens emne i telefonens statuslinie når systemet er låst</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -548,6 +550,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (billeder og formattering bevares)</string>
     <string name="account_settings_message_format_auto">Automatisk (ren tekst med mindre mail som besvares er i HTML format)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Kvittering for modtagelse</string>
     <string name="account_settings_message_read_receipt_summary">Anmod altid om kvittering for modtagelse</string>
 
@@ -830,6 +835,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Altid</string>
     <string name="background_ops_enabled">Når \"Baggrundsdata\" er aktiveret</string>
     <string name="background_ops_auto_sync">Når \"Baggrundsdata\" &amp; \"Auto-sync\" er aktiveret</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Ingen mail valgt</string>
 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c0f735642..fd2ee6428 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -549,6 +549,9 @@ http://k9mail.googlecode.com/.
     <string name="account_settings_message_format_html">HTML (Bilder und Formatierungen bleiben erhalten)</string>
     <string name="account_settings_message_format_auto">Automatisch (Einfacher Text, es sei denn bei Antwort auf HTML)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Empfangsbestätigung</string>
     <string name="account_settings_message_read_receipt_summary">Immer eine Empfangsbestätigung anfordern</string>
 
@@ -831,6 +834,7 @@ http://k9mail.googlecode.com/.
     <string name="background_ops_always">Immer</string>
     <string name="background_ops_enabled">Wenn \'Hintergrunddaten\' aktiviert ist</string>
     <string name="background_ops_auto_sync">Wenn \'Hintergrunddaten\' &amp; \'Automatische Synchronisation\' aktiviert sind</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Keine Nachricht ausgewählt</string>
 
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3a11c7cc0..e6d9f3a56 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -320,8 +320,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Σήμανση ως αναγνωσμέων</string>
     <string name="global_settings_confirm_action_send">Αποστολή</string>
 
-    <string name="global_settings_privacy_mode_title">Ειδοποιήσεων κλειδώματος οθόνης</string>
-    <string name="global_settings_privacy_mode_summary">Μην προβάλεις το θέμα του μηνύματος στη γραμμή ειδοποιήσεων όταν το σύστημα είνια κλειδωμένο</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -544,6 +546,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (διατηρούνται εικόνες και μορφοποίηση)</string>
     <string name="account_settings_message_format_auto">Αυτόματα (απλό κείμενο εκτός αν απαντά σε μήνυμα HTML)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Απόδειξη ανάγνωσης</string>
     <string name="account_settings_message_read_receipt_summary">Πάντοτε να απαιτείται απόδειξη ανάγνωσης</string>
 
@@ -827,6 +832,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Πάντοτε</string>
     <string name="background_ops_enabled">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\'</string>
     <string name="background_ops_auto_sync">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\' &amp; \'Αυτόματο συγχρονισμός\'</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Δεν επιλέχθηκε μήνυμα</string>
 
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2b02af61a..28e270011 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -322,8 +322,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos como leídos</string>
     <string name="global_settings_confirm_action_send">Enviados</string>
 
-    <string name="global_settings_privacy_mode_title">Bloquear notificaciones</string>
-    <string name="global_settings_privacy_mode_summary">No mostrar asunto del mensaje en la barra de notificaciones cuando el sistema está bloqueado.</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -546,6 +548,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (se mantienen las imágenes y el formato)</string>
     <string name="account_settings_message_format_auto">Automática (texto simple excepto si se responde a un mensaje HTML)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Leer acuse de lectura</string>
     <string name="account_settings_message_read_receipt_summary">Solicitar siempre un acuse de Lectura</string>
 
@@ -827,6 +832,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Siempre</string>
     <string name="background_ops_enabled">Cuando \'Sincronización en segundo plano\' esté activo</string>
     <string name="background_ops_auto_sync">Cuando \'Sincronización en segundo plano\' y \'Sincronización automática\' esten activos</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">No se ha seleccionado ningún mensaje</string>
 
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 229efcc46..3675daa95 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -552,6 +552,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (kuvat ja muotoilu säilytetään)</string>
     <string name="account_settings_message_format_auto">Automaattinen (pelkkä teksti, ellei vastata HTML-viestiin)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Vastaanottokuittaus</string>
     <string name="account_settings_message_read_receipt_summary">Pyydä aina vastaanottokuittaus</string>
 
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 792efd8dd..f34666257 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -346,8 +346,10 @@ de plus</string>
     <string name="global_settings_confirm_action_mark_all_as_read">Marquer tout comme lu</string>
     <string name="global_settings_confirm_action_send">Envoyer</string>
 
-    <string name="global_settings_privacy_mode_title">Notifications confidentielles</string>
-    <string name="global_settings_privacy_mode_summary">Ne pas afficher les sujets des e-mails dans la barre de notification quand le système est verrouillé</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -570,6 +572,9 @@ de plus</string>
     <string name="account_settings_message_format_text">Text brut (formattage et images omis)</string>
     <string name="account_settings_message_format_auto">Automatique (Text brut à moins de répondre à un message HTML)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Accusé de réception</string>
     <string name="account_settings_message_read_receipt_summary">Toujours demander un accusé de réception</string>
 
@@ -853,6 +858,7 @@ de plus</string>
     <string name="background_ops_always">Toujours</string>
     <string name="background_ops_enabled">Lorsque «\u00A0Données en arrière-plan\u00A0» est activé</string>
     <string name="background_ops_auto_sync">Lorsque «\u00A0Données en arrière-plan\u00A0» et «\u00A0Synchronisation auto\u00A0» sont activés</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Aucun message sélectionné</string>
 
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0fe7560b7..cb892564c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -322,8 +322,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos coma lidos</string>
     <string name="global_settings_confirm_action_send">Enviados</string>
 
-    <string name="global_settings_privacy_mode_title">Bloquear notificacións</string>
-    <string name="global_settings_privacy_mode_summary">Non amosar asunto da mensaxe na barra de notificacións cando o sistema está bloqueado.</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -546,6 +548,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (mantéñense imaxes e formato)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -827,6 +832,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Sempre</string>
     <string name="background_ops_enabled">Cando \'Sincronización en segundo plano\' esté activo</string>
     <string name="background_ops_auto_sync">Cando \'Sincronización en segundo plano\' e \'Sincronización automática\' estén activos</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">No foi seleccionada ningunha mensaxe</string>
 
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5eb5cbaa8..2b16b3170 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -322,8 +322,10 @@
     <string name="global_settings_confirm_action_mark_all_as_read">Összes megjelölése olvasottként</string>
     <string name="global_settings_confirm_action_send">Küldés</string>
 
-    <string name="global_settings_privacy_mode_title">Képernyőzár értesítések</string>
-    <string name="global_settings_privacy_mode_summary">Lezárt képernyőnél ne mutassa a levelek tárgyát a állapotsoron</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -545,6 +547,9 @@
     <string name="account_settings_message_format_html">HTML (képekkel és formázással)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -824,6 +829,7 @@
     <string name="background_ops_always">Mindig</string>
     <string name="background_ops_enabled">"Ha a 'Háttéradatok' bekapcsolva"</string>
     <string name="background_ops_auto_sync">"Ha a 'Háttéradatok' és 'Auto-szink' bekapcsolva"</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Nincs levél kiválasztva</string>
 
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4238e2823..858132dd4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Segna tutti come già letti</string>
     <string name="global_settings_confirm_action_send">Invia</string>
 
-    <string name="global_settings_privacy_mode_title">Notifiche con blocco dello schermo</string>
-    <string name="global_settings_privacy_mode_summary">Non visualizzare l\'oggetto del messaggio nella barra di notifica quando il sistema è bloccato</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -548,6 +550,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (immagini e formattazione verranno preservate)</string>
     <string name="account_settings_message_format_auto">Automatico (A meno che si risponda a un testo HTML)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Notifica di lettura</string>
     <string name="account_settings_message_read_receipt_summary">Richiedi sempre la notifica di lettura</string>
 
@@ -831,6 +836,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Sempre</string>
     <string name="background_ops_enabled">Quando \'Dati in background\' è selezionato</string>
     <string name="background_ops_auto_sync">Quando \'Dati in background\' &amp; \'Sincronizzazione automatica\' sono selezionati</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Nessun messaggio selezionato</string>
 
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 95a638c00..6fce7846d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">סמן הכל כנקרא</string>
     <string name="global_settings_confirm_action_send">שלח</string>
 
-    <string name="global_settings_privacy_mode_title">התראות במסך נעול</string>
-    <string name="global_settings_privacy_mode_summary">אל תציג את נושא ההודעה בשורת ההתראות כאשר המערכת נעולה</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -548,6 +550,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (תמונות ועיצוב נשמרים)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">אישור קריאה</string>
     <string name="account_settings_message_read_receipt_summary">תמיד בקש אישור קריאה</string>
 
@@ -842,6 +847,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">תמיד</string>
     <string name="background_ops_enabled">"מתי ש\'נתונים ברקע\' מסומן "</string>
     <string name="background_ops_auto_sync">"מתי ש\'נתונים ברקע\' ו\'סינכרון אוטומטי\' מסומנים "</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">לא נבחרו הודעות</string>
 
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4a5dfcce2..8ca85aba6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -322,8 +322,10 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="global_settings_confirm_action_mark_all_as_read">すべて既読にする</string>
     <string name="global_settings_confirm_action_send">送信</string>
 
-    <string name="global_settings_privacy_mode_title">スクリーンロック時の通知</string>
-    <string name="global_settings_privacy_mode_summary">システムがロックされているときは通知バーにメッセージの表題を表示しない</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -546,6 +548,9 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_settings_message_format_html">HTML (画像や書式を保持)</string>
     <string name="account_settings_message_format_auto">自動 (HTMLメールに対する返信でなければテキスト)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">開封確認</string>
     <string name="account_settings_message_read_receipt_summary">常に開封確認を要求する</string>
 
@@ -824,6 +829,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="background_ops_always">常時利用</string>
     <string name="background_ops_enabled">バックグランドデータがチェックされた時</string>
     <string name="background_ops_auto_sync">バックグランドデータと自動同期がチェックされた時</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">メッセージが選択されていません</string>
 
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f3ad397e6..7bf3ea9fb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -322,8 +322,10 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="global_settings_confirm_action_mark_all_as_read">모든 편지를 읽음으로 표시</string>
     <string name="global_settings_confirm_action_send">보내기</string>
 
-    <string name="global_settings_privacy_mode_title">잠긴화면에서 알림</string>
-    <string name="global_settings_privacy_mode_summary">화면이 잠겨있을경우 메시지 수신시 제목을 화면에 보여주지 않습니다.</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -546,6 +548,9 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="account_settings_message_format_html">HTML (이미지와 꾸밈format이 보존됩니다)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -827,6 +832,7 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="background_ops_always">항상</string>
     <string name="background_ops_enabled">\'백그라운드 데이타\'가 선택된 경우</string>
     <string name="background_ops_auto_sync">\'백그라운드 데이타\'와 \'Auto-sync\'가 선택된 경우</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">선택된 메시지가 없습니다.</string>
 
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 477ecef4a..87dcd1139 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -322,8 +322,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Markeer alles als gelezen</string>
     <string name="global_settings_confirm_action_send">Verzonden</string>
 
-    <string name="global_settings_privacy_mode_title">Lock-screen meldingen</string>
-    <string name="global_settings_privacy_mode_summary">Niet weergegeven onderwerp van het bericht in de notificatie bar als het systeem is vergrendeld</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -546,6 +548,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (plaatjes en formattering blijven behouden)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -826,6 +831,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Altijd</string>
     <string name="background_ops_enabled">Wanneer \'Achtergrond data\' is aangevinkt</string>
     <string name="background_ops_auto_sync">Wanneer \'Achtergrond data\' &amp; \'Auto-sync\' zijn aangevinkt</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Geen bericht geselecteerd</string>
 
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cd1632b03..67c03d756 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -330,8 +330,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
     <string name="global_settings_confirm_action_send">Wyślij</string>
 
-    <string name="global_settings_privacy_mode_title">Powiadomienia ekranowe przy zablokowanym ekranie</string>
-    <string name="global_settings_privacy_mode_summary">Nie pokazuj tematu wiadomości w pasku powiadomień, gdy ekran jest zablokowany</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -554,6 +556,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (z obrazkami i formatowaniem)</string>
     <string name="account_settings_message_format_auto">Automatycznie (czysty tekst, chyba że odpoiwadasz na wiadomość HTML)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Potwierdzenie przeczytania</string>
     <string name="account_settings_message_read_receipt_summary">Zawsze wymagaj potwierdzenia o przeczytaniu</string>
 
@@ -859,6 +864,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Zawsze</string>
     <string name="background_ops_enabled">Gdy systemowa opcja \'Dane w tle\' jest włączone</string>
     <string name="background_ops_auto_sync">Gdy systemowe opcje \'Dane w tle\' oraz \'Autosynchronizacja\' są włączone</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Nie wybrano wiadomości</string>
 
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index fc67e2a5d..af2a2236d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -320,8 +320,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Marcar todas como lidas</string>
     <string name="global_settings_confirm_action_send">Enviar</string>
 
-    <string name="global_settings_privacy_mode_title">Notificações de bloqueio de tela</string>
-    <string name="global_settings_privacy_mode_summary">Não mostrar assunto da mensagem na barra de status do sistema quando estiver bloqueado</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -544,6 +546,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (imagens e formatação serão preservadas)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Confirmação de leitura</string>
     <string name="account_settings_message_read_receipt_summary">Sempre solicitar confirmação de leitura</string>
 
@@ -826,6 +831,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Sempre</string>
     <string name="background_ops_enabled">Quando \'Dados de segundo plado\' estiver checado</string>
     <string name="background_ops_auto_sync">Quando \'Dados de segundo plano\' &amp; \'Auto-sinc\' estiverem checados</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Nenhuma mensagem selecionada</string>
 
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8eb8df1a7..aeb02f562 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -318,8 +318,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Пометить как прочитанное</string>
     <string name="global_settings_confirm_action_send">Послать</string>
 
-    <string name="global_settings_privacy_mode_title">Уведомления при заблокированном экране</string>
-    <string name="global_settings_privacy_mode_summary">Не показывать тему письма в уведомлениях, когда система заблокирована</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -542,6 +544,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (сохранять изображения и форматирование)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Уведомление о прочтении</string>
     <string name="account_settings_message_read_receipt_summary">Всегда запрашивать уведомление о прочтении</string>
 
@@ -823,6 +828,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Всегда</string>
     <string name="background_ops_enabled">Когда \'Фоновый режим\' включен</string>
     <string name="background_ops_auto_sync">Когда \'Фоновые данные\' и \'Автосинхронизация\' включены</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Никаких сообщшний не выбранно</string>
 
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 24d84162b..c5d47ca9f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/
     <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
     <string name="global_settings_confirm_action_send">Skicka</string>
 
-    <string name="global_settings_privacy_mode_title">Privatläge</string>
-    <string name="global_settings_privacy_mode_summary">Visa inte e-postens ämnen i notifieringsytan när systemet är låst</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -548,6 +550,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (bilder och formatering behålls)</string>
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>-->
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
 
@@ -830,6 +835,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Alltid</string>
     <string name="background_ops_enabled">När \'Bakgrundsdata\' är aktiverad</string>
     <string name="background_ops_auto_sync">När \'Bakgrundsdata\' &amp; \'Auto-sync\' är aktiverade</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Inget brev valt</string>
 
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0a8da2d51..418b8e55b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="global_settings_confirm_action_mark_all_as_read">Hepsini okundu olarak işaretle</string>
     <string name="global_settings_confirm_action_send">Gönder</string>
 
-    <string name="global_settings_privacy_mode_title">Ekran-kilidi bildirimleri</string>
-    <string name="global_settings_privacy_mode_summary">Sistem kilitlendiğinde bildirim çubuğunda mesaj konusunu gösterme</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <string name="global_settings_batch_buttons">Toplu işlem düğmeleri</string>
     <string name="global_settings_batch_buttons_summary">Mesaj listesi toplu mesaj düğmelerini yapılandır</string>
@@ -548,6 +550,9 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="account_settings_message_format_html">HTML (resimler ve biçimler korunacak)</string>
     <string name="account_settings_message_format_auto">Otomatik (HTML mesajına yanıt verilmiyorsa düz metin)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Okundu raporu</string>
     <string name="account_settings_message_read_receipt_summary">Daima bir okuma raporu iste</string>
 
@@ -831,6 +836,7 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="background_ops_always">Daima</string>
     <string name="background_ops_enabled">\'Arkaplan verisi\' işaretli olduğu zaman</string>
     <string name="background_ops_auto_sync">\'Arkaplan verisi\' &amp; \'Oto. Senk.\' işaretli olduğu zaman</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Mesaj Seçilmedi</string>
 
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b3b63245c..524a72f7a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -324,8 +324,10 @@ http://k9mail.googlecode.com/
     <string name="global_settings_confirm_action_mark_all_as_read">Відмітити усі як прочитані</string>
     <string name="global_settings_confirm_action_send">Надіслати</string>
 
-    <string name="global_settings_privacy_mode_title">Повідомлення при заблокованому екрані</string>
-    <string name="global_settings_privacy_mode_summary">Не відображати тему повідомлення в рядку сповіщень, коли система заблокована</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <string name="global_settings_batch_buttons">Групові кнопки</string>
     <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>
@@ -548,6 +550,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (зберігати зображення та форматування)</string>
     <string name="account_settings_message_format_auto">Автоматичний (plain text unless replying to an HTML message)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">Повідомлення про прочитання</string>
     <string name="account_settings_message_read_receipt_summary">Завжди запитувати повідомлення про прочитання</string>
 
@@ -829,6 +834,7 @@ http://k9mail.googlecode.com/
     <string name="background_ops_always">Завжди</string>
     <string name="background_ops_enabled">Коли \'Фонові дані\' включено</string>
     <string name="background_ops_auto_sync">Коли \'Фонові дані\' та \'Автосинхронізація\' включено</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Жодних повідомлень не вибрано</string>
 
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eecd0d0c4..3fee570f8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -316,8 +316,10 @@
     <string name="global_settings_confirm_action_mark_all_as_read">全部标记为已读</string>
     <string name="global_settings_confirm_action_send">发送</string>
 
-    <string name="global_settings_privacy_mode_title">锁屏通知</string>
-    <string name="global_settings_privacy_mode_summary">屏幕锁定时不要在通知栏中显示邮件主题</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
     <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
@@ -540,6 +542,9 @@
     <string name="account_settings_message_format_html">HTML（图片和排版将被保留）</string>
     <string name="account_settings_message_format_auto">自动（纯文本，除非是在回复HTML邮件）</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">已读回执</string>
     <string name="account_settings_message_read_receipt_summary">总是要求已读回执</string>
 
@@ -818,6 +823,7 @@
     <string name="background_ops_always">总是</string>
     <string name="background_ops_enabled">当“后台数据”被选中</string>
     <string name="background_ops_auto_sync">当“后台数据”&amp;“自动同步”被选中</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">没有选择任何邮件</string>
 
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9fc374532..83072decb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -316,8 +316,10 @@
     <string name="global_settings_confirm_action_mark_all_as_read">全部標示為已讀取</string>
     <string name="global_settings_confirm_action_send">寄送</string>
 
-    <string name="global_settings_privacy_mode_title">手機上鎖通知</string>
-    <string name="global_settings_privacy_mode_summary">手機上鎖時不要在通知欄中顯示郵件主題</string>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_never">Never</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>-->
+    <!-- NEW: <string name="global_settings_notification_hide_subject_always">Always</string>-->
 
     <string name="global_settings_batch_buttons">批次按鈕</string>
     <string name="global_settings_batch_buttons_summary">批次配置訊息列表按鈕</string>
@@ -540,6 +542,9 @@
     <string name="account_settings_message_format_html">HTML (圖片與格式編排會被保留)</string>
     <string name="account_settings_message_format_auto">自動 (除非回覆HTML格式信件，否則以純文字處理)</string>
 
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>-->
+    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary">Always show the CC/BCC text input fields</string>-->
+
     <string name="account_settings_message_read_receipt_label">讀取回條</string>
     <string name="account_settings_message_read_receipt_summary">永遠要求讀取回條</string>
 
@@ -836,6 +841,7 @@
     <string name="background_ops_always">預設</string>
     <string name="background_ops_enabled">當「背景資料」被勾選</string>
     <string name="background_ops_auto_sync">當「背景資料」&amp;「自動同步」被勾選</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">沒有選擇任何郵件</string>