Merge commit '4.301' into issue-162-new

Conflicts:
	AndroidManifest.xml
	res/values-fi/strings.xml
	res/values-it/strings.xml
	src/com/fsck/k9/activity/MessageList.java

.classpath

@@ -3,12 +3,12 @@
 	<classpathentry excluding="**/.svn/**|.svn/**" kind="src" path="src"/>
 	<classpathentry excluding="**/.svn/**|.svn/**" kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="lib" path="libs/apache-mime4j-core-0.7-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/apache-mime4j-dom-0.7-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
 	<classpathentry kind="lib" path="libs/jzlib-1.0.7.jar"/>
 	<classpathentry kind="lib" path="libs/jutf7-1.0.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="libs/htmlcleaner-2.2.jar"/>
+	<classpathentry kind="lib" path="libs/apache-mime4j-core-0.7.2.jar"/>
+	<classpathentry kind="lib" path="libs/apache-mime4j-dom-0.7.2.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="16021"
+    android:versionCode="17001"
-    android:versionName="4.191" package="com.fsck.k9"
+    android:versionName="4.301" package="com.fsck.k9"
     >
     <uses-sdk
        android:minSdkVersion="7"

k9mail.ipr

@@ -440,10 +440,10 @@
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/libs/jutf7-1.0.1-SNAPSHOT.jar!/" />
         <root url="jar://$PROJECT_DIR$/libs/commons-io-2.0.1.jar!/" />
-        <root url="jar://$PROJECT_DIR$/libs/apache-mime4j-dom-0.7-SNAPSHOT.jar!/" />
         <root url="jar://$PROJECT_DIR$/libs/jzlib-1.0.7.jar!/" />
-        <root url="jar://$PROJECT_DIR$/libs/apache-mime4j-core-0.7-SNAPSHOT.jar!/" />
         <root url="jar://$PROJECT_DIR$/libs/htmlcleaner-2.2.jar!/" />
+        <root url="jar://$PROJECT_DIR$/libs/apache-mime4j-core-0.7.2.jar!/" />
+        <root url="jar://$PROJECT_DIR$/libs/apache-mime4j-dom-0.7.2.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>-->
 
@@ -820,8 +825,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Disposició sola columna</string>
     <string name="settings_messageview_mobile_layout_summary">Reformata missatges HTML missatges per a pantalles petites</string>
-    <string name="settings_messageview_zoom_controls_label">Controls zoom sistema</string>
-    <string name="settings_messageview_zoom_controls_summary">Habilita ginys de zoom or pica sobre el zoom si el teu aparell ho permet</string>
 
     <string name="setting_language_system">Per defecte del sistema</string>
 
@@ -830,6 +833,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>-->
 
@@ -825,8 +830,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Jednosloupcové uspořádání</string>
     <string name="settings_messageview_mobile_layout_summary">Přeformátovat HTML zprávy pro menší obrazovky</string>
-    <string name="settings_messageview_zoom_controls_label">Systémové ovládání zvětšování</string>
-    <string name="settings_messageview_zoom_controls_summary">Povolit zvětšovací doplňky nebo zvětšování štípnutím, pokud to zařízení podporuje</string>
 
     <string name="setting_language_system">Systémový výchozí</string>
 
@@ -835,6 +838,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -820,8 +825,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Enkelkolonne layout</string>
     <string name="settings_messageview_mobile_layout_summary">Reformater HTML meddelelser til visning på små skærme</string>
-    <string name="settings_messageview_zoom_controls_label">Zoom kontrol</string>
-    <string name="settings_messageview_zoom_controls_summary">Aktiver zoom widgets eller pinch-zoom hvis din enhed understøtter dette</string>
 
     <string name="setting_language_system">System standard</string>
 
@@ -830,6 +833,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>
 

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>
 
+    <string name="account_settings_always_show_cc_bcc_label">CC/BCC immer anzeigen</string>
+    <string name="account_settings_always_show_cc_bcc_summary">Zeige die CC/BCC-Texteingabefelder immer an</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>
 
@@ -821,8 +824,6 @@ http://k9mail.googlecode.com/.
 
     <string name="settings_messageview_mobile_layout_label">Einfaches Layout</string>
     <string name="settings_messageview_mobile_layout_summary">HTML-Nachrichten werden für kleine Displays optimiert</string>
-    <string name="settings_messageview_zoom_controls_label">System Zoom</string>
-    <string name="settings_messageview_zoom_controls_summary">Aktiviere Zoom-Widgets oder 2-Finger-Zoom, wenn vom Gerät unterstützt</string>
 
     <string name="setting_language_system">Systemvorgabe</string>
 
@@ -831,6 +832,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>
+    <string name="background_ops_auto_sync_only">Wenn \'Automatische Synchronisation\' aktiviert ist</string>
 
     <string name="no_message_seletected_toast">Keine Nachricht ausgewählt</string>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">Μην προβάλεις το θέμα του μηνύματος στη γραμμή ειδοποιήσεων όταν το σύστημα είνια κλειδωμένο</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>
 
@@ -817,8 +822,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Μονόστηλη διάταξη</string>
     <string name="settings_messageview_mobile_layout_summary">Μηνύματα HTML για μικρότερες οθόνες</string>
-    <string name="settings_messageview_zoom_controls_label">Έλεγχος μεγέθυνσης</string>
-    <string name="settings_messageview_zoom_controls_summary">Χειριστήρια μεγέθυνσης</string>
 
     <string name="setting_language_system">Εξ ορισμού του συστήματος</string>
 
@@ -827,6 +830,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -817,8 +822,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Única Columna</string>
     <string name="settings_messageview_mobile_layout_summary">Ajusta mensajes HTML para pantallas pequeñas</string>
-    <string name="settings_messageview_zoom_controls_label">Controles del Zoom por sistema</string>
-    <string name="settings_messageview_zoom_controls_summary">Permitir opciones de zoom que soporta el propio dispositivo</string>
 
     <string name="setting_language_system">Configurado en el sistema</string>
 
