Merge branch 'remove_obsolete_code'

PR #491 from zjw

res/layout/message.xml

@@ -26,11 +26,6 @@
 	            android:layout_height="wrap_content"
 	            android:layout_width="fill_parent"/>
 	
-	        <com.fsck.k9.view.AccessibleWebView
-	            android:id="@+id/accessible_message_content"
-	            android:layout_height="wrap_content"
-	            android:layout_width="fill_parent"/>
-	
 	        <!-- Attachments area -->
 	
 	        <LinearLayout

res/values-ca/strings.xml

@@ -417,8 +417,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="account_settings_notify_self_summary">Mostra una notificació per als missatges que enviïs</string>
   <string name="account_settings_notification_opens_unread_label">Notificació obre missatges no llegits</string>
   <string name="account_settings_notification_opens_unread_summary">Cerca de missatges no llegits quan s\'ha obert la notificació.</string>
-  <string name="account_settings_notification_unread_count_label">Mostra correu no llegit</string>
-  <string name="account_settings_notification_unread_count_summary">Mostra el nombre de missatges no llegits a la barra de notificació.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marca el missatge obert com a llegit</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marca el missatge com a llegit després d\'haver-lo obert.</string>
   <string name="account_settings_show_pictures_label">Sempre mostra imatges</string>
@@ -644,14 +642,10 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="settings_message_theme_selection_label">Tema de missatge fix</string>
   <string name="settings_message_theme_selection_summary_off">Selecciona el tema de la vista de missatge al mostrar-lo.</string>
   <string name="settings_message_theme_selection_summary_on">Utilitza un tema fix per a tots els missatges.</string>
-  <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="setting_language_system">Per defecte del sistema</string>
   <string name="background_ops_label">Sincronització 2n pla</string>
   <string name="background_ops_never">Mai</string>
   <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 \'Sincronització Automàtica\'</string>
   <string name="background_ops_auto_sync_only">Quan la Sincronització Automàtica està activada</string>
   <string name="batch_select_all">Selecciona-ho tot</string>
   <string name="account_setup_push_limit_label">Carpetes màximes a comprovar</string>

res/values-cs/strings.xml

@@ -417,8 +417,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="account_settings_notify_self_summary">Oznamovat i v případě odeslání pošty s identitou účtu</string>
   <string name="account_settings_notification_opens_unread_label">Oznámení otevírá nepřečtené zprávy</string>
   <string name="account_settings_notification_opens_unread_summary">Vyhledává nepřečtené zprávy, je-li otevřeno oznámení</string>
-  <string name="account_settings_notification_unread_count_label">Zobrazit počet nepřečtených</string>
-  <string name="account_settings_notification_unread_count_summary">Zobrazit počet nepřečtených zpráv v řádky upozornení.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Označit jako přečtenou po otevření</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Označit zprávu jako přečtenou po otevření</string>
   <string name="account_settings_show_pictures_label">Vždy zobrazovat obrázky</string>
@@ -644,14 +642,10 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="settings_message_theme_selection_label">Neměnné téma zpráv</string>
   <string name="settings_message_theme_selection_summary_off">Lze vybrat téma při prohlížení zprávy</string>
   <string name="settings_message_theme_selection_summary_on">Použíj neměnné téma při prohlížení zprávy</string>
-  <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="setting_language_system">Systémový výchozí</string>
   <string name="background_ops_label">Synchronizace na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <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>
   <string name="background_ops_auto_sync_only">Jsou-li \'Aut. synchronizace\' zaškrtnuty</string>
   <string name="batch_select_all">Vybrat vše</string>
   <string name="account_setup_push_limit_label">Max. počet složek řízených PUSH</string>

res/values-da/strings.xml

@@ -412,8 +412,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="account_settings_notify_self_summary">Vis besked for mails sendt af mig</string>
   <string name="account_settings_notification_opens_unread_label">Klik på besked, viser ulæste mails</string>
   <string name="account_settings_notification_opens_unread_summary">Søger efter ulæste mails når besked vises</string>
-  <string name="account_settings_notification_unread_count_label">Vis antal ulæste mails</string>
-  <string name="account_settings_notification_unread_count_summary">Vis antallet af ulæste mails i statusbar.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marker som læst ved åbning</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marker som læst når meddelses åbnes for læsning</string>
   <string name="account_settings_show_pictures_label">Vis altid billeder</string>
@@ -638,14 +636,10 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="settings_message_theme_selection_label">Fixed meddelelses theme</string>
   <string name="settings_message_theme_selection_summary_off">Benyt meddelelsesvisnings theme når meddelelser læses</string>
   <string name="settings_message_theme_selection_summary_on">Benyt et fixed meddelelsesvisnings theme</string>
-  <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="setting_language_system">System standard</string>
   <string name="background_ops_label">Baggrundssynkronisering</string>
   <string name="background_ops_never">Aldrig</string>
   <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>
   <string name="background_ops_auto_sync_only">Når \"Auto-sync\" er valgt</string>
   <string name="batch_select_all">Vælg alle</string>
   <string name="account_setup_push_limit_label">Max antal mapper som skal kontrolleres ved push</string>

res/values-de/strings.xml

@@ -424,8 +424,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_settings_notify_self_summary">Benachrichtigungen für Nachrichten, die eine Ihrer eigenen E-Mail-Adressen als Absender tragen</string>
   <string name="account_settings_notification_opens_unread_label">Ungelesene Nachrichten öffnen</string>
   <string name="account_settings_notification_opens_unread_summary">Beim Öffnen einer Benachrichtigung Liste der ungelesenen Nachrichten anzeigen</string>
-  <string name="account_settings_notification_unread_count_label">Anzahl anzeigen</string>
-  <string name="account_settings_notification_unread_count_summary">Anzahl der ungelesenen Nachrichten in der Statuszeile anzeigen</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Beim Öffnen als gelesen markieren</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Nachricht als gelesen markieren, sobald sie zum Betrachten geöffnet wird</string>
   <string name="account_settings_show_pictures_label">Bilder automatisch anzeigen</string>
@@ -651,14 +649,10 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="settings_message_theme_selection_label">Festes Nachrichten-Design</string>
   <string name="settings_message_theme_selection_summary_off">Nachrichten-Design während des Ansehens der Nachricht auswählen</string>
   <string name="settings_message_theme_selection_summary_on">Immer das ausgewählte Nachrichten-Design verwenden</string>
-  <string name="settings_messageview_mobile_layout_label">Einfaches Layout</string>
-  <string name="settings_messageview_mobile_layout_summary">HTML-Nachrichten für kleine Displays optimieren</string>
   <string name="setting_language_system">Systemvorgabe</string>
   <string name="background_ops_label">Hintergrund-Synchronisierung</string>
   <string name="background_ops_never">Nie</string>
   <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="batch_select_all">Alle auswählen</string>
   <string name="account_setup_push_limit_label">Maximale Push-Ordner-Anzahl</string>

res/values-el/strings.xml

@@ -416,8 +416,6 @@
   <string name="account_settings_notify_self_summary">Προβολή ειδοποίησης για μηνύματα που απέστειλα</string>
   <string name="account_settings_notification_opens_unread_label">Η ειδοποίηση ανοίγει μη αναγνωσμένα μηνύματα</string>
   <string name="account_settings_notification_opens_unread_summary">Αναζητά μη αναγνωσμένα μηνύματα όταν ανοίγεται η ειδοποίηση</string>
-  <string name="account_settings_notification_unread_count_label">Προβολή πλήθους μη αναγνωσμένων</string>
-  <string name="account_settings_notification_unread_count_summary">Προβολή πλήθους μη αναγνωσμένων μηνυμάτων στη γραμμή κατάστασης.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Σημείωση ως αναγνωσμένου με την ανάγνωση</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Σημείωση ως αναγνωσμένου με την προβολή</string>
   <string name="account_settings_show_pictures_label">Προβολή εικόνων πάντα</string>
@@ -643,14 +641,10 @@
   <string name="settings_message_theme_selection_label">Θέμα σταθερού μηνύματος</string>
   <string name="settings_message_theme_selection_summary_off">Επιλογή του θέματος προβολής μηνύματος κατά την προβολή του μηνύματος</string>
   <string name="settings_message_theme_selection_summary_on">Χρήση θέματος σταθερού μηνύματος</string>
-  <string name="settings_messageview_mobile_layout_label">Μονόστηλη διάταξη</string>
-  <string name="settings_messageview_mobile_layout_summary">Μηνύματα HTML για μικρότερες οθόνες</string>
   <string name="setting_language_system">Εξ ορισμού του συστήματος</string>
   <string name="background_ops_label">Συγχρονισμός στο παρασκήνιο</string>
   <string name="background_ops_never">Ποτέ</string>
   <string name="background_ops_always">Πάντοτε</string>
-  <string name="background_ops_enabled">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\'</string>
-  <string name="background_ops_auto_sync">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\' &amp; \'Αυτόματο συγχρονισμός\'</string>
   <string name="background_ops_auto_sync_only">Όταν έχει επιλεγεί \'Auto-sync\'</string>
   <string name="batch_select_all">Επιλογή όλων</string>
   <string name="account_setup_push_limit_label">Μέγιστο φακέλων για σπρώξιμο</string>

res/values-es/strings.xml

@@ -426,8 +426,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_notify_self_summary">Mostrar notificaciones durante el envío de correo</string>
   <string name="account_settings_notification_opens_unread_label">Abrir correo no leído</string>
   <string name="account_settings_notification_opens_unread_summary">Abrir correo no leído desde la notificación</string>
-  <string name="account_settings_notification_unread_count_label">Mostrar número de mensajes no leídos</string>
-  <string name="account_settings_notification_unread_count_summary">Mostrar número de mensajes no leídos en barra de notificaciones.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensaje como leído al abrirlo</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marcar mensaje como leído cuando se abre para verlo</string>
   <string name="account_settings_show_pictures_label">Mostrar imágenes siempre</string>
@@ -653,14 +651,10 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="settings_message_theme_selection_label">Tema de mensaje fijo</string>
   <string name="settings_message_theme_selection_summary_off">Seleccionar el tema de vista de mensaje mientras se muestra el mensaje</string>
   <string name="settings_message_theme_selection_summary_on">Usar un tema de vista de mensaje fijo</string>
-  <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="setting_language_system">Configurado en el sistema</string>
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <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\' estén activos</string>
   <string name="background_ops_auto_sync_only">Cuando \'sincronización automática\' esté activo</string>
   <string name="batch_select_all">Seleccionar todos</string>
   <string name="account_setup_push_limit_label">Max. carpetas Push</string>

res/values-eu/strings.xml

@@ -417,8 +417,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="account_settings_notify_self_summary">Bidaltzen ditudan mezuetarako jakinarazpena ikusi</string>
   <string name="account_settings_notification_opens_unread_label">Jakinarazpenak irakurgabeko mezuak irekitzen ditu</string>
   <string name="account_settings_notification_opens_unread_summary">Jakinarazpena irekitzean irakurri gabeko mezuak bilatu</string>
-  <string name="account_settings_notification_unread_count_label">Irakurgabeko kopurua ikusi</string>
-  <string name="account_settings_notification_unread_count_summary">Irakurgabeko mezu kopurua ikusi jakinarazpen barran.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Irekitzean irakurrita markatu</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Mezu bat irekitzerakoan irakurri bezala markatu</string>
   <string name="account_settings_show_pictures_label">Irudiak beti ikusi</string>
@@ -644,14 +642,10 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="settings_message_theme_selection_label">Mezu finkoaren itxura</string>
   <string name="settings_message_theme_selection_summary_off">Mezua ikusten deneran itxura hautatu</string>
   <string name="settings_message_theme_selection_summary_on">Mezua ikusteko itxura finkoa erabili</string>
