From 0fba273357c630067794ebcac0af71bbe4f12c30 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sat, 16 Aug 2014 20:03:22 -0400
Subject: [PATCH] Remove the obsolete "Condensed layout" preference

---
 res/values-ca/strings.xml                     |  2 --
 res/values-cs/strings.xml                     |  2 --
 res/values-da/strings.xml                     |  2 --
 res/values-de/strings.xml                     |  2 --
 res/values-el/strings.xml                     |  2 --
 res/values-es/strings.xml                     |  2 --
 res/values-eu/strings.xml                     |  2 --
 res/values-fi/strings.xml                     |  2 --
 res/values-fr/strings.xml                     |  2 --
 res/values-gl/strings.xml                     |  2 --
 res/values-hu/strings.xml                     |  2 --
 res/values-it/strings.xml                     |  2 --
 res/values-iw/strings.xml                     |  2 --
 res/values-ja/strings.xml                     |  2 --
 res/values-ko/strings.xml                     |  2 --
 res/values-lt/strings.xml                     |  2 --
 res/values-nl/strings.xml                     |  2 --
 res/values-pl/strings.xml                     |  2 --
 res/values-pt-rBR/strings.xml                 |  2 --
 res/values-ru/strings.xml                     |  2 --
 res/values-sk/strings.xml                     |  2 --
 res/values-sv/strings.xml                     |  2 --
 res/values-tr/strings.xml                     |  2 --
 res/values-uk/strings.xml                     |  2 --
 res/values-zh-rCN/strings.xml                 |  2 --
 res/values-zh-rTW/strings.xml                 |  2 --
 res/values/strings.xml                        |  2 --
 res/xml/global_preferences.xml                |  6 ----
 src/com/fsck/k9/K9.java                       | 11 --------
 src/com/fsck/k9/activity/setup/Prefs.java     | 13 ---------
 .../fsck/k9/preferences/GlobalSettings.java   |  3 --
 src/com/fsck/k9/view/MessageWebView.java      | 28 ++-----------------
 32 files changed, 2 insertions(+), 113 deletions(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index aae5b07f8..d6f7f24ac 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -642,8 +642,6 @@ 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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 80855a8b0..57a482a7e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -642,8 +642,6 @@ 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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c13643c91..0f786d008 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -636,8 +636,6 @@ 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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d7c787b38..be1d0b14a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -649,8 +649,6 @@ 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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1c39f154b..ee2792485 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -641,8 +641,6 @@
   <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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9275a4561..2a7ee8e57 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -651,8 +651,6 @@ 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>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 962e20c08..dd0a4dd23 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -642,8 +642,6 @@ 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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3a5e5f230..29e87bccc 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -651,8 +651,6 @@ 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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 085a03b82..60f90e61c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -650,8 +650,6 @@ 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>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 535c698c9..7400b8f13 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -574,8 +574,6 @@ 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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 336a5cdb7..b916dca44 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -630,8 +630,6 @@ 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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 000752fa5..5356720f3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -651,8 +651,6 @@ 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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8142b0f06..5089bcf0a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -541,8 +541,6 @@
   <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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3355dcc62..81f185a1d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -651,8 +651,6 @@ 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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9a5840da7..dcf66cdac 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -640,8 +640,6 @@ 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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 16659e6a2..78f406586 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -643,8 +643,6 @@ 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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f92fb9bc0..6921411ca 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -641,8 +641,6 @@ 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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 64857a5a6..205ead7f1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -641,8 +641,6 @@ 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>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b27ffba97..248f17c24 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -637,8 +637,6 @@ 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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1344d032d..76e36030d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -650,8 +650,6 @@ 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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6e2967cdf..c3373dce9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -650,8 +650,6 @@ 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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index aa8c055d1..68e41c360 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -642,8 +642,6 @@ 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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1bb1c5d6c..b67e088c5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -593,8 +593,6 @@ 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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 800299194..6ed5c3a56 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -639,8 +639,6 @@ 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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 03eae9321..da8abb05d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -640,8 +640,6 @@ 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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9ae9fba09..8fe6f6fc8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -612,8 +612,6 @@
   <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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09069abd6..c61c8ece0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -790,8 +790,6 @@ 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>
 
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index c985c35d9..5ceed2db6 100644
--- a/res/xml/global_preferences.xml
+++ b/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"
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index 897ddeca2..624fdfb58 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -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;
@@ -514,7 +513,6 @@ public class K9 extends Application {
         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);
@@ -980,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;
     }
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index 3691569aa..b3e0d0416 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -17,7 +17,6 @@ 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;
@@ -37,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 {
@@ -87,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";
@@ -135,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;
@@ -307,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());
 
@@ -482,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());
 
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 47a552846..be13bbe01 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -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))
             ));
diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java
index 0e37c069c..b3757198c 100644
--- a/src/com/fsck/k9/view/MessageWebView.java
+++ b/src/com/fsck/k9/view/MessageWebView.java
@@ -17,27 +17,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,11 +80,8 @@ public class MessageWebView extends RigidWebView {
         webSettings.setLoadsImagesAutomatically(true);
         webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
 
-        if (isSingleColumnLayoutSupported() && K9.mobileOptimizedLayout()) {
-            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
-        } else {
-            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-        }
+        // TODO:  Review alternatives.  NARROW_COLUMNS is deprecated on KITKAT
+        webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
 
         disableOverscrolling();