@@ -827,6 +830,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>
 

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>
 
+    <string name="account_settings_always_show_cc_bcc_label">Näytä aina Kopio/Piilokopio</string>
+    <string name="account_settings_always_show_cc_bcc_summary">Näytä aina Kopio/Piilokopio-tekstinsyöttökentät</string>
+
     <string name="account_settings_message_read_receipt_label">Vastaanottokuittaus</string>
     <string name="account_settings_message_read_receipt_summary">Pyydä aina vastaanottokuittaus</string>
 
@@ -825,6 +828,7 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Yhden sarakkeen asettelu</string>
     <string name="settings_messageview_mobile_layout_summary">Uudelleenmuotoile HTML-viestit pienemälle näytölle</string>
+
     <string name="settings_messageview_zoom_controls_label">Järjestelmän zoomaussäätimet</string>
     <string name="settings_messageview_zoom_controls_summary">Ota käyttöön vimpaimen zoomaus tai zoomaus nipistämällä, jos laite tukee</string>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -843,8 +848,6 @@ de plus</string>
 
     <string name="settings_messageview_mobile_layout_label">Disposition colonne unique</string>
     <string name="settings_messageview_mobile_layout_summary">Réarranger les messages HTML pour les petits écrans</string>
-    <string name="settings_messageview_zoom_controls_label">Zoom système</string>
-    <string name="settings_messageview_zoom_controls_summary">Activer les widgets zoom ou le pincer-zoomer si supporté par le système</string>
 
     <string name="setting_language_system">Langue du système</string>
 
@@ -853,6 +856,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>-->
 
@@ -817,8 +822,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Columna única</string>
     <string name="settings_messageview_mobile_layout_summary">Reformatea mensaxes HTML para pantallas pequenas</string>
-    <string name="settings_messageview_zoom_controls_label">Controles do Zoom por sistema</string>
-    <string name="settings_messageview_zoom_controls_summary">Permitir opcións de zoom que soporta o propio dispositivo</string>
 
     <string name="setting_language_system">Configurado no sistema</string>
 
@@ -827,6 +830,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>-->
 
@@ -814,8 +819,6 @@
 
     <string name="settings_messageview_mobile_layout_label">Egy oszlopos elrendezés</string>
     <string name="settings_messageview_mobile_layout_summary">HTML üzenetek újraformázása a kisebb kijelzőkhöz.</string>
-    <string name="settings_messageview_zoom_controls_label">Rendszer nagyító használta</string>
-    <string name="settings_messageview_zoom_controls_summary">Engedélyezi a multi touch nagyítást és a nagyító widgeteket.</string>
 
     <string name="setting_language_system">Alapértelmezett</string>
 
@@ -824,6 +827,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -821,8 +826,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Layout a colonna singola</string>
     <string name="settings_messageview_mobile_layout_summary">Riformatta i messaggi HTML per schermi più piccoli</string>
-    <string name="settings_messageview_zoom_controls_label">Zoom di sistema</string>
-    <string name="settings_messageview_zoom_controls_summary">Abilita widgets dello zoom o pinch-zoom se il dispositivo lo supporta</string>
 
     <string name="setting_language_system">Impostazioni predefinite di sistema</string>
 
@@ -831,6 +834,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">אל תציג את נושא ההודעה בשורת ההתראות כאשר המערכת נעולה</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>
 
@@ -832,8 +837,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">פריסת עמודה יחידה</string>
     <string name="settings_messageview_mobile_layout_summary">אתחל הודעות HTML ותתאים אותם למסכים קטנים.</string>
-    <string name="settings_messageview_zoom_controls_label">בקרת זום מערכת</string>
-    <string name="settings_messageview_zoom_controls_summary">אפשר ווידג\'טי זום או זום על ידי צביטה אם המכשיר שלך תומך בזה</string>
 
     <string name="setting_language_system">ברירות מחדל מערכת</string>
 
@@ -842,6 +845,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>
 

res/values-ja/strings.xml

@@ -277,7 +277,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="message_view_fetching_attachment_toast">添付ファイル取得中</string>
     <string name="message_view_no_viewer"><xliff:g id="mimetype">%s</xliff:g>のビューワーが見つかりません</string>
     <string name="message_view_download_remainder">すべてダウンロード</string>
-    <!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
+    <string name="message_view_downloading">ダウンロード中…</string>
 
     <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
     <string name="message_additional_headers_not_downloaded">一部のヘッダしか保存されていません。ヘッダをすべて保存するためには、アカウント設定の受信メールサーバ設定で「ヘッダのダウンロード」をチェックしてください。</string>
@@ -322,18 +322,20 @@ 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_notification_hide_subject_title">通知時にメールの題名を隠すか</string>
-    <string name="global_settings_privacy_mode_summary">システムがロックされているときは通知バーにメッセージの表題を表示しない</string>
+    <string name="global_settings_notification_hide_subject_never">常に表示する</string>
+    <string name="global_settings_notification_hide_subject_when_locked">ロック時のみ隠す</string>
+    <string name="global_settings_notification_hide_subject_always">常に隠す</string>
 
-    <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
+    <string name="global_settings_batch_buttons">一括処理ボタン</string>
-    <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
+    <string name="global_settings_batch_buttons_summary">メッセージ選択時に表示する一括処理ボタンを設定する</string>
-    <!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
+    <string name="global_settings_mark_read">既読/未読のマーク</string>
-    <!-- NEW: <string name="global_settings_delete">Delete</string>-->
+    <string name="global_settings_delete">削除</string>
-    <!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
+    <string name="global_settings_archive">アーカイブ</string>
-    <!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
+    <string name="global_settings_archive_disabled_reason">アーカイブフォルダが設定されていません</string>
-    <!-- NEW: <string name="global_settings_move">Move</string>-->
+    <string name="global_settings_move">移動</string>
-    <!-- NEW: <string name="global_settings_flag">Flag</string>-->
+    <string name="global_settings_flag">スター</string>
-    <!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
+    <string name="global_settings_unselect">選択解除</string>
 
     <string name="quiet_time">夜間時間帯</string>
     <string name="quiet_time_description">夜間での各種通知や表示を抑制する時間帯を設定</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>
 