-  <string name="settings_messageview_mobile_layout_label">Diseinu trinkoa</string>
-  <string name="settings_messageview_mobile_layout_summary">Pantaila txikietarako HTML mezuak moldatu</string>
   <string name="setting_language_system">Sistemako defektuzkoa</string>
   <string name="background_ops_label">Atzeko planoko sinkronizazioa</string>
   <string name="background_ops_never">Inoiz ez</string>
   <string name="background_ops_always">Beti</string>
-  <string name="background_ops_enabled">\'Background data\' gaituta dagoenean</string>
-  <string name="background_ops_auto_sync">\'Background data\' eta \'Auto-sinkronizazioa\' gaituta daudenean</string>
   <string name="background_ops_auto_sync_only">\'Auto-sinkronizazioa\' gaituta dagoenean</string>
   <string name="batch_select_all">Guztia hautatu</string>
   <string name="account_setup_push_limit_label">Push erabiliz egiaztatuko diren karpeta kopuru maximoa</string>

res/values-fi/strings.xml

@@ -426,8 +426,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_settings_notify_self_summary">Näytä ilmoitus lähettämistäni viesteistä</string>
   <string name="account_settings_notification_opens_unread_label">Ilmoitus avaa lukemattomat viestit</string>
   <string name="account_settings_notification_opens_unread_summary">Etsii lukemattomia viestejä, kun ilmoitus avataan</string>
-  <string name="account_settings_notification_unread_count_label">Näytä lukemattomien viestien määrä</string>
-  <string name="account_settings_notification_unread_count_summary">Näytä lukemattomien viestien määrä ilmoituspalkissa.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Merkitse viesti luetuksi avattaessa</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Merkitse viesti luetuksi, kun se avataan katseltavaksi</string>
   <string name="account_settings_show_pictures_label">Näytä aina kuvat</string>
@@ -653,14 +651,10 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="settings_message_theme_selection_label">Kiinteä viestiteema</string>
   <string name="settings_message_theme_selection_summary_off">Valitse viestinäkymän teema viestiä luettaessa</string>
   <string name="settings_message_theme_selection_summary_on">Käytä kiinteää viestinäkymän teemaa</string>
-  <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="setting_language_system">Järjestelmän oletus</string>
   <string name="background_ops_label">Synkronointi taustalla</string>
   <string name="background_ops_never">Ei koskaan</string>
   <string name="background_ops_always">Aina</string>
-  <string name="background_ops_enabled">Kun Taustadata on valittu</string>
-  <string name="background_ops_auto_sync">Kun \'Taustadata\' ja \'Automaattinen synkronointi\' on valittu</string>
   <string name="background_ops_auto_sync_only">Kun Automaattinen synkronointi on valittu</string>
   <string name="batch_select_all">Valitse kaikki</string>
   <string name="account_setup_push_limit_label">Push-tilassa tarkistettavien kansioiden enimmäismäärä</string>

res/values-fr/strings.xml

@@ -425,8 +425,6 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="account_settings_notify_self_summary">Afficher une notification pour les messages que j\'ai envoyés</string>
   <string name="account_settings_notification_opens_unread_label">La notification ouvre les messages non lus</string>
   <string name="account_settings_notification_opens_unread_summary">Recherche des messages non lus lors de l\'accès aux notifications</string>
-  <string name="account_settings_notification_unread_count_label">Afficher le nombre de non lus</string>
-  <string name="account_settings_notification_unread_count_summary">Afficher le nombre de messages non lus dans la barre de notification</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marquer comme lu à l\'ouverture</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marquer un message comme lu à quand il est ouvert pour être visualisé</string>
   <string name="account_settings_show_pictures_label">Toujours afficher les images</string>
@@ -652,14 +650,10 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="settings_message_theme_selection_label">Thème de message fixe</string>
   <string name="settings_message_theme_selection_summary_off">Choisir le thème de vue du message en regardant le message</string>
   <string name="settings_message_theme_selection_summary_on">Utiliser un thème de vue de message fixe</string>
-  <string name="settings_messageview_mobile_layout_label">Mise en page condensée</string>
-  <string name="settings_messageview_mobile_layout_summary">Reformater les messages HTML pour les petits écrans</string>
   <string name="setting_language_system">Langue par défaut du système</string>
   <string name="background_ops_label">Synchronisation en arrière-plan</string>
   <string name="background_ops_never">Jamais</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>
   <string name="background_ops_auto_sync_only">Lorsque «\u00A0Synchronisation auto\u00A0» est activée</string>
   <string name="batch_select_all">Sélectionner tout</string>
   <string name="account_setup_push_limit_label">Maximum de dossiers avec le pousser à vérifier</string>

res/values-gl/strings.xml

@@ -355,8 +355,6 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
   <string name="account_settings_notify_self_summary">Amosar notificacións durante o envío de correo</string>
   <string name="account_settings_notification_opens_unread_label">Abrir correo non lido</string>
   <string name="account_settings_notification_opens_unread_summary">Abrir correo non lido dende a notificación</string>
-  <string name="account_settings_notification_unread_count_label">Amosar número de mensaxes non lidos</string>
-  <string name="account_settings_notification_unread_count_summary">Amosar número de mensaxen non lidos na barra de notificacións.</string>
   <string name="account_settings_show_pictures_label">Amosar imaxes</string>
   <string name="account_settings_show_pictures_never">Nunca</string>
   <string name="account_settings_show_pictures_only_from_contacts">Só dos meuis contactos</string>
@@ -576,14 +574,10 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
   <string name="messageview_preferences">mensaxes</string>
   <string name="settings_theme_label">Tema</string>
   <string name="settings_language_label">Idioma</string>
-  <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="setting_language_system">Configurado no sistema</string>
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <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>
   <string name="batch_select_all">Seleccionar todos</string>
   <string name="account_setup_push_limit_label">Max. subscripcións</string>
   <string name="account_setup_push_limit_10">10 carpetas</string>

res/values-hu/strings.xml

@@ -411,8 +411,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="account_settings_notify_self_summary">Mutassa az állapotsoron ha a küldés sikeres volt</string>
   <string name="account_settings_notification_opens_unread_label">Értesítés megnyitása</string>
   <string name="account_settings_notification_opens_unread_summary">Értesítésre kattintva megnyitja az olvasatlan üzeneteket</string>
-  <string name="account_settings_notification_unread_count_label">Olvasatlanok kijelzése</string>
-  <string name="account_settings_notification_unread_count_summary">Olvasatlan levelek száma az állapotsoron.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Üzenet megjelölése olvasottnak megnyitáskor</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Olvasottnak jelöli az üzenetet, ha megnézik</string>
   <string name="account_settings_show_pictures_label">Képek megjelenítése</string>
@@ -632,14 +630,10 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="settings_message_theme_label">Üzenetmegjelenítés témája</string>
   <string name="settings_compose_theme_label">Üzenetírás témája</string>
   <string name="settings_language_label">Nyelv</string>
-  <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="setting_language_system">Alapértelmezett</string>
   <string name="background_ops_label">Háttérszinkronizálás</string>
   <string name="background_ops_never">Soha</string>
   <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>
   <string name="background_ops_auto_sync_only">Amikor az \'Automatikus szinkronizáció\' be van kapcsolva</string>
   <string name="batch_select_all">Mindent kijelöl</string>
   <string name="account_setup_push_limit_label">Ellenőrizhető mappák száma</string>

res/values-it/strings.xml

@@ -426,8 +426,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_settings_notify_self_summary">Mostra una notifica per i messaggi che ho inviato</string>
   <string name="account_settings_notification_opens_unread_label">Notifica apre i messaggi non letti</string>
   <string name="account_settings_notification_opens_unread_summary">Ricerca non letti quando Notifiche è aperto</string>
-  <string name="account_settings_notification_unread_count_label">Mostra numero messaggi non letti</string>
-  <string name="account_settings_notification_unread_count_summary">Mostra il numero dei messaggi non letti nella barra di notifica.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marca messaggio come letto all\'apertura</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marca un messaggio come letto quando viene aperto per la visualizzazione</string>
   <string name="account_settings_show_pictures_label">Mostra sempre le immagini</string>
@@ -653,14 +651,10 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="settings_message_theme_selection_label">Tema fisso del messaggio</string>
   <string name="settings_message_theme_selection_summary_off">Seleziona il tema della vista dei messaggi durante la visualizzazione del messaggio</string>
   <string name="settings_message_theme_selection_summary_on">Usa un tema fisso nella vista dei messaggi</string>
-  <string name="settings_messageview_mobile_layout_label">Disposizione a colonna singola</string>
-  <string name="settings_messageview_mobile_layout_summary">Riformatta i messaggi HTML per schermi più piccoli</string>
   <string name="setting_language_system">Impostazioni predefinite di sistema</string>
   <string name="background_ops_label">Sincronizzazione in background</string>
   <string name="background_ops_never">Mai</string>
   <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\' e \'Sincronizzazione automatica\' sono selezionati</string>
   <string name="background_ops_auto_sync_only">Quando \'Sincronizzazione automatica\' è selezionato</string>
   <string name="batch_select_all">Seleziona tutto</string>
   <string name="account_setup_push_limit_label">Max cartelle Push</string>

res/values-iw/strings.xml

@@ -350,8 +350,6 @@
   <string name="account_settings_notify_self_summary">הצג התראה להודעות ששלחתי</string>
   <string name="account_settings_notification_opens_unread_label">ההתראה פותחת הודעות שלא נקראו</string>
   <string name="account_settings_notification_opens_unread_summary">חיפוש אחר הודעות שלא נקראו כאשר ההתראה נפתחת</string>
-  <string name="account_settings_notification_unread_count_label">הצג מספר שלא נקראו</string>
-  <string name="account_settings_notification_unread_count_summary">הצג את מספר ההודעות שלא נקראו בשורת ההתראות.</string>
   <string name="account_settings_show_pictures_label">תמיד הצג תמונות</string>
   <string name="account_settings_show_pictures_never">לא</string>
   <string name="account_settings_show_pictures_only_from_contacts">מאנשי הקשר</string>
@@ -543,14 +541,10 @@
   <string name="messageview_preferences">הודעות</string>
   <string name="settings_theme_label">ערכת נושא</string>
   <string name="settings_language_label">שפה</string>
-  <string name="settings_messageview_mobile_layout_label">פריסת עמודה יחידה</string>
-  <string name="settings_messageview_mobile_layout_summary">אתחל הודעות HTML ותתאים אותם למסכים קטנים.</string>
   <string name="setting_language_system">ברירות מחדל מערכת</string>
   <string name="background_ops_label">סנכרון ברקע</string>
   <string name="background_ops_never">אף פעם</string>
   <string name="background_ops_always">תמיד</string>
-  <string name="background_ops_enabled">"מתי ש\'נתונים ברקע\' מסומן "</string>
-  <string name="background_ops_auto_sync">"מתי ש\'נתונים ברקע\' ו\'סינכרון אוטומטי\' מסומנים "</string>
   <string name="batch_select_all">בחר הכל</string>
   <string name="account_setup_push_limit_label">מקסימום תיקיות כדי לבדוק עם דחיפה</string>
   <string name="account_setup_push_limit_10">10 תיקיות</string>

res/values-ja/strings.xml

@@ -426,8 +426,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_settings_notify_self_summary">このアカウントからのメールも通知する</string>
   <string name="account_settings_notification_opens_unread_label">未読メール通知の動作</string>
   <string name="account_settings_notification_opens_unread_summary">通知を開いた際に未読メールを検索する</string>
-  <string name="account_settings_notification_unread_count_label">未読件数の表示</string>
-  <string name="account_settings_notification_unread_count_summary">通知バーに未読メッセージの件数を表示する</string>
   <string name="account_settings_mark_message_as_read_on_view_label">開くと同時に既読にする</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">メッセージを参照したときに既読にする</string>
   <string name="account_settings_show_pictures_label">画像を自動で表示</string>
@@ -653,14 +651,10 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="settings_message_theme_selection_label">メッセージ表示画面のテーマを固定する</string>
   <string name="settings_message_theme_selection_summary_off">メッセージを表示するテーマを選択する</string>
   <string name="settings_message_theme_selection_summary_on">メッセージを表示するテーマを固定する</string>
-  <string name="settings_messageview_mobile_layout_label">凝縮レイアウト</string>
-  <string name="settings_messageview_mobile_layout_summary">小さい画面用にHTMLメッセージを再構成</string>
   <string name="setting_language_system">システム設定</string>
   <string name="background_ops_label">バックグラウンド同期</string>
   <string name="background_ops_never">使用しない</string>
   <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="batch_select_all">全選択</string>
   <string name="account_setup_push_limit_label">プッシュ受信の最大フォルダ数</string>

res/values-ko/strings.xml

@@ -415,8 +415,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="account_settings_notify_self_summary">내가 보낸 메시지에 대해 알림 보기</string>
   <string name="account_settings_notification_opens_unread_label">읽지 않은 메일에 대해 알림</string>
   <string name="account_settings_notification_opens_unread_summary">알림을 열 때 읽지 않은 메일을 찾습니다</string>
-  <string name="account_settings_notification_unread_count_label">읽지 않은 메일 수 세기</string>
-  <string name="account_settings_notification_unread_count_summary">읽지 않은 메시지의 수를 상태바에 보여 줍니다</string>
   <string name="account_settings_mark_message_as_read_on_view_label">열어서 메시지를 읽은 것으로 표시</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">메시지를 열면 읽은 것으로 표시합니다</string>
   <string name="account_settings_show_pictures_label">항상 그림 보기</string>
@@ -642,14 +640,10 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="settings_message_theme_selection_label">별도의 메시지 보기 테마</string>
   <string name="settings_message_theme_selection_summary_off">메시지 보기에 별도의 테마를 사용</string>
   <string name="settings_message_theme_selection_summary_on">고정 테마 사용</string>
-  <string name="settings_messageview_mobile_layout_label">한 칸에 표시</string>
-  <string name="settings_messageview_mobile_layout_summary">작은 화면에서 HTML 메시지를 재구성</string>
   <string name="setting_language_system">시스템 기본값</string>
   <string name="background_ops_label">백그라운드 동기화</string>
   <string name="background_ops_never">하지 않음</string>
   <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="batch_select_all">모두 선택</string>
   <string name="account_setup_push_limit_label">푸시할 때 점검할 최대 폴더 수</string>

res/values-lt/strings.xml

@@ -418,8 +418,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="account_settings_notify_self_summary">Rodyti pranešimą mano išsiųstiems laiškams</string>
   <string name="account_settings_notification_opens_unread_label">Pranešimas atveria neskaitytus laiškus</string>
   <string name="account_settings_notification_opens_unread_summary">Atvėrus pranešimą ieško neskaitytų laiškų</string>
-  <string name="account_settings_notification_unread_count_label">Rodyti neskaitytų skaičių</string>
-  <string name="account_settings_notification_unread_count_summary">Pranešimų juostoje rodyti neskaitytų laiškų skaičių.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Atvėrus pažymėti kaip skaitytą</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Kai laiškas atveriamas peržiūrai pažymėti jį kaip skaitytą</string>
   <string name="account_settings_show_pictures_label">Visada rodyti paveikslėlius</string>
@@ -645,14 +643,10 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="settings_message_theme_selection_label">Numatyta laiško tema</string>
   <string name="settings_message_theme_selection_summary_off">Peržiūrint laišką, pasirinkti laiško peržiūros temą</string>
   <string name="settings_message_theme_selection_summary_on">Naudoti numatytą laiškų peržiūros temą</string>
-  <string name="settings_messageview_mobile_layout_label">Glaudus išdėstymas</string>
-  <string name="settings_messageview_mobile_layout_summary">Performatuoti HTML laiškus mažesniems ekranams</string>
   <string name="setting_language_system">Sistemos numatyta</string>
   <string name="background_ops_label">Sinchronizuoti fone</string>
   <string name="background_ops_never">Niekada</string>
   <string name="background_ops_always">Visada</string>
-  <string name="background_ops_enabled">Kai pažymėta „Fono duomenys“</string>
-  <string name="background_ops_auto_sync">Kai pažymėta „Fono duomenys“ ir „Automatinis sinchronizavimas“</string>
   <string name="background_ops_auto_sync_only">Kai pažymėtas „automatinis sinchronizavimas“</string>
   <string name="batch_select_all">Pasirinkti viską</string>
   <string name="account_setup_push_limit_label">Kiek daugiausia aplankų tikrinti siunčiant</string>

res/values-nl/strings.xml

@@ -416,8 +416,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="account_settings_notify_self_summary">Notificatie ook voor mail verzonden vanaf een identiteit</string>
   <string name="account_settings_notification_opens_unread_label">Notificatie opent ongelezen berichten</string>
   <string name="account_settings_notification_opens_unread_summary">Zoekt voor ongelezen berichten wanneer Notificatie is geopend</string>
-  <string name="account_settings_notification_unread_count_label">Toon aantal ongelezen</string>
-  <string name="account_settings_notification_unread_count_summary">Toon het aantal ongelezen berichten in de \'notification bar\'.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Markeer als gelezen als geopend</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Markeer als gelezen wanneer ingezien</string>
   <string name="account_settings_show_pictures_label">Laat afbeeldingen automatisch zien</string>
@@ -643,14 +641,10 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="settings_message_theme_selection_label">Vast berichten thema</string>
   <string name="settings_message_theme_selection_summary_off">Kies het thema tijdens het bekijken van het bericht</string>
   <string name="settings_message_theme_selection_summary_on">Gebruik een vast thema om het bericht te bekijken</string>
-  <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="setting_language_system">Volgens systeem</string>
   <string name="background_ops_label">Achtergrond sync</string>
   <string name="background_ops_never">Nooit</string>
   <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>
   <string name="background_ops_auto_sync_only">Als \'Auto-sync\' geselecteerd is</string>
   <string name="batch_select_all">Selecteer alle</string>
   <string name="account_setup_push_limit_label">Max mappen om te controleren met push</string>

res/values-pl/strings.xml

@@ -416,8 +416,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="account_settings_notify_self_summary">Powiadamiaj również o wiadomościach, które sam wysłałem</string>
   <string name="account_settings_notification_opens_unread_label">Nowe nieprzeczytane</string>
   <string name="account_settings_notification_opens_unread_summary">Powiadomienie o nieprzeczytanych wiadomościach</string>
-  <string name="account_settings_notification_unread_count_label">Liczba nieprzeczytanych</string>
-  <string name="account_settings_notification_unread_count_summary">Pokaż liczbę nieprzeczytanych wiadomości w pasku powiadomień</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Oznacz jako przeczytane</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Oznacz wiadomość jako przeczytaną przy otwieraniu</string>
   <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
@@ -643,14 +641,10 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="settings_message_theme_selection_label">Stała kolorystyka widoku wiadomości</string>
   <string name="settings_message_theme_selection_summary_off">Wybierz kolorystykę z poziomu widoku wiadomości</string>
   <string name="settings_message_theme_selection_summary_on">Użyj kolorystyki wskazanej w konfiguracji</string>
-  <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="setting_language_system">Domyślny systemowy</string>
   <string name="background_ops_label">Synchronizacja w tle</string>
   <string name="background_ops_never">Nigdy</string>
   <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>
   <string name="background_ops_auto_sync_only">Gdy \'Autosynchronizacja\' jest włączona</string>
   <string name="batch_select_all">Zaznacz wszystko</string>
   <string name="account_setup_push_limit_label">Sprawdzanie przez Push</string>

res/values-pt-rBR/strings.xml

@@ -415,8 +415,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="account_settings_notify_self_summary">Mostrar avisos para mensagens que eu envio</string>
   <string name="account_settings_notification_opens_unread_label">Avisos abrem mensagens não lidas</string>
   <string name="account_settings_notification_opens_unread_summary">Procurar por mensagens não lidas quando o aviso for aberto</string>
-  <string name="account_settings_notification_unread_count_label">Mostrar contagem de não lidas</string>
-  <string name="account_settings_notification_unread_count_summary">Mostrar o número de mensagens não lidas na barra de notificação.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensagem como lida ao abrir</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marcar a mensagem como lida ao abrir e visualizar</string>
   <string name="account_settings_show_pictures_label">Sempre mostrar imagens</string>
@@ -639,14 +637,10 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="settings_message_theme_selection_label">Tema fixo de mensagens</string>
   <string name="settings_message_theme_selection_summary_off">Selecionar o tema de visualização ao visualizar a mensagem</string>
   <string name="settings_message_theme_selection_summary_on">Usar um tema fixo para visualizar mensagens</string>
-  <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="setting_language_system">Padrões de sistema</string>
   <string name="background_ops_label">Sincronização em segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
-  <string name="background_ops_enabled">Quando \'Dados em segundo plano\' estiverem ativados</string>
-  <string name="background_ops_auto_sync">Quando \'Dados de segundo plano\' e \'Auto-sinc\' estiverem ativados</string>
   <string name="background_ops_auto_sync_only">Quando \'Auto-sinc\' estiver ativada</string>
   <string name="batch_select_all">Selecionar todos</string>
   <string name="account_setup_push_limit_label">Máximo de pastas para verificar com push</string>

res/values-ru/strings.xml

@@ -425,8 +425,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_settings_notify_self_summary">Показать уведомление при отправке почты</string>
   <string name="account_settings_notification_opens_unread_label">Перейти в непрочитанные</string>
   <string name="account_settings_notification_opens_unread_summary">Перейти к непрочитанным сообщениям при нажатии на уведомление</string>
-  <string name="account_settings_notification_unread_count_label">Счётчик непрочитанных</string>
-  <string name="account_settings_notification_unread_count_summary">Показать количество непрочитанных в панели уведомлений</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Открытое прочитано</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Отметить сообщение прочитанным после просмотра</string>
   <string name="account_settings_show_pictures_label">Показать изображения</string>
@@ -652,14 +650,10 @@ K-9 Mail — почтовый клиент для Android.
   <string name="settings_message_theme_selection_label">Фиксированный просмотр</string>
   <string name="settings_message_theme_selection_summary_off">Разрешить выбор темы при чтении сообщения</string>
   <string name="settings_message_theme_selection_summary_on">Отключить выбор темы при чтении сообщения</string>
-  <string name="settings_messageview_mobile_layout_label">Компактный вид</string>
-  <string name="settings_messageview_mobile_layout_summary">Перекомпоновка HTML-сообщений на небольших экранах</string>
   <string name="setting_language_system">По умолчанию</string>
   <string name="background_ops_label">Фоновая синхронизация</string>
   <string name="background_ops_never">Никогда</string>
   <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="batch_select_all">Выбрать все</string>
   <string name="account_setup_push_limit_label">Лимит push-проверки</string>

res/values-sk/strings.xml