+    <string name="account_settings_always_show_cc_bcc_label">CC/BCCを常に表示</string>
+    <string name="account_settings_always_show_cc_bcc_summary">CC/BCCの入力欄を常に表示する</string>
+
     <string name="account_settings_message_read_receipt_label">開封確認</string>
     <string name="account_settings_message_read_receipt_summary">常に開封確認を要求する</string>
 
@@ -814,8 +819,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="settings_messageview_mobile_layout_label">１列レイアウト</string>
     <string name="settings_messageview_mobile_layout_summary">小さい画面用にHTMLメッセージを再構成</string>
-    <string name="settings_messageview_zoom_controls_label">ズーム制御</string>
-    <string name="settings_messageview_zoom_controls_summary">デバイスが対応するならば、ズームウィジェットやピンチズームを有効にする</string>
 
     <string name="setting_language_system">システム設定</string>
 
@@ -824,6 +827,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>
+    <string name="background_ops_auto_sync_only">自動同期がチェックされた時</string>
 
     <string name="no_message_seletected_toast">メッセージが選択されていません</string>
 
@@ -1071,7 +1075,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="import_dialog_error_title">ファイルマネージャがありません</string>
     <string name="close">閉じる</string>
 
-    <!-- NEW: <string name="webview_empty_message">No text</string>-->
+    <string name="webview_empty_message">No text</string>
 
     <string name="webview_contextmenu_link_view_action">開く</string>
     <string name="webview_contextmenu_link_share_action">リンクを共有</string>

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">화면이 잠겨있을경우 메시지 수신시 제목을 화면에 보여주지 않습니다.</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>-->
 
@@ -817,8 +822,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
 
     <string name="settings_messageview_mobile_layout_label">Single-column layout</string>
     <string name="settings_messageview_mobile_layout_summary">작은 스크린에서 HTML 메시지를 다시만듬(reformat)</string>
-    <string name="settings_messageview_zoom_controls_label">시스템 줌 컨트롤</string>
-    <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
 
     <string name="setting_language_system">시스템 기본값</string>
 
@@ -827,6 +830,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>-->
 
@@ -816,8 +821,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">1-kolom layout</string>
     <string name="settings_messageview_mobile_layout_summary">Herschik HTML berichten voor kleinere schermen</string>
-    <string name="settings_messageview_zoom_controls_label">Apparaat zoom</string>
-    <string name="settings_messageview_zoom_controls_summary">Gebruik zoom widgets of pinch-zoom als het apparaat dat ondersteunt</string>
 
     <string name="setting_language_system">Volgens systeem</string>
 
@@ -826,6 +829,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -849,8 +854,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Ułożenie z 1 kolumną</string>
     <string name="settings_messageview_mobile_layout_summary">Przeformatuj wiadomości HTML dla mniejszych ekranów</string>
-    <string name="settings_messageview_zoom_controls_label">Systemowe powiększenie</string>
-    <string name="settings_messageview_zoom_controls_summary">Użyj zoom widgets i pinch-zoom jeśli Twoje urzędzenie je obsługuje</string>  <!-- FIXME -->
 
     <string name="setting_language_system">Domyślny systemowy</string>
 
@@ -859,6 +862,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -816,8 +821,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Layout de coluna única</string>
     <string name="settings_messageview_mobile_layout_summary">Formatar o HTML de mensagens para telas pequenas</string>
-    <string name="settings_messageview_zoom_controls_label">Controle de zoom do sistema</string>
-    <string name="settings_messageview_zoom_controls_summary">Habilitar widgets de zoom se o telefone suportar</string>
 
     <string name="setting_language_system">Padrões de sistema</string>
 
@@ -826,6 +829,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">Не показывать тему письма в уведомлениях, когда система заблокирована</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>
 
@@ -813,8 +818,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Режим одной колонки</string>
     <string name="settings_messageview_mobile_layout_summary">Форматировать HTML сообщения для маленького экрана</string>
-    <string name="settings_messageview_zoom_controls_label">Системное управление зумом</string>
-    <string name="settings_messageview_zoom_controls_summary">Разрешить использование зума, если устройство его поддерживает</string>
 
     <string name="setting_language_system">По умолчанию</string>
 
@@ -823,6 +826,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>-->
 
@@ -820,8 +825,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">En-kolumns-layout</string>
     <string name="settings_messageview_mobile_layout_summary">Formatera om HTML-brev för mindre skärmar</string>
-    <string name="settings_messageview_zoom_controls_label">Kontroll av zoom</string>
-    <string name="settings_messageview_zoom_controls_summary">Aktivera zoom-widgets eller nyp-zoom om din enhet stödjer det</string>
 
     <string name="setting_language_system">Systemstandard</string>
 
@@ -830,6 +833,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</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_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>
 
@@ -821,8 +826,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
 
     <string name="settings_messageview_mobile_layout_label">Tek sütun düzeni</string>
     <string name="settings_messageview_mobile_layout_summary">Daha küçük ekranlar için HTML mesajları yeniden biçimlendir</string>
-    <string name="settings_messageview_zoom_controls_label">Sistem yakınlaştırma kontrolleri</string>
-    <string name="settings_messageview_zoom_controls_summary">Yakınlaştırma araçlarını veya cihazınız onu destekliyorsa pinch-zoom\'u etkinleştir</string>
 
     <string name="setting_language_system">Sistem Varsayılanları</string>
 
@@ -831,6 +834,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">Не відображати тему повідомлення в рядку сповіщень, коли система заблокована</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>
 
@@ -819,8 +824,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">режим одного стовпця</string>
     <string name="settings_messageview_mobile_layout_summary">Форматування HTML повідомлення для маленького екрану</string>