@@ -425,8 +425,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_notify_self_summary">Zobraziť oznámenie pre odoslané správy</string>
   <string name="account_settings_notification_opens_unread_label">Oznámenie otvorí neprečítané správy</string>
   <string name="account_settings_notification_opens_unread_summary">Po otvorení oznámenia zobraziť neprečítané správy</string>
-  <string name="account_settings_notification_unread_count_label">Zobraziť počet neprečítaných</string>
-  <string name="account_settings_notification_unread_count_summary">Zobraziť počet neprečítaných správ v notifikačnej lište</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Po otvorení označiť ako prečítané</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Označiť správu ako prečítanú po jej otvorení na zobrazenie</string>
   <string name="account_settings_show_pictures_label">Vždy zobraziť obrázky</string>
@@ -652,14 +650,10 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="settings_message_theme_selection_label">Pevná téma správ</string>
   <string name="settings_message_theme_selection_summary_off">Vybrať tému pri prehliadaní správ</string>
   <string name="settings_message_theme_selection_summary_on">Použiť pevnú tému pri prehliadaní správ</string>
-  <string name="settings_messageview_mobile_layout_label">Úprava usporiadania</string>
-  <string name="settings_messageview_mobile_layout_summary">Preformátovať HTML správy pre menšie obrazovky</string>
   <string name="setting_language_system">Predvolený systémom</string>
   <string name="background_ops_label">Synchronizácia na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <string name="background_ops_always">Vždy</string>
-  <string name="background_ops_enabled">Keď je možnosť \'Dáta na pozadí\" zaškrtnutá</string>
-  <string name="background_ops_auto_sync">Keď sú možnosti \'Dáta na pozadí\' &amp; \'Automatická synchronizácia\' zaškrtnuté</string>
   <string name="background_ops_auto_sync_only">Keď je možnosť \'Automatická synchronizácia\'  zaškrtnutá</string>
   <string name="batch_select_all">Vybrať všetko</string>
   <string name="account_setup_push_limit_label">Maximálny počet priečinkov na kontrolu pomocou push</string>

res/values-sv/strings.xml

@@ -417,8 +417,6 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <string name="account_settings_notify_self_summary">Notifiera även för e-post som jag själv har skickat</string>
   <string name="account_settings_notification_opens_unread_label">Notifieringar öppnar oläst e-post</string>
   <string name="account_settings_notification_opens_unread_summary">Letar efter oläst e-post när notifieringen öppnas</string>
-  <string name="account_settings_notification_unread_count_label">Visa antal olästa</string>
-  <string name="account_settings_notification_unread_count_summary">Visar antalet olästa brev i notifieringsytan.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Markera som läst vid visning</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Markera ett meddelande som läst när det visas</string>
   <string name="account_settings_show_pictures_label">Visa bilder automatiskt</string>
@@ -644,14 +642,10 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <string name="settings_message_theme_selection_label">Fast meddelandetema</string>
   <string name="settings_message_theme_selection_summary_off">Välj tema för meddelandevyn medan meddelandet visas</string>
   <string name="settings_message_theme_selection_summary_on">Använd ett fast tema för meddelandevyn</string>
-  <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="setting_language_system">Systemstandard</string>
   <string name="background_ops_label">Bakgrundssynkronisering</string>
   <string name="background_ops_never">Aldrig</string>
   <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>
   <string name="background_ops_auto_sync_only">Endast när \'Auto-sync\' är aktiverad</string>
   <string name="batch_select_all">Markera alla</string>
   <string name="account_setup_push_limit_label">Max antal mappar att kontrollera med push</string>

res/values-tr/strings.xml

@@ -381,8 +381,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="account_settings_notify_self_summary">Gönderdiğim mesajlar için bir bildirim göster</string>
   <string name="account_settings_notification_opens_unread_label">Okunmamış mesaj bildirimi açık</string>
   <string name="account_settings_notification_opens_unread_summary">Bildirim açık olduğunda okunmamış mesajlar için arama yap</string>
-  <string name="account_settings_notification_unread_count_label">Okunmamış sayısını göster</string>
-  <string name="account_settings_notification_unread_count_summary">Bildirim çubuğunda okunmamış mesaj numarasını göster.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Mesaj açılırken okundu işaretle</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Mesaj okunmak üzere açıldığında okundu olarak işaretle</string>
   <string name="account_settings_show_pictures_label">Daima resimleri göster</string>
@@ -595,14 +593,10 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="messageview_preferences">Mesajlar</string>
   <string name="settings_theme_label">Tema</string>
   <string name="settings_language_label">Dil</string>
-  <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="setting_language_system">Sistem Varsayılanları</string>
   <string name="background_ops_label">Arkaplan senkronizasyonu</string>
   <string name="background_ops_never">Asla</string>
   <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>
   <string name="batch_select_all">Hepsini Seç</string>
   <string name="account_setup_push_limit_label">Push ile en fazla kontrol edilecek klasör sayısı</string>
   <string name="account_setup_push_limit_10">10 klasör</string>

res/values-uk/strings.xml

@@ -415,8 +415,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_settings_notify_self_summary">Показати сповіщення про надіслані мною повідомлення</string>
   <string name="account_settings_notification_opens_unread_label">Сповіщати про відкриття непрочитаних повідомлень</string>
   <string name="account_settings_notification_opens_unread_summary">Шукати непрочитані повідомлення, коли сповіщення відкрито</string>
-  <string name="account_settings_notification_unread_count_label">Показувати кількість непрочитаних</string>
-  <string name="account_settings_notification_unread_count_summary">Показувати кількість непрочитаних повідомлень у рядку сповіщень.</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Відмічати повідомлення як прочитане під час відкриття</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Відмічати повідомлення як прочитане під час відкриття для перегляду</string>
   <string name="account_settings_show_pictures_label">Завжди показувати зображення</string>
@@ -641,14 +639,10 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="settings_language_label">Мова</string>
   <string name="settings_message_theme_selection_label">Встановити тему повідомлення</string>
   <string name="settings_message_theme_selection_summary_off">Виберіть перегляд теми повідомлення під час перегляду повідомлення</string>
-  <string name="settings_messageview_mobile_layout_label">режим одного стовпця</string>
-  <string name="settings_messageview_mobile_layout_summary">Форматування HTML повідомлення для маленького екрану</string>
   <string name="setting_language_system">Системна по замовчуванню</string>
   <string name="background_ops_label">Фонова синхронізація</string>
   <string name="background_ops_never">Ніколи</string>
   <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="batch_select_all">Вибрати усе</string>
   <string name="account_setup_push_limit_label">Найбільша кількість папок для перевірки з push</string>

res/values-zh-rCN/strings.xml

@@ -415,8 +415,6 @@ K-9改进的功能包括：
   <string name="account_settings_notify_self_summary">发送邮件时显示通知</string>
   <string name="account_settings_notification_opens_unread_label">点击通知后打开未读邮件</string>
   <string name="account_settings_notification_opens_unread_summary">点击通知后搜索未读邮件</string>
-  <string name="account_settings_notification_unread_count_label">显示未读邮件数量</string>
-  <string name="account_settings_notification_unread_count_summary">在通知栏显示未读邮件数量</string>
   <string name="account_settings_mark_message_as_read_on_view_label">邮件打开时标记为已读</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">当邮件打开时标记为已读</string>
   <string name="account_settings_show_pictures_label">显示图片</string>
@@ -642,14 +640,10 @@ K-9改进的功能包括：
   <string name="settings_message_theme_selection_label">固定消息主题</string>
   <string name="settings_message_theme_selection_summary_off">在查看消息时选择消息查看主题</string>
   <string name="settings_message_theme_selection_summary_on">使用固定消息查看主题</string>
-  <string name="settings_messageview_mobile_layout_label">单列布局</string>
-  <string name="settings_messageview_mobile_layout_summary">为小屏幕重新布局HTML邮件</string>
   <string name="setting_language_system">系统默认值</string>
   <string name="background_ops_label">后台同步</string>
   <string name="background_ops_never">从不</string>
   <string name="background_ops_always">总是</string>
-  <string name="background_ops_enabled">当“后台数据”被选中</string>
-  <string name="background_ops_auto_sync">当“后台数据”&amp;“自动同步”被选中</string>
   <string name="background_ops_auto_sync_only">当“自动同步”已选定</string>
   <string name="batch_select_all">选择全部</string>
   <string name="account_setup_push_limit_label">推送时最多检查文件夹数量</string>

res/values-zh-rTW/strings.xml

@@ -387,8 +387,6 @@
   <string name="account_settings_notify_self_summary">寄送郵件時顯示通知</string>
   <string name="account_settings_notification_opens_unread_label">點擊通知後打開未讀郵件</string>
   <string name="account_settings_notification_opens_unread_summary">點擊通知後搜尋未讀郵件</string>
-  <string name="account_settings_notification_unread_count_label">顯示未讀郵件數</string>
-  <string name="account_settings_notification_unread_count_summary">在通知欄上顯示未讀郵件數</string>
   <string name="account_settings_mark_message_as_read_on_view_label">開啟自動標記已讀</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">開啟檢視郵件內容時自動標記為已讀</string>
   <string name="account_settings_show_pictures_label">顯示圖片</string>
@@ -614,14 +612,10 @@
   <string name="settings_message_theme_selection_label">固定訊息主題</string>
   <string name="settings_message_theme_selection_summary_off">讀取訊息內容時顯示訊息檢視主題</string>
   <string name="settings_message_theme_selection_summary_on">使用固定訊息檢視主題</string>
-  <string name="settings_messageview_mobile_layout_label">單列佈局</string>
-  <string name="settings_messageview_mobile_layout_summary">針對小尺寸螢幕重新排列HTML郵件格式</string>
   <string name="setting_language_system">系統預設值</string>
   <string name="background_ops_label">背景同步</string>
   <string name="background_ops_never">不要</string>
   <string name="background_ops_always">預設</string>
-  <string name="background_ops_enabled">當「背景資料」被勾選</string>
-  <string name="background_ops_auto_sync">當「背景資料」&amp;「自動同步」被勾選</string>
   <string name="background_ops_auto_sync_only">當「自動同步」被勾選</string>
   <string name="batch_select_all">選擇全部</string>
   <string name="account_setup_push_limit_label">推送時檢查信件匣上限數量</string>

res/values/arrays.xml

@@ -522,16 +522,13 @@
         <item>global</item>
     </string-array>
 
-    <!-- Note: If you change this make sure the code in Prefs.java is still working -->
     <string-array name="background_ops_entries">
-        <item>@string/background_ops_enabled</item>
+        <item>@string/background_ops_auto_sync_only</item>
-        <item>@string/background_ops_auto_sync</item>
         <item>@string/background_ops_always</item>
         <item>@string/background_ops_never</item>
     </string-array>
 
     <string-array name="background_ops_values" translatable="false">
-        <item>WHEN_CHECKED</item>
         <item>WHEN_CHECKED_AUTO_SYNC</item>
         <item>ALWAYS</item>
         <item>NEVER</item>

res/values/strings.xml

@@ -512,8 +512,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_settings_notify_self_summary">Show a notification for messages I sent</string>
     <string name="account_settings_notification_opens_unread_label">Notification opens unread messages</string>
     <string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string>
-    <string name="account_settings_notification_unread_count_label">Show unread count</string>
-    <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>
     <string name="account_settings_mark_message_as_read_on_view_label">Mark as read when opened</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>
 
@@ -792,16 +790,12 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="settings_message_theme_selection_summary_off">Select the message view theme while viewing the message</string>
     <string name="settings_message_theme_selection_summary_on">Use a fixed message view theme</string>
 
-    <string name="settings_messageview_mobile_layout_label">Condensed layout</string>
-    <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>
 
     <string name="setting_language_system">System default</string>
 
     <string name="background_ops_label">Background sync</string>
     <string name="background_ops_never">Never</string>
     <string name="background_ops_always">Always</string>
-    <string name="background_ops_enabled">When \'Background data\' is checked</string>
-    <string name="background_ops_auto_sync">When \'Background data\' &amp; \'Auto-sync\' are checked</string>
     <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>
 
     <string name="batch_select_all">Select all</string>

res/xml/account_settings_preferences.xml

@@ -421,13 +421,6 @@
             android:defaultValue="true"
             android:summary="@string/account_settings_notification_opens_unread_summary" />
 
-        <CheckBoxPreference
-            android:persistent="false"
-            android:key="notification_unread_count"
-            android:title="@string/account_settings_notification_unread_count_label"
-            android:defaultValue="true"
-            android:summary="@string/account_settings_notification_unread_count_summary" />
-
     </PreferenceScreen>
 
     <PreferenceScreen

res/xml/global_preferences.xml

@@ -236,12 +236,6 @@
                 android:positiveButtonText="@android:string/ok"
                 android:negativeButtonText="@android:string/cancel" />
 
-            <CheckBoxPreference
-                android:persistent="false"
-                android:key="messageview_mobile_layout"
-                android:title="@string/settings_messageview_mobile_layout_label"
-                android:summary="@string/settings_messageview_mobile_layout_summary" />
-
             <CheckBoxPreference
                 android:persistent="false"
                 android:key="messageview_autofit_width"

src/com/fsck/k9/Account.java