-    <string name="settings_messageview_zoom_controls_label">Системне управління масштабом</string>
-    <string name="settings_messageview_zoom_controls_summary">Включити віджети масштабування або pinch-zoom якщо пристрій їх підтримує</string>
 
     <string name="setting_language_system">Системна по замовчуванню</string>
 
@@ -829,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">Коли \'Фонові дані\' та \'Автосинхронізація\' включено</string>
+    <!-- NEW: <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>-->
 
     <string name="no_message_seletected_toast">Жодних повідомлень не вибрано</string>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">屏幕锁定时不要在通知栏中显示邮件主题</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>
 
@@ -808,8 +813,6 @@
 
     <string name="settings_messageview_mobile_layout_label">单列布局</string>
     <string name="settings_messageview_mobile_layout_summary">为小屏幕重新布局HTML邮件</string>
-    <string name="settings_messageview_zoom_controls_label">系统放大控制</string>
-    <string name="settings_messageview_zoom_controls_summary">如果设备支持则启用放大插件或多点触摸放大</string>
 
     <string name="setting_language_system">系统默认值</string>
 
@@ -818,6 +821,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>
 

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>
+    <!-- NEW: <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>-->
-    <string name="global_settings_privacy_mode_summary">手機上鎖時不要在通知欄中顯示郵件主題</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>
 
@@ -826,8 +831,6 @@
 
     <string name="settings_messageview_mobile_layout_label">單列佈局</string>
     <string name="settings_messageview_mobile_layout_summary">針對小尺寸螢幕重新排列HTML郵件格式</string>
-    <string name="settings_messageview_zoom_controls_label">系統放大控制</string>
-    <string name="settings_messageview_zoom_controls_summary">如果設備支援則啟用放大插件或多點觸碰放大</string>
 
     <string name="setting_language_system">系統預設值</string>
 
@@ -836,6 +839,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>
 

res/values/strings.xml

@@ -566,6 +566,9 @@ http://k9mail.googlecode.com/
     <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>
     <string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>
 
+    <string name="account_settings_always_show_cc_bcc_label">Always show CC/BCC</string>
+    <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">Read receipt</string>
     <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>
 
@@ -842,8 +845,6 @@ http://k9mail.googlecode.com/
 
     <string name="settings_messageview_mobile_layout_label">Single-column layout</string>
     <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>
-    <string name="settings_messageview_zoom_controls_label">System zoom controls</string>
-    <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
 
     <string name="setting_language_system">System default</string>
 

res/xml/account_settings_preferences.xml

@@ -237,6 +237,12 @@
             android:entries="@array/account_settings_message_format_entries"
             android:entryValues="@array/account_settings_message_format_values" />
 
+        <CheckBoxPreference
+            android:persistent="false"
+            android:key="always_show_cc_bcc"
+            android:title="@string/account_settings_always_show_cc_bcc_label"
+            android:summary="@string/account_settings_always_show_cc_bcc_summary" />
+
         <CheckBoxPreference
         android:persistent="false"
         android:key="message_read_receipt"

res/xml/global_preferences.xml

@@ -232,12 +232,6 @@
             android:title="@string/global_settings_messageview_show_next_label"
             android:summary="@string/global_settings_messageview_show_next_summary" />
 
-        <CheckBoxPreference
-            android:persistent="false"
-            android:key="messageview_zoom_controls"
-            android:title="@string/settings_messageview_zoom_controls_label"
-            android:summary="@string/settings_messageview_zoom_controls_summary" />
-
         <com.fsck.k9.preferences.CheckBoxListPreference
             android:persistent="false"
             android:key="confirm_actions"

src/android/webkit/WebViewClassic.java

@@ -0,0 +1,14 @@
+package android.webkit;
+
+import android.view.View;
+
+/**
+ * Trojan class for getting access to a hidden API level 16 interface
+ */
+public class WebViewClassic {
+    public interface TitleBarDelegate {
+        int getTitleHeight();
+
+        public void onSetEmbeddedTitleBar(final View title);
+    }
+}

src/com/fsck/k9/Account.java