@@ -187,7 +187,6 @@ public class Account implements BaseAccount {
     private int mMaxPushFolders;
     private int mIdleRefreshMinutes;
     private boolean goToUnreadMessageSearch;
-    private boolean mNotificationShowsUnreadCount;
     private final Map<String, Boolean> compressionMap = new ConcurrentHashMap<String, Boolean>();
     private Searchable searchableFolders;
     private boolean subscribedFoldersOnly;
@@ -291,7 +290,6 @@ public class Account implements BaseAccount {
         mMaxPushFolders = 10;
         mChipColor = pickColor(context);
         goToUnreadMessageSearch = false;
-        mNotificationShowsUnreadCount = true;
         subscribedFoldersOnly = false;
         maximumPolledMessageAge = -1;
         maximumAutoDownloadMessageSize = 32768;
@@ -398,7 +396,6 @@ public class Account implements BaseAccount {
 
         mMaxPushFolders = prefs.getInt(mUuid + ".maxPushFolders", 10);
         goToUnreadMessageSearch = prefs.getBoolean(mUuid + ".goToUnreadMessageSearch", false);
-        mNotificationShowsUnreadCount = prefs.getBoolean(mUuid + ".notificationUnreadCount", true);
         subscribedFoldersOnly = prefs.getBoolean(mUuid + ".subscribedFoldersOnly", false);
         maximumPolledMessageAge = prefs.getInt(mUuid + ".maximumPolledMessageAge", -1);
         maximumAutoDownloadMessageSize = prefs.getInt(mUuid + ".maximumAutoDownloadMessageSize", 32768);
@@ -566,7 +563,6 @@ public class Account implements BaseAccount {
         editor.remove(mUuid + ".led");
         editor.remove(mUuid + ".ledColor");
         editor.remove(mUuid + ".goToUnreadMessageSearch");
-        editor.remove(mUuid + ".notificationUnreadCount");
         editor.remove(mUuid + ".subscribedFoldersOnly");
         editor.remove(mUuid + ".maximumPolledMessageAge");
         editor.remove(mUuid + ".maximumAutoDownloadMessageSize");
@@ -732,7 +728,6 @@ public class Account implements BaseAccount {
         editor.putString(mUuid + ".searchableFolders", searchableFolders.name());
         editor.putInt(mUuid + ".chipColor", mChipColor);
         editor.putBoolean(mUuid + ".goToUnreadMessageSearch", goToUnreadMessageSearch);
-        editor.putBoolean(mUuid + ".notificationUnreadCount", mNotificationShowsUnreadCount);
         editor.putBoolean(mUuid + ".subscribedFoldersOnly", subscribedFoldersOnly);
         editor.putInt(mUuid + ".maximumPolledMessageAge", maximumPolledMessageAge);
         editor.putInt(mUuid + ".maximumAutoDownloadMessageSize", maximumAutoDownloadMessageSize);
@@ -1524,14 +1519,6 @@ public class Account implements BaseAccount {
         this.goToUnreadMessageSearch = goToUnreadMessageSearch;
     }
 
-    public boolean isNotificationShowsUnreadCount() {
-        return mNotificationShowsUnreadCount;
-    }
-
-    public void setNotificationShowsUnreadCount(boolean notificationShowsUnreadCount) {
-        this.mNotificationShowsUnreadCount = notificationShowsUnreadCount;
-    }
-
     public synchronized boolean subscribedFoldersOnly() {
         return subscribedFoldersOnly;
     }

src/com/fsck/k9/K9.java

@@ -102,7 +102,7 @@ public class K9 extends Application {
     private static boolean sInitialized = false;
 
     public enum BACKGROUND_OPS {
-        WHEN_CHECKED, ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
+        ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
     }
 
     private static String language = "";
@@ -113,7 +113,7 @@ public class K9 extends Application {
 
     private static final FontSizes fontSizes = new FontSizes();
 
-    private static BACKGROUND_OPS backgroundOps = BACKGROUND_OPS.WHEN_CHECKED;
+    private static BACKGROUND_OPS backgroundOps = BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC;
     /**
      * Some log messages can be sent to a file, so that the logs
      * can be read using unprivileged access (eg. Terminal Emulator)
@@ -255,7 +255,6 @@ public class K9 extends Application {
     private static boolean mMeasureAccounts = true;
     private static boolean mCountSearchMessages = true;
     private static boolean mHideSpecialAccounts = false;
-    private static boolean mMobileOptimizedLayout = false;
     private static boolean mAutofitWidth;
     private static boolean mQuietTimeEnabled = false;
     private static String mQuietTimeStarts = null;
@@ -509,12 +508,11 @@ public class K9 extends Application {
     public static void save(SharedPreferences.Editor editor) {
         editor.putBoolean("enableDebugLogging", K9.DEBUG);
         editor.putBoolean("enableSensitiveLogging", K9.DEBUG_SENSITIVE);
-        editor.putString("backgroundOperations", K9.backgroundOps.toString());
+        editor.putString("backgroundOperations", K9.backgroundOps.name());
         editor.putBoolean("animations", mAnimations);
         editor.putBoolean("gesturesEnabled", mGesturesEnabled);
         editor.putBoolean("useVolumeKeysForNavigation", mUseVolumeKeysForNavigation);
         editor.putBoolean("useVolumeKeysForListNavigation", mUseVolumeKeysForListNavigation);
-        editor.putBoolean("mobileOptimizedLayout", mMobileOptimizedLayout);
         editor.putBoolean("autofitWidth", mAutofitWidth);
         editor.putBoolean("quietTimeEnabled", mQuietTimeEnabled);
         editor.putString("quietTimeStarts", mQuietTimeStarts);
@@ -733,7 +731,6 @@ public class K9 extends Application {
         mMessageListStars = sprefs.getBoolean("messageListStars", true);
         mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
 
-        mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
         mAutofitWidth = sprefs.getBoolean("autofitWidth", true);
 
         mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false);
@@ -795,9 +792,11 @@ public class K9 extends Application {
         fontSizes.load(sprefs);
 
         try {
-            setBackgroundOps(BACKGROUND_OPS.valueOf(sprefs.getString("backgroundOperations", "WHEN_CHECKED")));
+            setBackgroundOps(BACKGROUND_OPS.valueOf(sprefs.getString(
+                    "backgroundOperations",
+                    BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC.name())));
         } catch (Exception e) {
-            setBackgroundOps(BACKGROUND_OPS.WHEN_CHECKED);
+            setBackgroundOps(BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC);
         }
 
         sColorizeMissingContactPictures = sprefs.getBoolean("colorizeMissingContactPictures", true);
@@ -978,14 +977,6 @@ public class K9 extends Application {
         mUseVolumeKeysForListNavigation = enabled;
     }
 
-    public static boolean mobileOptimizedLayout() {
-        return mMobileOptimizedLayout;
-    }
-
-    public static void setMobileOptimizedLayout(boolean mobileOptimizedLayout) {
-        mMobileOptimizedLayout = mobileOptimizedLayout;
-    }
-
     public static boolean autofitWidth() {
         return mAutofitWidth;
     }

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

@@ -1,6 +1,5 @@
 package com.fsck.k9.activity;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -13,16 +12,7 @@ public class K9PreferenceActivity extends PreferenceActivity {
     @Override
     public void onCreate(Bundle icicle) {
         K9ActivityCommon.setLanguage(this, K9.getK9Language());
-
+        setTheme(K9.getK9ThemeResourceId());
-        if (Build.VERSION.SDK_INT >= 6 && Build.VERSION.SDK_INT < 14) {
-            // There's a display bug in all supported Android versions before 4.0 (SDK 14) which
-            // causes PreferenceScreens to have a black background.
-            // http://code.google.com/p/android/issues/detail?id=4611
-            setTheme(K9.getK9ThemeResourceId(K9.Theme.DARK));
-        } else {
-            setTheme(K9.getK9ThemeResourceId());
-        }
-
         super.onCreate(icicle);
     }
 

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

@@ -8,10 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -3697,7 +3695,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
         public List<String> getQueryParameters(String key) {
             final List<String> params = new ArrayList<String>();
-            for (String paramName : getQueryParameterNames()) {
+            for (String paramName : uri.getQueryParameterNames()) {
                 if (paramName.equalsIgnoreCase(key)) {
                     params.addAll(uri.getQueryParameters(paramName));
                 }
@@ -3705,25 +3703,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
             return params;
         }
 
-        @TargetApi(11)
-        private Set<String> getQueryParameterNames() {
-            if (Build.VERSION.SDK_INT >= 11) {
-                return uri.getQueryParameterNames();
-            }
-
-            return getQueryParameterNamesPreSdk11();
-        }
-
-        private Set<String> getQueryParameterNamesPreSdk11() {
-            if (mParamNames == null) {
-                String query = uri.getQuery();
-                Set<String> paramNames = new HashSet<String>();
-                Collections.addAll(paramNames, query.split("(=[^&]*(&|$))|&"));
-                mParamNames = paramNames;
-            }
-
-            return mParamNames;
-        }
     }
 
     private class SendMessageTask extends AsyncTask<Void, Void, Void> {

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

@@ -1391,20 +1391,6 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         }
     }
 
-    private void restartActivity() {
-        // restart the current activity, so that the theme change can be applied
-        if (Build.VERSION.SDK_INT < 11) {
-            Intent intent = getIntent();
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-            finish();
-            overridePendingTransition(0, 0); // disable animations to speed up the switch
-            startActivity(intent);
-            overridePendingTransition(0, 0);
-        } else {
-            recreate();
-        }
-    }
-
     @Override
     public void displayMessageSubject(String subject) {
         if (mDisplayMode == DisplayMode.MESSAGE_VIEW) {
@@ -1541,7 +1527,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             }
         }).start();
 
-        restartActivity();
+        recreate();
     }
 
     private void showDefaultTitleView() {

src/com/fsck/k9/activity/misc/ContactPictureLoader.java

@@ -9,7 +9,6 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -23,7 +22,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.support.v4.util.LruCache;
 import android.widget.QuickContactBadge;
 import com.fsck.k9.helper.Contacts;
@@ -103,15 +101,10 @@ public class ContactPictureLoader {
         final int cacheSize = 1024 * 1024 * memClass / 16;
 
         mBitmapCache = new LruCache<Address, Bitmap>(cacheSize) {
-            @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
             @Override
             protected int sizeOf(Address key, Bitmap bitmap) {
                 // The cache size will be measured in bytes rather than number of items.
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
+                return bitmap.getByteCount();
-                    return bitmap.getByteCount();
-                }
-
-                return bitmap.getRowBytes() * bitmap.getHeight();
             }
         };
     }
@@ -148,7 +141,7 @@ public class ContactPictureLoader {
                     calculateFallbackBitmap(address), task);
             badge.setImageDrawable(asyncDrawable);
             try {
-                task.exec();
+                task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             } catch (RejectedExecutionException e) {
                 // We flooded the thread pool queue... use a fallback picture
                 badge.setImageBitmap(calculateFallbackBitmap(address));
@@ -275,15 +268,6 @@ public class ContactPictureLoader {
             mAddress = new Address(address);
         }
 
-        @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-        public void exec(Void... args) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, args);
-            } else {
-                execute(args);
-            }
-        }
-
         public Address getAddress() {
             return mAddress;
         }

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

@@ -15,7 +15,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
@@ -61,7 +60,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_SCREEN_COMPOSING = "composing";
     private static final String PREFERENCE_SCREEN_INCOMING = "incoming_prefs";
     private static final String PREFERENCE_SCREEN_PUSH_ADVANCED = "push_advanced";
-    private static final String PREFERENCE_SCREEN_NOTIFICATIONS = "notifications";
     private static final String PREFERENCE_SCREEN_SEARCH = "search";
 
     private static final String PREFERENCE_DESCRIPTION = "account_description";
@@ -96,7 +94,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_CHIP_COLOR = "chip_color";
     private static final String PREFERENCE_LED_COLOR = "led_color";
     private static final String PREFERENCE_NOTIFICATION_OPENS_UNREAD = "notification_opens_unread";
-    private static final String PREFERENCE_NOTIFICATION_UNREAD_COUNT = "notification_unread_count";
     private static final String PREFERENCE_MESSAGE_AGE = "account_message_age";
     private static final String PREFERENCE_MESSAGE_SIZE = "account_autodownload_size";
     private static final String PREFERENCE_MESSAGE_FORMAT = "message_format";
@@ -162,7 +159,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private Preference mLedColor;
     private boolean mIncomingChanged = false;
     private CheckBoxPreference mNotificationOpensUnread;
-    private CheckBoxPreference mNotificationUnreadCount;
     private ListPreference mMessageFormat;
     private CheckBoxPreference mMessageReadReceipt;
     private ListPreference mQuoteStyle;
@@ -624,24 +620,6 @@ public class AccountSettings extends K9PreferenceActivity {
         mNotificationOpensUnread = (CheckBoxPreference)findPreference(PREFERENCE_NOTIFICATION_OPENS_UNREAD);
         mNotificationOpensUnread.setChecked(mAccount.goToUnreadMessageSearch());
 
-        CheckBoxPreference notificationUnreadCount =
-                (CheckBoxPreference) findPreference(PREFERENCE_NOTIFICATION_UNREAD_COUNT);
-
-        /*
-         * Honeycomb and newer don't show the notification number as overlay on the notification
-         * icon in the status bar, so we hide the setting.
-         *
-         * See http://code.google.com/p/android/issues/detail?id=21477
-         */
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            PreferenceScreen notificationsPrefs =
-                    (PreferenceScreen) findPreference(PREFERENCE_SCREEN_NOTIFICATIONS);
-            notificationsPrefs.removePreference(notificationUnreadCount);
-        } else {
-            notificationUnreadCount.setChecked(mAccount.isNotificationShowsUnreadCount());
-            mNotificationUnreadCount = notificationUnreadCount;
-        }
-
         new PopulateFolderPrefsTask().execute();
 
         mChipColor = findPreference(PREFERENCE_CHIP_COLOR);
@@ -781,9 +759,6 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccount.getNotificationSetting().setVibrateTimes(Integer.parseInt(mAccountVibrateTimes.getValue()));
         mAccount.getNotificationSetting().setLed(mAccountLed.isChecked());
         mAccount.setGoToUnreadMessageSearch(mNotificationOpensUnread.isChecked());
-        if (mNotificationUnreadCount != null) {
-            mAccount.setNotificationShowsUnreadCount(mNotificationUnreadCount.isChecked());
-        }
         mAccount.setFolderTargetMode(Account.FolderMode.valueOf(mTargetMode.getValue()));
         mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue()));
         if (mIsExpungeCapable) {

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

@@ -12,13 +12,11 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.widget.Toast;
@@ -38,7 +36,6 @@ import com.fsck.k9.preferences.CheckBoxListPreference;
 import com.fsck.k9.preferences.TimePickerPreference;
 
 import com.fsck.k9.service.MailService;
-import com.fsck.k9.view.MessageWebView;
 
 
 public class Prefs extends K9PreferenceActivity {
@@ -88,7 +85,6 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_HIDE_USERAGENT = "privacy_hide_useragent";
     private static final String PREFERENCE_HIDE_TIMEZONE = "privacy_hide_timezone";
 
-    private static final String PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT = "messageview_mobile_layout";
     private static final String PREFERENCE_AUTOFIT_WIDTH = "messageview_autofit_width";
     private static final String PREFERENCE_BACKGROUND_OPS = "background_ops";
     private static final String PREFERENCE_GALLERY_BUG_WORKAROUND = "use_gallery_bug_workaround";
@@ -136,7 +132,6 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mFixedWidth;
     private CheckBoxPreference mReturnToList;
     private CheckBoxPreference mShowNext;
-    private CheckBoxPreference mMobileOptimizedLayout;
     private CheckBoxPreference mAutofitWidth;
     private ListPreference mBackgroundOps;
     private CheckBoxPreference mUseGalleryBugWorkaround;
@@ -308,14 +303,6 @@ public class Prefs extends K9PreferenceActivity {
         mShowNext = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_SHOW_NEXT);
         mShowNext.setChecked(K9.messageViewShowNext());
 
-        mMobileOptimizedLayout = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT);
-        if (!MessageWebView.isSingleColumnLayoutSupported()) {
-            PreferenceCategory prefs = (PreferenceCategory) findPreference("messageview_preferences");
-            prefs.removePreference(mMobileOptimizedLayout);
-        } else {
-            mMobileOptimizedLayout.setChecked(K9.mobileOptimizedLayout());
-        }
-
         mAutofitWidth = (CheckBoxPreference) findPreference(PREFERENCE_AUTOFIT_WIDTH);
         mAutofitWidth.setChecked(K9.autofitWidth());
 
@@ -352,34 +339,7 @@ public class Prefs extends K9PreferenceActivity {
             mNotificationQuickDelete = null;
         }
 
-        mBackgroundOps = setupListPreference(PREFERENCE_BACKGROUND_OPS, K9.getBackgroundOps().toString());
+        mBackgroundOps = setupListPreference(PREFERENCE_BACKGROUND_OPS, K9.getBackgroundOps().name());
-        // In ICS+ there is no 'background data' setting that apps can chose to ignore anymore. So
-        // we hide that option for "Background Sync".
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            CharSequence[] oldEntries = mBackgroundOps.getEntries();
-            CharSequence[] newEntries = new CharSequence[3];
-            // Use "When 'Auto-sync' is checked" instead of "When 'Background data' & 'Auto-sync'
-            // are checked" as description.
-            newEntries[0] = getString(R.string.background_ops_auto_sync_only);
-            newEntries[1] = oldEntries[2];
-            newEntries[2] = oldEntries[3];
-
-            CharSequence[] oldValues = mBackgroundOps.getEntryValues();
-            CharSequence[] newValues = new CharSequence[3];
-            newValues[0] = oldValues[1];
-            newValues[1] = oldValues[2];
-            newValues[2] = oldValues[3];
-
-            mBackgroundOps.setEntries(newEntries);
-            mBackgroundOps.setEntryValues(newValues);
-
-            // Since ConnectivityManager.getBackgroundDataSetting() always returns 'true' on ICS+
-            // we map WHEN_CHECKED to ALWAYS.
-            if (K9.getBackgroundOps() == K9.BACKGROUND_OPS.WHEN_CHECKED) {
-                mBackgroundOps.setValue(K9.BACKGROUND_OPS.ALWAYS.toString());
-                mBackgroundOps.setSummary(mBackgroundOps.getEntry());
-            }
-        }
 
         mUseGalleryBugWorkaround = (CheckBoxPreference)findPreference(PREFERENCE_GALLERY_BUG_WORKAROUND);
         mUseGalleryBugWorkaround.setChecked(K9.useGalleryBugWorkaround());
@@ -510,7 +470,6 @@ public class Prefs extends K9PreferenceActivity {
         K9.setMessageViewFixedWidthFont(mFixedWidth.isChecked());
         K9.setMessageViewReturnToList(mReturnToList.isChecked());
         K9.setMessageViewShowNext(mShowNext.isChecked());
-        K9.setMobileOptimizedLayout(mMobileOptimizedLayout.isChecked());
         K9.setAutofitWidth(mAutofitWidth.isChecked());
         K9.setQuietTimeEnabled(mQuietTimeEnabled.isChecked());
 

src/com/fsck/k9/controller/MessagingController.java

@@ -59,7 +59,6 @@ import com.fsck.k9.activity.setup.AccountSetupIncoming;
 import com.fsck.k9.activity.setup.AccountSetupOutgoing;
 import com.fsck.k9.cache.EmailProviderCache;
 import com.fsck.k9.helper.Contacts;
-import com.fsck.k9.helper.NotificationBuilder;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Address;
@@ -2650,7 +2649,7 @@ public class MessagingController implements Runnable {
         final String title = context.getString(
                 R.string.notification_certificate_error_title, account.getDescription());
 
-        final NotificationCompat.Builder builder = new NotificationBuilder(context);
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
         builder.setSmallIcon(R.drawable.ic_notify_new_mail);
         builder.setWhen(System.currentTimeMillis());
         builder.setAutoCancel(true);
@@ -3348,7 +3347,7 @@ public class MessagingController implements Runnable {
         NotificationManager notifMgr =
             (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
 
-        NotificationCompat.Builder builder = new NotificationBuilder(mApplication);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mApplication);
         builder.setSmallIcon(R.drawable.ic_notify_check_mail);
         builder.setWhen(System.currentTimeMillis());
         builder.setOngoing(true);
@@ -3399,7 +3398,7 @@ public class MessagingController implements Runnable {
         NotificationManager notifMgr =
                 (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
 
-        NotificationCompat.Builder builder = new NotificationBuilder(mApplication);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mApplication);
         builder.setSmallIcon(R.drawable.ic_notify_new_mail);
         builder.setWhen(System.currentTimeMillis());
         builder.setAutoCancel(true);
@@ -3433,7 +3432,7 @@ public class MessagingController implements Runnable {
         final NotificationManager notifMgr =
                 (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
 
-        NotificationCompat.Builder builder = new NotificationBuilder(mApplication);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mApplication);
         builder.setSmallIcon(R.drawable.ic_notify_check_mail);
         builder.setWhen(System.currentTimeMillis());
         builder.setOngoing(true);
@@ -4770,12 +4769,6 @@ public class MessagingController implements Runnable {
         return summary;
     }
 
-    private static final boolean platformShowsNumberInNotification() {
-        // Honeycomb and newer don't show the number as overlay on the notification icon.
-        // However, the number will appear in the detailed notification view.
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
-    }
-
     public static final boolean platformSupportsExtendedNotifications() {
         // supported in Jellybean
         // TODO: use constant once target SDK is set to >= 16
@@ -4841,7 +4834,7 @@ public class MessagingController implements Runnable {
         NotificationManager notifMgr =
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
-        NotificationCompat.Builder builder = new NotificationBuilder(context);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
         builder.setSmallIcon(R.drawable.ic_notify_new_mail);
         builder.setWhen(System.currentTimeMillis());
         if (!updateSilently) {
@@ -4851,9 +4844,7 @@ public class MessagingController implements Runnable {
         final int newMessages = data.getNewMessageCount();
         final int unreadCount = data.unreadBeforeNotification + newMessages;
 
-        if (account.isNotificationShowsUnreadCount() || platformShowsNumberInNotification()) {
+        builder.setNumber(unreadCount);
-            builder.setNumber(unreadCount);
-        }
 
         String accountDescr = (account.getDescription() != null) ?
                 account.getDescription() : account.getEmail();

src/com/fsck/k9/fragment/MessageListFragment.java

@@ -2,6 +2,7 @@ package com.fsck.k9.fragment;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumMap;
@@ -150,7 +151,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
     private static final int FOLDER_NAME_COLUMN = 17;
     private static final int THREAD_COUNT_COLUMN = 18;
 
-    private static final String[] PROJECTION = Utility.copyOf(THREADED_PROJECTION,
+    private static final String[] PROJECTION = Arrays.copyOf(THREADED_PROJECTION,
             THREAD_COUNT_COLUMN);
 
 

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

@@ -1,38 +1,21 @@
 package com.fsck.k9.helper;
 
+import android.content.ClipData;
 import android.content.Context;
-import android.os.Build;
 
 
 /**
- * Helper class to access the system clipboard
+ * Access the system clipboard using the new {@link ClipboardManager} introduced with API 11
- *
- * @see ClipboardManagerApi1
- * @see ClipboardManagerApi11
  */
-public abstract class ClipboardManager {
+public class ClipboardManager {
-    /**
+
-     * Instance of the API-specific class that interfaces with the clipboard API.
-     */
     private static ClipboardManager sInstance = null;
 
-    /**
-     * Get API-specific instance of the {@code ClipboardManager} class
-     *
-     * @param context
-     *         A {@link Context} instance.
-     *
-     * @return Appropriate {@link ClipboardManager} instance for this device.
-     */
     public static ClipboardManager getInstance(Context context) {
         Context appContext = context.getApplicationContext();
 
         if (sInstance == null) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+            sInstance = new ClipboardManager(appContext);
-                sInstance = new ClipboardManagerApi1(appContext);
-            } else {
-                sInstance = new ClipboardManagerApi11(appContext);
-            }
         }
 
         return sInstance;
@@ -59,5 +42,10 @@ public abstract class ClipboardManager {
      * @param text
      *         The actual text to be copied to the clipboard.
      */
-    public abstract void setText(String label, String text);
+    public void setText(String label, String text) {
+        android.content.ClipboardManager clipboardManager =
+                (android.content.ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clip = ClipData.newPlainText(label, text);
+        clipboardManager.setPrimaryClip(clip);
+    }
 }

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

@@ -1,22 +0,0 @@
-package com.fsck.k9.helper;
-
-import android.content.Context;
-import android.text.ClipboardManager;
-
-/**
- * Access the system clipboard using the now deprecated {@link ClipboardManager}
- */
-@SuppressWarnings("deprecation")
-public class ClipboardManagerApi1 extends com.fsck.k9.helper.ClipboardManager {
-
-    public ClipboardManagerApi1(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void setText(String label, String text) {
-        ClipboardManager clipboardManager =
-                (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-        clipboardManager.setText(text);
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.fsck.k9.helper;
-
-import android.annotation.TargetApi;
-import android.content.ClipData;
-import android.content.Context;
-import android.content.ClipboardManager;
-
-/**
- * Access the system clipboard using the new {@link ClipboardManager} introduced with API 11
- */
-@TargetApi(11)
-public class ClipboardManagerApi11 extends com.fsck.k9.helper.ClipboardManager {
-
-    public ClipboardManagerApi11(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void setText(String label, String text) {
-        ClipboardManager clipboardManager =
-                (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clip = ClipData.newPlainText(label, text);
-        clipboardManager.setPrimaryClip(clip);
-    }
-}

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

@@ -19,7 +19,6 @@ package com.fsck.k9.helper;
 
 import java.util.Comparator;
 
-import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.database.CharArrayBuffer;
 import android.database.ContentObserver;
@@ -204,7 +203,6 @@ public class MergeCursor implements Cursor {
         return mActiveCursor.getString(columnIndex);
     }
 
-    @TargetApi(11)
     @Override
     public int getType(int columnIndex) {
         return mActiveCursor.getType(columnIndex);

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

@@ -1,38 +0,0 @@
-package com.fsck.k9.helper;
-
-import android.app.Notification;
-import android.content.Context;
-import android.os.Build;
-import android.support.v4.app.NotificationCompat;
-
-/**
- * Notification builder that will set {@link Notification#number} on pre-Honeycomb devices.
- *
- * @see <a href="http://code.google.com/p/android/issues/detail?id=38028">android - Issue 38028</a>
- */
-public class NotificationBuilder extends NotificationCompat.Builder {
-    protected int mNumber;
-
-
-    public NotificationBuilder(Context context) {
-        super(context);
-    }
-
-    @Override
-    public NotificationCompat.Builder setNumber(int number) {
-        super.setNumber(number);
-        mNumber = number;
-        return this;
-    }
-
-    @Override
-    public Notification build() {
-        Notification notification = super.build();
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-            notification.number = mNumber;
-        }
-
-        return notification;
-    }
-}

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

@@ -1,13 +1,11 @@
 
 package com.fsck.k9.helper;
 
-import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.Editable;
@@ -24,7 +22,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -698,19 +695,6 @@ public class Utility {
         return null;
     }
 
-    @SuppressLint("NewApi")
-    public static String[] copyOf(String[] original, int newLength) {
-        if (Build.VERSION.SDK_INT >= 9) {
-            return Arrays.copyOf(original, newLength);
-        }
-
-        String[] newArray = new String[newLength];
-        int copyLength = (original.length >= newLength) ? newLength : original.length;
-        System.arraycopy(original, 0, newArray, 0, copyLength);
-
-        return newArray;
-    }
-
     /**
      * @return a {@link Handler} tied to the main thread.
      */

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

@@ -129,9 +129,6 @@ public class AccountSettings {
         s.put("messageReadReceipt", Settings.versions(
                 new V(1, new BooleanSetting(Account.DEFAULT_MESSAGE_READ_RECEIPT))
             ));
-        s.put("notificationUnreadCount", Settings.versions(
-                new V(1, new BooleanSetting(true))
-            ));
         s.put("notifyMailCheck", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));

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

@@ -44,7 +44,7 @@ public class GlobalSettings {
             ));
         s.put("backgroundOperations", Settings.versions(
                 new V(1, new EnumSetting<K9.BACKGROUND_OPS>(
-                        K9.BACKGROUND_OPS.class, K9.BACKGROUND_OPS.WHEN_CHECKED))
+                        K9.BACKGROUND_OPS.class, K9.BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC))
             ));
         s.put("changeRegisteredNameColor", Settings.versions(
                 new V(1, new BooleanSetting(false))
@@ -154,9 +154,6 @@ public class GlobalSettings {
         s.put("messageViewShowNext", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
-        s.put("mobileOptimizedLayout", Settings.versions(
-                new V(1, new BooleanSetting(false))
-            ));
         s.put("quietTimeEnabled", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));

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

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

src/com/fsck/k9/provider/EmailProvider.java

@@ -18,7 +18,6 @@ import com.fsck.k9.mail.store.LockableDatabase.WrappedException;
 import com.fsck.k9.mail.store.UnavailableStorageException;
 import com.fsck.k9.search.SqlQueryBuilder;
 
-import android.annotation.TargetApi;
 import android.content.ContentProvider;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -797,7 +796,6 @@ public class EmailProvider extends ContentProvider {
             return super.getString(realColumnIndex);
         }
 
-        @TargetApi(11)
         @Override
         public int getType(int columnIndex) {
             int realColumnIndex = mColumnMapping[columnIndex];

src/com/fsck/k9/remotecontrol/K9RemoteControl.java

@@ -100,10 +100,9 @@ public class K9RemoteControl {
     /**
      * Key for the {@link Intent} Extra to set for controlling K-9's global "Background sync" setting.
      * Acceptable values are K9_BACKGROUND_OPERATIONS_ALWAYS, K9_BACKGROUND_OPERATIONS_NEVER
-     * K9_BACKGROUND_OPERATIONS_WHEN_CHECKED
+     * K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC
      */
     public final static String K9_BACKGROUND_OPERATIONS = "com.fsck.k9.K9RemoteControl.backgroundOperations";
-    public final static String K9_BACKGROUND_OPERATIONS_WHEN_CHECKED = "WHEN_CHECKED";
     public final static String K9_BACKGROUND_OPERATIONS_ALWAYS = "ALWAYS";
     public final static String K9_BACKGROUND_OPERATIONS_NEVER = "NEVER";
     public final static String K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC = "WHEN_CHECKED_AUTO_SYNC";

src/com/fsck/k9/service/BootReceiver.java

@@ -46,12 +46,6 @@ public class BootReceiver extends CoreReceiver {
                 MailService.actionReset(context, tmpWakeLockId);
                 tmpWakeLockId = null;
             }
-        } else if (ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED.equals(action)) {
-            K9.BACKGROUND_OPS bOps = K9.getBackgroundOps();
-            if (bOps == K9.BACKGROUND_OPS.WHEN_CHECKED || bOps == K9.BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC) {
-                MailService.actionReset(context, tmpWakeLockId);
-                tmpWakeLockId = null;
-            }
         } else if (FIRE_INTENT.equals(action)) {
             Intent alarmedIntent = intent.getParcelableExtra(ALARMED_INTENT);
             String alarmedAction = alarmedIntent.getAction();

src/com/fsck/k9/service/MailService.java

@@ -8,7 +8,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
 import android.os.IBinder;
 import android.util.Log;
 
@@ -86,14 +85,9 @@ public class MailService extends CoreService {
     public int startService(Intent intent, int startId) {
         long startTime = System.currentTimeMillis();
         boolean oldIsSyncDisabled = isSyncDisabled();
-        ConnectivityManager connectivityManager = (ConnectivityManager)getApplication().getSystemService(Context.CONNECTIVITY_SERVICE);
         boolean doBackground = true;
-        boolean backgroundData = false;
 
         final boolean hasConnectivity = Utility.hasConnectivity(getApplication());
-        if (connectivityManager != null) {
-            backgroundData = connectivityManager.getBackgroundDataSetting();
-        }
         boolean autoSync = ContentResolver.getMasterSyncAutomatically();
 
         K9.BACKGROUND_OPS bOps = K9.getBackgroundOps();
@@ -105,11 +99,8 @@ public class MailService extends CoreService {
             case ALWAYS:
                 doBackground = true;
                 break;
-            case WHEN_CHECKED:
-                doBackground = backgroundData;
-                break;
             case WHEN_CHECKED_AUTO_SYNC:
-                doBackground = backgroundData & autoSync;
+                doBackground = autoSync;
                 break;
         }
 

src/com/fsck/k9/service/RemoteControlService.java

@@ -113,8 +113,7 @@ public class RemoteControlService extends CoreService {
                         String backgroundOps = intent.getStringExtra(K9_BACKGROUND_OPERATIONS);
                         if (K9RemoteControl.K9_BACKGROUND_OPERATIONS_ALWAYS.equals(backgroundOps)
                                 || K9RemoteControl.K9_BACKGROUND_OPERATIONS_NEVER.equals(backgroundOps)
-                                || K9RemoteControl.K9_BACKGROUND_OPERATIONS_WHEN_CHECKED.equals(backgroundOps)
+                                || K9RemoteControl.K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC.equals(backgroundOps)) {
-                        || K9RemoteControl.K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC.equals(backgroundOps)) {
                             BACKGROUND_OPS newBackgroundOps = BACKGROUND_OPS.valueOf(backgroundOps);
                             boolean needsReset = K9.setBackgroundOps(newBackgroundOps);
                             needsPushRestart |= needsReset;

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

@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2010 The IDEAL Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.fsck.k9.view;
-
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.util.AttributeSet;
-import android.view.View;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.widget.TextView;
-
-import com.fsck.k9.activity.AccessibleEmailContentActivity;
-import com.fsck.k9.controller.MessagingListener;
-
-import java.util.Set;
-
-public class AccessibleWebView extends TextView {
-    private Context mContext;
-    private String mHtmlSource;
-    private WebView mDummyWebView;
-    private Set<MessagingListener> mListeners = null;
-
-    public AccessibleWebView(Context context) {
-        super(context);
-        init(context);
-    }
-
-    public AccessibleWebView(Context context, AttributeSet attributes) {
-        super(context, attributes);
-        init(context);
-    }
-
-    private void init(Context context) {
-        mContext = context;
-        mDummyWebView = new WebView(context);
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                diveIn();
-            }
-        });
-    }
-
-    public void loadData(String data, String mimeType, String encoding) {
-        mHtmlSource = data;
-        this.setText(Html.fromHtml(mHtmlSource, null, null));
-    }
-
-    public WebSettings getSettings() {
-        return mDummyWebView.getSettings();
-    }
-
-    public void setText(String text) {
-        this.setText(Html.fromHtml(text, null, null));
-
-        // Let everyone know that loading has finished.
-        if (mListeners != null) {
-            for (MessagingListener l : mListeners) {
-                l.messageViewFinished();
-            }
-        }
-    }
-
-    public boolean zoomIn() {
-        if (getTextSize() < 100) {
-            setTextSize(getTextSize() + 5);
-            return true;
-        }
-        return false;
-    }
-
-    public boolean zoomOut() {
-        if (getTextSize() > 5) {
-            setTextSize(getTextSize() - 5);
-            return true;
-        }
-        return false;
-    }
-
-    private void diveIn() {
-        Intent i = new Intent();
-        i.setClass(mContext, AccessibleEmailContentActivity.class);
-        i.putExtra("content", mHtmlSource);
-        mContext.startActivity(i);
-    }
-
-    public void setListeners(final Set<MessagingListener> listeners) {
-        this.mListeners = listeners;
-    }
-}

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

@@ -1,9 +1,7 @@
 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;
@@ -17,27 +15,6 @@ import com.fsck.k9.helper.HtmlConverter;
 public class MessageWebView extends RigidWebView {
 
 
-    /**
-     * Check whether the single column layout algorithm can be used on this version of Android.
-     *
-     * <p>
-     * Single column layout was broken on Android < 2.2 (see
-     * <a href="http://code.google.com/p/android/issues/detail?id=5024">issue 5024</a>).
-     * </p>
-     *
-     * <p>
-     * Android versions >= 3.0 have problems with unclickable links when single column layout is
-     * enabled (see
-     * <a href="http://code.google.com/p/android/issues/detail?id=34886">issue 34886</a>
-     * in Android's bug tracker, and
-     * <a href="http://code.google.com/p/k9mail/issues/detail?id=3820">issue 3820</a>
-     * in K-9 Mail's bug tracker).
-     */
-    public static boolean isSingleColumnLayoutSupported() {
-        return (Build.VERSION.SDK_INT > 7 && Build.VERSION.SDK_INT < 11);
-    }
-
-
     public MessageWebView(Context context) {
         super(context);
     }
@@ -101,13 +78,10 @@ public class MessageWebView extends RigidWebView {
         webSettings.setLoadsImagesAutomatically(true);
         webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
 
-        if (isSingleColumnLayoutSupported() && K9.mobileOptimizedLayout()) {
+        // TODO:  Review alternatives.  NARROW_COLUMNS is deprecated on KITKAT
-            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-        } else {
-            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-        }
 
-        disableOverscrolling();
+        setOverScrollMode(OVER_SCROLL_NEVER);
 
         webSettings.setTextZoom(K9.getFontSizes().getMessageViewContentAsPercent());
 
@@ -118,23 +92,13 @@ public class MessageWebView extends RigidWebView {
     /**
      * 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();
-            PackageManager pm = getContext().getPackageManager();
+        boolean supportsMultiTouch =
-            boolean supportsMultiTouch =
+                pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH) ||
-                    pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH) ||
+                pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT);
-                    pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT);
 
-            getSettings().setDisplayZoomControls(!supportsMultiTouch);
+        getSettings().setDisplayZoomControls(!supportsMultiTouch);
-        }
-    }
-
-    @TargetApi(9)
-    private void disableOverscrolling() {
-        if (Build.VERSION.SDK_INT >= 9) {
-            setOverScrollMode(OVER_SCROLL_NEVER);
-        }
     }
 
     /**

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

@@ -17,7 +17,6 @@
 
 package com.fsck.k9.view;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -124,7 +123,7 @@ public class NonLockingScrollView extends ScrollView {
 
     private final Rect sHitFrame = new Rect();
     private boolean isEventOverChild(MotionEvent ev, ArrayList<View> children) {
-        final int actionIndex = getActionIndex(ev);
+        final int actionIndex = ev.getActionIndex();
         final float x = ev.getX(actionIndex) + getScrollX();
         final float y = ev.getY(actionIndex) + getScrollY();
 
@@ -142,13 +141,6 @@ public class NonLockingScrollView extends ScrollView {
         return false;
     }
 
-    @SuppressLint("InlinedApi")
-    private static int getActionIndex(MotionEvent ev) {
-        // Equivalent to MotionEvent.getActionIndex() which is in API 8+
-        return ((ev.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK)
-                >> MotionEvent.ACTION_POINTER_INDEX_SHIFT);
-    }
-
     private static boolean canViewReceivePointerEvents(View child) {
         return child.getVisibility() == VISIBLE || (child.getAnimation() != null);
     }

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

@@ -6,19 +6,15 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLDecoder;
-import java.util.List;
-
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
@@ -91,11 +87,9 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     private static final int DISPLAY_NAME_INDEX = 1;
 
 
-    private boolean mScreenReaderEnabled;
     private MessageCryptoView mCryptoView;
     private MessageOpenPgpView mOpenPgpView;
     private MessageWebView mMessageContentView;
-    private AccessibleWebView mAccessibleMessageContentView;
     private MessageHeader mHeaderContainer;
     private LinearLayout mAttachments;
     private Button mShowHiddenAttachments;
@@ -118,7 +112,6 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     public void initialize(Fragment fragment) {
         Activity activity = fragment.getActivity();
         mMessageContentView = (MessageWebView) findViewById(R.id.message_content);
-        mAccessibleMessageContentView = (AccessibleWebView) findViewById(R.id.accessible_message_content);
         mMessageContentView.configure();
         activity.registerForContextMenu(mMessageContentView);
         mMessageContentView.setOnCreateContextMenuListener(this);
@@ -151,25 +144,15 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         mDownloadRemainder = (Button) findViewById(R.id.download_remainder);
         mDownloadRemainder.setVisibility(View.GONE);
         mAttachmentsContainer.setVisibility(View.GONE);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
+        mMessageContentView.setVisibility(View.VISIBLE);
-                isScreenReaderActive(activity)) {
-            // Only use the special screen reader mode on pre-ICS devices with active screen reader
-            mAccessibleMessageContentView.setVisibility(View.VISIBLE);
-            mMessageContentView.setVisibility(View.GONE);
-            mScreenReaderEnabled = true;
-        } else {
-            mAccessibleMessageContentView.setVisibility(View.GONE);
-            mMessageContentView.setVisibility(View.VISIBLE);
-            mScreenReaderEnabled = false;
 
-            // the HTC version of WebView tries to force the background of the
+        // the HTC version of WebView tries to force the background of the
-            // titlebar, which is really unfair.
+        // titlebar, which is really unfair.
-            TypedValue outValue = new TypedValue();
+        TypedValue outValue = new TypedValue();
-            getContext().getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
+        getContext().getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
-            mHeaderContainer.setBackgroundColor(outValue.data);
+        mHeaderContainer.setBackgroundColor(outValue.data);
-            // also set background of the whole view (including the attachments view)
+        // also set background of the whole view (including the attachments view)
-            setBackgroundColor(outValue.data);
+        setBackgroundColor(outValue.data);
-        }
 
         mShowHiddenAttachments.setOnClickListener(this);
         mShowMessageAction.setOnClickListener(this);
@@ -443,43 +426,6 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     }
 
 
-    private boolean isScreenReaderActive(Activity activity) {
-        final String SCREENREADER_INTENT_ACTION = "android.accessibilityservice.AccessibilityService";
-        final String SCREENREADER_INTENT_CATEGORY = "android.accessibilityservice.category.FEEDBACK_SPOKEN";
-        // Restrict the set of intents to only accessibility services that have
-        // the category FEEDBACK_SPOKEN (aka, screen readers).
-        Intent screenReaderIntent = new Intent(SCREENREADER_INTENT_ACTION);
-        screenReaderIntent.addCategory(SCREENREADER_INTENT_CATEGORY);
-        List<ResolveInfo> screenReaders = activity.getPackageManager().queryIntentServices(
-                                              screenReaderIntent, 0);
-        ContentResolver cr = activity.getContentResolver();
-        Cursor cursor = null;
-        int status = 0;
-        for (ResolveInfo screenReader : screenReaders) {
-            // All screen readers are expected to implement a content provider
-            // that responds to
-            // content://<nameofpackage>.providers.StatusProvider
-            cursor = cr.query(Uri.parse("content://" + screenReader.serviceInfo.packageName
-                                        + ".providers.StatusProvider"), null, null, null, null);
-            try {
-                if (cursor != null && cursor.moveToFirst()) {
-                    // These content providers use a special cursor that only has
-                    // one element,
-                    // an integer that is 1 if the screen reader is running.
-                    status = cursor.getInt(0);
-                    if (status == 1) {
-                        return true;
-                    }
-                }
-            } finally {
-                if (cursor != null) {
-                    cursor.close();
-                }
-            }
-        }
-        return false;
-    }
-
     public boolean showPictures() {
         return mShowPictures;
     }
@@ -640,12 +586,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     }
 
     private void loadBodyFromText(String emailText) {
-        if (mScreenReaderEnabled) {
+        mMessageContentView.setText(emailText);
-            mAccessibleMessageContentView.setText(emailText);
-        } else {
-            mMessageContentView.setText(emailText);
-        }
-
     }
 
     public void updateCryptoLayout(CryptoProvider cp, PgpData pgpData, Message message) {
@@ -710,14 +651,10 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     }
 
     public void zoom(KeyEvent event) {
-        if (mScreenReaderEnabled) {
+        if (event.isShiftPressed()) {
-            mAccessibleMessageContentView.zoomIn();
+            mMessageContentView.zoomIn();
         } else {
-            if (event.isShiftPressed()) {
+            mMessageContentView.zoomOut();
-                mMessageContentView.zoomIn();
-            } else {
-                mMessageContentView.zoomOut();
-            }
         }
     }