@@ -189,6 +189,7 @@ public class Account implements BaseAccount {
     private boolean mCryptoAutoSignature;
     private boolean mCryptoAutoEncrypt;
     private boolean mMarkMessageAsReadOnView;
+    private boolean mAlwaysShowCcBcc;
 
     private CryptoProvider mCryptoProvider = null;
 
@@ -280,6 +281,7 @@ public class Account implements BaseAccount {
         mCryptoAutoEncrypt = false;
         mEnabled = true;
         mMarkMessageAsReadOnView = true;
+        mAlwaysShowCcBcc = false;
 
         searchableFolders = Searchable.ALL;
 
@@ -446,6 +448,7 @@ public class Account implements BaseAccount {
         mCryptoAutoEncrypt = prefs.getBoolean(mUuid + ".cryptoAutoEncrypt", false);
         mEnabled = prefs.getBoolean(mUuid + ".enabled", true);
         mMarkMessageAsReadOnView = prefs.getBoolean(mUuid + ".markMessageAsReadOnView", true);
+        mAlwaysShowCcBcc = prefs.getBoolean(mUuid + ".alwaysShowCcBcc", false);
     }
 
     protected synchronized void delete(Preferences preferences) {
@@ -531,6 +534,7 @@ public class Account implements BaseAccount {
         editor.remove(mUuid + ".enableMoveButtons");
         editor.remove(mUuid + ".hideMoveButtonsEnum");
         editor.remove(mUuid + ".markMessageAsReadOnView");
+        editor.remove(mUuid + ".alwaysShowCcBcc");
         for (String type : networkTypes) {
             editor.remove(mUuid + ".useCompression." + type);
         }
@@ -695,6 +699,7 @@ public class Account implements BaseAccount {
         editor.putBoolean(mUuid + ".cryptoAutoEncrypt", mCryptoAutoEncrypt);
         editor.putBoolean(mUuid + ".enabled", mEnabled);
         editor.putBoolean(mUuid + ".markMessageAsReadOnView", mMarkMessageAsReadOnView);
+        editor.putBoolean(mUuid + ".alwaysShowCcBcc", mAlwaysShowCcBcc);
 
         editor.putBoolean(mUuid + ".vibrate", mNotificationSetting.shouldVibrate());
         editor.putInt(mUuid + ".vibratePattern", mNotificationSetting.getVibratePattern());
@@ -1680,4 +1685,12 @@ Log.d("ASH", "setTrashFolderName() attempting change of folder.setLocalOnly()");
     public synchronized void setMarkMessageAsReadOnView(boolean value) {
         mMarkMessageAsReadOnView = value;
     }
+
+    public synchronized boolean isAlwaysShowCcBcc() {
+        return mAlwaysShowCcBcc;
+    }
+
+    public synchronized void setAlwaysShowCcBcc(boolean show) {
+        mAlwaysShowCcBcc = show;
+    }
 }

src/com/fsck/k9/K9.java

@@ -188,7 +188,6 @@ public class K9 extends Application {
     private static boolean mMeasureAccounts = true;
     private static boolean mCountSearchMessages = true;
     private static boolean mHideSpecialAccounts = false;
-    private static boolean mZoomControlsEnabled = false;
     private static boolean mMobileOptimizedLayout = false;
     private static boolean mQuietTimeEnabled = false;
     private static String mQuietTimeStarts = null;
@@ -434,7 +433,6 @@ public class K9 extends Application {
         editor.putBoolean("useVolumeKeysForNavigation", mUseVolumeKeysForNavigation);
         editor.putBoolean("useVolumeKeysForListNavigation", mUseVolumeKeysForListNavigation);
         editor.putBoolean("manageBack", mManageBack);
-        editor.putBoolean("zoomControlsEnabled", mZoomControlsEnabled);
         editor.putBoolean("mobileOptimizedLayout", mMobileOptimizedLayout);
         editor.putBoolean("quietTimeEnabled", mQuietTimeEnabled);
         editor.putString("quietTimeStarts", mQuietTimeStarts);
@@ -603,7 +601,6 @@ public class K9 extends Application {
         mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
 
         mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
-        mZoomControlsEnabled = sprefs.getBoolean("zoomControlsEnabled", true);
 
         mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false);
         mQuietTimeStarts = sprefs.getString("quietTimeStarts", "21:00");
@@ -794,15 +791,6 @@ public class K9 extends Application {
         mManageBack = manageBack;
     }
 
-    public static boolean zoomControlsEnabled() {
-        return mZoomControlsEnabled;
-    }
-
-    public static void setZoomControlsEnabled(boolean zoomControlsEnabled) {
-        mZoomControlsEnabled = zoomControlsEnabled;
-    }
-
-
     public static boolean mobileOptimizedLayout() {
         return mMobileOptimizedLayout;
     }

src/com/fsck/k9/activity/Accounts.java

@@ -4,13 +4,7 @@ package com.fsck.k9.activity;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1195,7 +1189,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
     private void onAbout() {
         String appName = getString(R.string.app_name);
-        String year = "2012";
+        int year = Calendar.getInstance().get(Calendar.YEAR);
         WebView wv = new WebView(this);
         StringBuilder html = new StringBuilder()
         .append("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />")

src/com/fsck/k9/activity/MessageCompose.java

@@ -508,6 +508,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         mCcWrapper = (LinearLayout) findViewById(R.id.cc_wrapper);
         mBccWrapper = (LinearLayout) findViewById(R.id.bcc_wrapper);
 
+        if (mAccount.isAlwaysShowCcBcc()) {
+            onAddCcBcc();
+        }
+
         EditText upperSignature = (EditText)findViewById(R.id.upper_signature);
         EditText lowerSignature = (EditText)findViewById(R.id.lower_signature);
 
@@ -2017,6 +2021,15 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             } else {
                 mAccount = account;
             }
+
+            // Show CC/BCC text input field when switching to an account that always wants them
+            // displayed.
+            // Please note that we're not hiding the fields if the user switches back to an account
+            // that doesn't have this setting checked.
+            if (mAccount.isAlwaysShowCcBcc()) {
+                onAddCcBcc();
+            }
+
             // not sure how to handle mFolder, mSourceMessage?
         }
 
@@ -2175,18 +2188,20 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
          * Show the menu items "Add attachment (Image)" and "Add attachment (Video)"
          * if the work-around for the Gallery bug is enabled (see Issue 1186).
          */
-        int found = 0;
+        menu.findItem(R.id.add_attachment_image).setVisible(K9.useGalleryBugWorkaround());
-        for (int i = menu.size() - 1; i >= 0; i--) {
+        menu.findItem(R.id.add_attachment_video).setVisible(K9.useGalleryBugWorkaround());
-            MenuItem item = menu.getItem(i);
-            int id = item.getItemId();
-            if ((id == R.id.add_attachment_image) ||
-                    (id == R.id.add_attachment_video)) {
-                item.setVisible(K9.useGalleryBugWorkaround());
-                found++;
-            }
 
-            // We found all the menu items we were looking for. So stop here.
+        return true;
-            if (found == 2) break;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+
+        // Disable the 'Add Cc/Bcc' menu option when both fields are visible
+        if (mCcWrapper.getVisibility() == View.VISIBLE &&
+                mBccWrapper.getVisibility() == View.VISIBLE) {
+            menu.findItem(R.id.add_cc_bcc).setEnabled(false);
         }
 
         return true;
@@ -3542,7 +3557,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
     private void setMessageFormat(SimpleMessageFormat format) {
         // This method will later be used to enable/disable the rich text editing mode.
-        
+
         mMessageFormat = format;
     }
 

src/com/fsck/k9/activity/MessageInfoHolder.java

@@ -17,8 +17,6 @@ public class MessageInfoHolder {
     public boolean read;
     public boolean answered;
     public boolean flagged;
-    public boolean downloaded;
-    public boolean partially_downloaded;
     public boolean dirty;
     public LocalMessage message;
     public FolderInfoHolder folder;

src/com/fsck/k9/activity/MessageList.java

@@ -2394,6 +2394,8 @@ public class MessageList
 
 
             holder.chip.setBackgroundDrawable(message.message.getFolder().getAccount().generateColorChip().drawable());
+/* UI stuff is all changing
+<<<<<<< HEAD
             holder.chip.getBackground().setAlpha(message.read ? 127 : 255);
             view.getBackground().setAlpha(message.downloaded ? 0 : 127);
             // ASH funky bug is here?
@@ -2401,6 +2403,10 @@ public class MessageList
                 view.setBackgroundColor(message.message.getFolder().getAccount().getChipColor());
                 view.getBackground().setAlpha(31);
             }
+=======
+*/
+            view.getBackground().setAlpha(message.read ? 100 : 0);
+//>>>>>>> 4.301
 
             if ((message.message.getSubject() == null) || message.message.getSubject().equals("")) {
                 holder.subject.setText(getText(R.string.general_no_subject));

src/com/fsck/k9/activity/setup/AccountSettings.java

@@ -109,7 +109,7 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_SENT_FOLDER = "sent_folder";
     private static final String PREFERENCE_SPAM_FOLDER = "spam_folder";
     private static final String PREFERENCE_TRASH_FOLDER = "trash_folder";
-
+    private static final String PREFERENCE_ALWAYS_SHOW_CC_BCC = "always_show_cc_bcc";
 
 
     private Account mAccount;
@@ -172,6 +172,7 @@ public class AccountSettings extends K9PreferenceActivity {
     private ListPreference mSentFolder;
     private ListPreference mSpamFolder;
     private ListPreference mTrashFolder;
+    private CheckBoxPreference mAlwaysShowCcBcc;
 
 
     public static void actionSettings(Context context, Account account) {
@@ -226,6 +227,9 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
+        mAlwaysShowCcBcc = (CheckBoxPreference) findPreference(PREFERENCE_ALWAYS_SHOW_CC_BCC);
+        mAlwaysShowCcBcc.setChecked(mAccount.isAlwaysShowCcBcc());
+
         mMessageReadReceipt = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGE_READ_RECEIPT);
         mMessageReadReceipt.setChecked(mAccount.isMessageReadReceiptAlways());
 
@@ -731,6 +735,7 @@ Log.d("ASH", "Have set delete policy to " + mAccount.getDeletePolicy());
         mAccount.setAutoUploadOnMove(mAutoUploadOnMove.isChecked());
         mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
         mAccount.setMessageFormat(Account.MessageFormat.valueOf(mMessageFormat.getValue()));
+        mAccount.setAlwaysShowCcBcc(mAlwaysShowCcBcc.isChecked());
         mAccount.setMessageReadReceipt(mMessageReadReceipt.isChecked());
         mAccount.setQuoteStyle(QuoteStyle.valueOf(mQuoteStyle.getValue()));
         mAccount.setQuotePrefix(mAccountQuotePrefix.getText());

src/com/fsck/k9/activity/setup/Prefs.java

@@ -74,7 +74,6 @@ public class Prefs extends K9PreferenceActivity {
 
     private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
     private static final String PREFERENCE_MESSAGEVIEW_SHOW_NEXT = "messageview_show_next";
-    private static final String PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED = "messageview_zoom_controls";
     private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled";
     private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts";
     private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends";
@@ -117,7 +116,6 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mFixedWidth;
     private CheckBoxPreference mReturnToList;
     private CheckBoxPreference mShowNext;
-    private CheckBoxPreference mZoomControlsEnabled;
     private CheckBoxPreference mMobileOptimizedLayout;
     private ListPreference mBackgroundOps;
     private CheckBoxPreference mUseGalleryBugWorkaround;
@@ -282,9 +280,6 @@ public class Prefs extends K9PreferenceActivity {
         mShowNext = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_SHOW_NEXT);
         mShowNext.setChecked(K9.messageViewShowNext());
 
-        mZoomControlsEnabled = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED);
-        mZoomControlsEnabled.setChecked(K9.zoomControlsEnabled());
-
         mMobileOptimizedLayout = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT);
         if (!MessageWebView.isSingleColumnLayoutSupported()) {
             mMobileOptimizedLayout.setEnabled(false);
@@ -461,7 +456,6 @@ public class Prefs extends K9PreferenceActivity {
         K9.setBatchButtonsFlag(mBatchButtonsFlag.isChecked());
         K9.setBatchButtonsUnselect(mBatchButtonsUnselect.isChecked());
 
-        K9.setZoomControlsEnabled(mZoomControlsEnabled.isChecked());
         K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString());
         boolean needsRefresh = K9.setBackgroundOps(mBackgroundOps.getValue());
         K9.setUseGalleryBugWorkaround(mUseGalleryBugWorkaround.isChecked());

src/com/fsck/k9/helper/MessageHelper.java

@@ -60,8 +60,6 @@ public class MessageHelper {
             target.read = message.isSet(Flag.SEEN);
             target.answered = message.isSet(Flag.ANSWERED);
             target.flagged = message.isSet(Flag.FLAGGED);
-            target.downloaded = message.isSet(Flag.X_DOWNLOADED_FULL);
-            target.partially_downloaded = message.isSet(Flag.X_DOWNLOADED_PARTIAL);
 
             Address[] addrs = message.getFrom();
 

src/com/fsck/k9/mail/Address.java

@@ -1,6 +1,15 @@
 
 package com.fsck.k9.mail;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.codec.EncoderUtil;
+import org.apache.james.mime4j.dom.address.Mailbox;
+import org.apache.james.mime4j.dom.address.MailboxList;
+import org.apache.james.mime4j.field.address.AddressBuilder;
+
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -11,16 +20,8 @@ import android.util.Log;
 
 import com.fsck.k9.K9;
 import com.fsck.k9.helper.Contacts;
-import com.fsck.k9.helper.Utility;
 import com.fsck.k9.helper.StringUtils;
-import org.apache.james.mime4j.codec.EncoderUtil;
+import com.fsck.k9.helper.Utility;
-import org.apache.james.mime4j.dom.address.Mailbox;
-import org.apache.james.mime4j.dom.address.MailboxList;
-import org.apache.james.mime4j.field.address.parser.AddressBuilder;
-import org.apache.james.mime4j.MimeException;
-
-import java.util.ArrayList;
-import java.util.List;
 
 
 public class Address {
@@ -137,7 +138,8 @@ public class Address {
         }
         List<Address> addresses = new ArrayList<Address>();
         try {
-            MailboxList parsedList = AddressBuilder.parseAddressList(addressList).flatten();
+            MailboxList parsedList =  AddressBuilder.DEFAULT.parseAddressList(addressList).flatten();
+
             for (int i = 0, count = parsedList.size(); i < count; i++) {
                 org.apache.james.mime4j.dom.address.Address address = parsedList.get(i);
                 if (address instanceof Mailbox) {
@@ -145,13 +147,13 @@ public class Address {
                     addresses.add(new Address(mailbox.getLocalPart() + "@" + mailbox.getDomain(), mailbox.getName(), false));
                 } else {
                     Log.e(K9.LOG_TAG, "Unknown address type from Mime4J: "
-                          + address.getClass().toString());
+                            + address.getClass().toString());
                 }
             }
         } catch (MimeException pe) {
             Log.e(K9.LOG_TAG, "MimeException in Address.parse()", pe);
             //but we do an silent failover : we just use the given string as name with empty address
-            addresses.add(new Address(null, addressList,false));
+            addresses.add(new Address(null, addressList, false));
         }
         return addresses.toArray(EMPTY_ADDRESS_ARRAY);
     }

src/com/fsck/k9/mail/internet/MimeMessage.java

@@ -1,24 +1,38 @@
 
 package com.fsck.k9.mail.internet;
 
-import com.fsck.k9.mail.*;
+import java.io.BufferedWriter;
-import com.fsck.k9.mail.store.UnavailableStorageException;
+import java.io.IOException;
-
+import java.io.InputStream;
-import org.apache.james.mime4j.stream.BodyDescriptor;
+import java.io.OutputStream;
-import org.apache.james.mime4j.stream.RawField;
+import java.io.OutputStreamWriter;
-import org.apache.james.mime4j.parser.ContentHandler;
+import java.text.SimpleDateFormat;
-import org.apache.james.mime4j.io.EOLConvertingInputStream;
+import java.util.Date;
-import org.apache.james.mime4j.parser.MimeStreamParser;
+import java.util.LinkedList;
-import org.apache.james.mime4j.stream.MimeEntityConfig;
+import java.util.Locale;
-import org.apache.james.mime4j.dom.field.DateTimeField;
+import java.util.Set;
-import org.apache.james.mime4j.dom.field.Field;
+import java.util.UUID;
-import org.apache.james.mime4j.field.DefaultFieldParser;
 
 import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.dom.field.DateTimeField;
+import org.apache.james.mime4j.dom.field.ParsedField;
+import org.apache.james.mime4j.field.DefaultFieldParser;
+import org.apache.james.mime4j.io.EOLConvertingInputStream;
+import org.apache.james.mime4j.parser.ContentHandler;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.stream.BodyDescriptor;
+import org.apache.james.mime4j.stream.Field;
+import org.apache.james.mime4j.stream.MimeConfig;
+import org.apache.james.mime4j.stream.RawField;
 
-import java.io.*;
+import com.fsck.k9.mail.Address;
-import java.text.SimpleDateFormat;
+import com.fsck.k9.mail.Body;
-import java.util.*;
+import com.fsck.k9.mail.BodyPart;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.Multipart;
+import com.fsck.k9.mail.Part;
+import com.fsck.k9.mail.store.UnavailableStorageException;
 
 /**
  * An implementation of Message that stores all of it's metadata in RFC 822 and
@@ -73,7 +87,7 @@ public class MimeMessage extends Message {
 
         mBody = null;
 
-        MimeEntityConfig parserConfig  = new MimeEntityConfig();
+        MimeConfig parserConfig  = new MimeConfig();
         parserConfig.setMaxHeaderLen(-1); // The default is a mere 10k
         parserConfig.setMaxLineLen(-1); // The default is 1000 characters. Some MUAs generate
         // REALLY long References: headers
@@ -458,27 +472,8 @@ public class MimeMessage extends Message {
             expect(Part.class);
         }
 
-        public void field(RawField field) {
-            expect(Part.class);
-            try {
-                Field parsedField = DefaultFieldParser.parse(field.getRaw(), null);
-                ((Part)stack.peek()).addHeader(parsedField.getName(), parsedField.getBody().trim());
-            } catch (MessagingException me) {
-                throw new Error(me);
-            } catch (MimeException me) {
-                throw new Error(me);
-            }
-        }
 
-        public void field(String fieldData) {
+
-            expect(Part.class);
-            try {
-                String[] tokens = fieldData.split(":", 2);
-                ((Part)stack.peek()).addHeader(tokens[0], tokens[1].trim());
-            } catch (MessagingException me) {
-                throw new Error(me);
-            }
-        }
 
         public void endHeader() {
             expect(Part.class);
@@ -552,6 +547,16 @@ public class MimeMessage extends Message {
         public void raw(InputStream is) throws IOException {
             throw new UnsupportedOperationException("Not supported");
         }
+
+        @Override
+        public void field(Field parsedField) throws MimeException {
+            expect(Part.class);
+            try {
+                ((Part)stack.peek()).addHeader(parsedField.getName(), parsedField.getBody().trim());
+            } catch (MessagingException me) {
+                throw new Error(me);
+            }
+        }
     }
 
     /**

src/com/fsck/k9/preferences/AccountSettings.java

@@ -33,6 +33,9 @@ public class AccountSettings {
         s.put("alwaysBcc", Settings.versions(
                 new V(11, new StringSetting(""))
             ));
+        s.put("alwaysShowCcBcc", Settings.versions(
+                new V(13, new BooleanSetting(false))
+            ));
         s.put("archiveFolderName", Settings.versions(
                 new V(1, new StringSetting("Archive"))
             ));

src/com/fsck/k9/preferences/GlobalSettings.java

@@ -212,10 +212,6 @@ public class GlobalSettings {
         s.put("useVolumeKeysForNavigation", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
-        s.put("zoomControlsEnabled", Settings.versions(
-                new V(1, new BooleanSetting(false)),
-                new V(4, new BooleanSetting(true))
-            ));
         s.put("batchButtonsMarkRead", Settings.versions(
                 new V(8, new BooleanSetting(true))
             ));

src/com/fsck/k9/preferences/Settings.java

@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 12;
+    public static final int VERSION = 14;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,

src/com/fsck/k9/view/MessageWebView.java

@@ -2,18 +2,18 @@ package com.fsck.k9.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.View;
 import android.webkit.WebSettings;
-import android.webkit.WebView;
 import android.widget.Toast;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
 import java.lang.reflect.Method;
 import com.nobu_games.android.view.web.TitleBarWebView;
+
 public class MessageWebView extends TitleBarWebView {
 
 
@@ -103,15 +103,16 @@ public class MessageWebView extends TitleBarWebView {
         final WebSettings webSettings = this.getSettings();
 
         webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
+
         webSettings.setSupportZoom(true);
+        webSettings.setBuiltInZoomControls(true);
+
+        disableDisplayZoomControls();
+
         webSettings.setJavaScriptEnabled(false);
         webSettings.setLoadsImagesAutomatically(true);
         webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
 
-        if (K9.zoomControlsEnabled()) {
-            webSettings.setBuiltInZoomControls(true);
-        }
-
         if (isSingleColumnLayoutSupported() && K9.mobileOptimizedLayout()) {
             webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
         } else {
@@ -127,6 +128,21 @@ public class MessageWebView extends TitleBarWebView {
 
     }
 
+    /**
+     * Disable on-screen zoom controls on devices that support zooming via pinch-to-zoom.
+     */
+    @TargetApi(11)
+    private void disableDisplayZoomControls() {
+        if (Build.VERSION.SDK_INT >= 11) {
+            PackageManager pm = getContext().getPackageManager();
+            boolean supportsMultiTouch =
+                    pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH) ||
+                    pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT);
+
+            getSettings().setDisplayZoomControls(!supportsMultiTouch);
+        }
+    }
+
     @TargetApi(9)
     private void disableOverscrolling() {
         if (Build.VERSION.SDK_INT >= 9) {

src/com/nobu_games/android/view/web/TitleBarWebView.java

@@ -32,6 +32,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+import android.webkit.WebViewClassic.TitleBarDelegate;
 import android.widget.FrameLayout;
 
 /**
@@ -43,7 +44,7 @@ import android.widget.FrameLayout;
  * Call {@link #setEmbeddedTitleBarCompat(View)} for setting a view as embedded
  * title bar on top of the displayed WebView page.
  */
-public class TitleBarWebView extends WebView {
+public class TitleBarWebView extends WebView implements TitleBarDelegate {
     /**
      * Internally used view wrapper for suppressing unwanted touch events on the
      * title bar view when WebView contents is being touched.
@@ -82,6 +83,13 @@ public class TitleBarWebView extends WebView {
     private Matrix mMatrix = new Matrix();
     private Method mNativeGetVisibleTitleHeightMethod;
 
+    /**
+     * This will always contain a reference to the title bar view no matter if
+     * {@code setEmbeddedTitleBar()} or the Jelly Bean workaround is used. We use this in
+     * {@link #getTitleHeight()}.
+     */
+    private View mTitleBarView;
+
     public TitleBarWebView(Context context) {
         super(context);
         init();
@@ -172,6 +180,8 @@ public class TitleBarWebView extends WebView {
                     "Native setEmbeddedTitleBar not available. Starting workaround");
             setEmbeddedTitleBarJellyBean(v);
         }
+
+        mTitleBarView = v;
     }
 
     @Override
@@ -225,6 +235,11 @@ public class TitleBarWebView extends WebView {
 
     @Override
     protected void onDraw(Canvas canvas) {
+        if (Build.VERSION.SDK_INT >= 16) {
+            super.onDraw(canvas);
+            return;
+        }
+
         canvas.save();
 
         if(mTitleBar != null) {
@@ -264,8 +279,25 @@ public class TitleBarWebView extends WebView {
         scrollBar.draw(canvas);
     }
 
-    private int getTitleHeight() {
+    /**
-        if(mTitleBar != null) return mTitleBar.getHeight();
+     * Get the height of the title bar view.
+     *
+     * <p>
+     * In the Jelly Bean workaround we need this method because we have to implement the
+     * {@link TitleBarDelegate} interface. But by implementing this method we override the hidden
+     * {@code getTitleHeight()} of the {@link WebView}s in older Android versions.
+     * <br>
+     * What we should do, is return the title height on Jelly Bean and call through to the parent
+     * class on older Android versions. But this would require even more trickery, so we just
+     * inline the parent functionality which simply calls {@link View#getHeight()}. This is exactly
+     * what we do on Jelly Bean anyway.
+     * </p>
+     */
+    @Override
+    public int getTitleHeight() {
+        if (mTitleBarView != null) {
+            return mTitleBarView.getHeight();
+        }
         return 0;
     }
 
@@ -315,4 +347,7 @@ public class TitleBarWebView extends WebView {
 
         mTitleBar = v;
     }
+
+    @Override
+    public void onSetEmbeddedTitleBar(View title) { /* unused */ }
 }