From 0334ba88c52cc5d80dc86208c94f30fbd4d8040f Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 18 Sep 2012 03:43:54 +0200
Subject: [PATCH] Removed 'compact layout' for now

See issue 4556
---
 res/values-ca/strings.xml                       |  3 ---
 res/values-cs/strings.xml                       |  3 ---
 res/values-da/strings.xml                       |  3 ---
 res/values-de/strings.xml                       |  3 ---
 res/values-el/strings.xml                       |  3 ---
 res/values-es/strings.xml                       |  3 ---
 res/values-fi/strings.xml                       |  3 ---
 res/values-fr/strings.xml                       |  3 ---
 res/values-gl/strings.xml                       |  3 ---
 res/values-hu/strings.xml                       |  3 ---
 res/values-it/strings.xml                       |  3 ---
 res/values-iw/strings.xml                       |  3 ---
 res/values-ja/strings.xml                       |  3 ---
 res/values-ko/strings.xml                       |  3 ---
 res/values-nl/strings.xml                       |  3 ---
 res/values-pl/strings.xml                       |  3 ---
 res/values-pt-rBR/strings.xml                   |  3 ---
 res/values-ru/strings.xml                       |  3 ---
 res/values-sv/strings.xml                       |  3 ---
 res/values-tr/strings.xml                       |  3 ---
 res/values-uk/strings.xml                       |  3 ---
 res/values-zh-rCN/strings.xml                   |  3 ---
 res/values-zh-rTW/strings.xml                   |  3 ---
 res/values/strings.xml                          |  3 ---
 res/xml/global_preferences.xml                  |  7 -------
 src/com/fsck/k9/K9.java                         | 11 -----------
 src/com/fsck/k9/activity/Accounts.java          |  6 +-----
 src/com/fsck/k9/activity/FolderList.java        |  4 +---
 src/com/fsck/k9/activity/setup/Prefs.java       |  6 ------
 src/com/fsck/k9/preferences/GlobalSettings.java |  3 ---
 src/com/fsck/k9/preferences/Settings.java       |  2 +-
 31 files changed, 3 insertions(+), 108 deletions(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2a2fe8501..fd2e222f3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -873,9 +873,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gestos</string>
     <string name="gestures_summary">Accepta el control de gestos</string>
 
-    <string name="compact_layouts_title">Compacta formats</string>
-    <string name="compact_layouts_summary">Adjusta formats per mostrar més a cada pàgina</string>
-
     <string name="volume_navigation_title">Navegació botons de volum</string>
     <string name="volume_navigation_summary">Canvia a través dels elements utilitzant els botons de volum</string>
     <string name="volume_navigation_message">Vista del missatge</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 36a2f624d..a6cf358d0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -878,9 +878,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gesta</string>
     <string name="gestures_summary">Používat ovládání gesty</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
-
     <string name="volume_navigation_title">Navigace tlačítky hlasitosti</string>
     <string name="volume_navigation_summary">Přeskakovat přes položky při použití ovladačů hlasitosti</string>
     <string name="volume_navigation_message">Zobrazení zpráv</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ff7abece3..74667722c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -873,9 +873,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gestures</string>
     <string name="gestures_summary">Benyt gesture kontrol</string>
 
-    <string name="compact_layouts_title">Kompakt layout</string>
-    <string name="compact_layouts_summary">Juster layout så der vises mere på hver side</string>
-
     <string name="volume_navigation_title">Volume-knap navigation</string>
     <string name="volume_navigation_summary">Skift mellem valg vha. volume-knapper</string>
     <string name="volume_navigation_message">Mail-visning</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3d7ff6b0e..ab87104aa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -872,9 +872,6 @@ http://k9mail.googlecode.com/.
     <string name="gestures_title">Gesten</string>
     <string name="gestures_summary">Gesten für vorherige/nächste Nachricht aktivieren</string>
 
-    <string name="compact_layouts_title">Kompakte Darstellung</string>
-    <string name="compact_layouts_summary">Darstellung anpassen, um mehr auf jeder Seite zu zeigen</string>
-
     <string name="volume_navigation_title">Lauter/Leiser Scrolling</string>
     <string name="volume_navigation_summary">Mittels Lauter/Leiser-Tasten durch Listen scrollen</string>
     <string name="volume_navigation_message">Nachrichtenansicht</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 04c7d2364..79ec422ce 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -870,9 +870,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Χειρονομίες</string>
     <string name="gestures_summary">Αποδοχή ελέγχου με χειρονομίες</string>
 
-    <string name="compact_layouts_title">Συνοπτική εμφάνιση</string>
-    <string name="compact_layouts_summary">Προσαρμογή της εμφάνισης για να προβάλει περισσότερα σε κάθε σελίδα</string>
-
     <string name="volume_navigation_title">Πλοήγηση με πλήκτρο έντασης</string>
     <string name="volume_navigation_summary">Μετακίνηση στις επιλογές με χρήση του πλήκτρου έντασης</string>
     <string name="volume_navigation_message">Προβολή μηνύματος</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 758f77681..5980762d0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -870,9 +870,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gestos</string>
     <string name="gestures_summary">Aceptar controles gestuales</string>
 
-    <string name="compact_layouts_title">Disposición compacta</string>
-    <string name="compact_layouts_summary">Ajustar disposición para mostrar más mensajes en cada página</string>
-
     <string name="volume_navigation_title">Navegación con teclas de volumen</string>
     <string name="volume_navigation_summary">Permite moverse por las opciones utilizando los botones de volumen</string>
     <string name="volume_navigation_message">Vista de mensaje</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a19cf818d..c8c532c2d 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -885,9 +885,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Eleet</string>
     <string name="gestures_summary">Hyväksy eleohjaus</string>
 
-    <string name="compact_layouts_title">Tiiviit ulkoasut</string>
-    <string name="compact_layouts_summary">Säädä ulkoasuja näyttämään enemmän kullakin sivulla</string>
-
     <string name="volume_navigation_title">Navigointi äänenvoimakkuusnäppäimillä</string>
     <string name="volume_navigation_summary">Selaa käyttämällä äänenvoimakkuusnäppäimiä</string>
     <string name="volume_navigation_message">Viestinäkymä</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e2caf4aa1..219f52864 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -896,9 +896,6 @@ de plus</string>
     <string name="gestures_title">Interface gestuelle</string>
     <string name="gestures_summary">Accepter le contrôle par gestuelle</string>
 
-    <string name="compact_layouts_title">Agencement compact</string>
-    <string name="compact_layouts_summary">Modifier l\'agencement pour afficher plus d\'éléments par page</string>
-
     <string name="volume_navigation_title">Navigation à l\'aide du volume</string>
     <string name="volume_navigation_summary">Passer d\'un élément à l\'autre grâce aux touches de volume</string>
     <string name="volume_navigation_message">Visualisation d\'un message</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 8ae2ec4e1..3fd5b5115 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -870,9 +870,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Xestos</string>
     <string name="gestures_summary">Aceptar controles xestuáis</string>
 
-    <string name="compact_layouts_title">Compactar deseños</string>
-    <string name="compact_layouts_summary">Axustar o deseño para amosar máis en cada páxina</string>
-
     <string name="volume_navigation_title">Navegación con teclas de volume</string>
     <string name="volume_navigation_summary">Permite moverse polas opcións usando os botóns de volume</string>
     <string name="volume_navigation_message">Vista de mensaxe</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a180a8a60..761597530 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -867,9 +867,6 @@
     <string name="gestures_title">Kézmozdulatok</string>
     <string name="gestures_summary">Engedélyezi a kézmozdulakkal való vezérlést.</string>
 
-    <string name="compact_layouts_title">Kompakt elrendezés</string>
-    <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>
-
     <string name="volume_navigation_title">Hangerő gomb vezérlés</string>
     <string name="volume_navigation_summary">Léptetés az hangerő gombokkal</string>
     <string name="volume_navigation_message">Leveleknél</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f6c45c629..5708cf32e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -874,9 +874,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gestione con tocco</string>
     <string name="gestures_summary">Attiva la gestione con il tocco dei controlli</string>
 
-    <string name="compact_layouts_title">Disposizione compatta</string>
-    <string name="compact_layouts_summary">Regola la disposizione per visualizzare di più in ogni pagina</string>
-
     <string name="volume_navigation_title">Navigazione tasti volume</string>
     <string name="volume_navigation_summary">Scorri elementi utilizzando i controlli del volume</string>
     <string name="volume_navigation_message">Visualizzazione messaggi</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4cf7c61bc..68726de5f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -885,9 +885,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">מחוות</string>
     <string name="gestures_summary">קבל כפתור מחווה</string>
 
-    <string name="compact_layouts_title">פריסות קומפקטיות</string>
-    <string name="compact_layouts_summary">התאם את הפריסה כדי שיהיה ניתן להציג יותר פרטים בכל דף</string>
-
     <string name="volume_navigation_title">נייוט באמצעות מקשי הווליום</string>
     <string name="volume_navigation_summary">לדפדף בין הפריטים באמצעות מקשי הווליום</string>
     <string name="volume_navigation_message">הצגת הודעה</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cc4ef0899..243a55e8d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -867,9 +867,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="gestures_title">ジェスチャー</string>
     <string name="gestures_summary">ジェスチャー制御の許可</string>
 
-    <string name="compact_layouts_title">コンパクトレイアウト</string>
-    <string name="compact_layouts_summary">ページの表示レイアウトを調整</string>
-
     <string name="volume_navigation_title">ボリュームキー操作</string>
     <string name="volume_navigation_summary">ボリュームキーを使ってメッセージを切り替え</string>
     <string name="volume_navigation_message">メッセージ表示</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8d72bcb21..63f1d5eb1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -870,9 +870,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
     <string name="gestures_title">제스쳐</string>
     <string name="gestures_summary">제스쳐를 이용합니다</string>
 
-    <string name="compact_layouts_title">레이아웃 최적화(Compact)</string>
-    <string name="compact_layouts_summary">각 페이지에 더 많은 내용을 보여주기위해 레이아웃을 조절</string>
-
     <string name="volume_navigation_title">볼륨키 네비게이션</string>
     <string name="volume_navigation_summary">볼륨키를 이용하여 메시지 목록의 각 항목을 넘김</string>
     <string name="volume_navigation_message">메시지 뷰</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2434739b3..246828aa2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -869,9 +869,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gebaren</string>
     <string name="gestures_summary">Accepteer gebaren sturing</string>
 
-    <string name="compact_layouts_title">Compacte layout</string>
-    <string name="compact_layouts_summary">Pas layout aan zodat er meer op een pagina past</string>
-
     <string name="volume_navigation_title">Volume op/neer navigatie</string>
     <string name="volume_navigation_summary">Spring tussen items door gebruik van de volumeknoppen</string>
     <string name="volume_navigation_message">Bericht beeld</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e9bc0e5d9..156f5994a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -902,9 +902,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gesty</string>
     <string name="gestures_summary">Pozwól na sterowanie gestami</string>
 
-    <string name="compact_layouts_title">Wygląd kompaktowy</string>
-    <string name="compact_layouts_summary">Dostosuj wygląd, aby wyświetlać więcej na stronie</string>
-
     <string name="volume_navigation_title">Nawigacja przyciskiem głośności</string>
     <string name="volume_navigation_summary">Przeskakuj między rzeczami używając przycisków głośności</string>
     <string name="volume_navigation_message">Wygląd wiadomości</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8dea55ef8..471e1095e 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -869,9 +869,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gestos</string>
     <string name="gestures_summary">Aceitar controle de gestos</string>
 
-    <string name="compact_layouts_title">Layout compacto</string>
-    <string name="compact_layouts_summary">Ajusta o layout para mostrar mais em cada página</string>
-
     <string name="volume_navigation_title">Tecla de volume para navegação</string>
     <string name="volume_navigation_summary">Percorrer itens usando controle de volume</string>
     <string name="volume_navigation_message">Visualizar mensagem</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 14766c04a..dcc798870 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -866,9 +866,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Жесты</string>
     <string name="gestures_summary">Принимать контроль жестами</string>
 
-    <string name="compact_layouts_title">Компактное размещение</string>
-    <string name="compact_layouts_summary">Настроить размещение для отображения максимума на каждой странице</string>
-
     <string name="volume_navigation_title">Использовать управление громкостью для навигации</string>
     <string name="volume_navigation_summary">Перемещаться по элементам, используя управление громкостью</string>
     <string name="volume_navigation_message">Сообщение</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b158e5baa..e56e33562 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -873,9 +873,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gester</string>
     <string name="gestures_summary">Acceptera gestkontroll</string>
 
-    <string name="compact_layouts_title">Komprimera vyer</string>
-    <string name="compact_layouts_summary">Tryck ihop vyer för att kunna visa mer på varje sida</string>
-
     <string name="volume_navigation_title">Volym upp/ner-navigering</string>
     <string name="volume_navigation_summary">Växla mellan val med hjälp av volymkontrollerna</string>
     <string name="volume_navigation_message">E-post-vy</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cf4701815..f986b5b5b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -873,9 +873,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
     <string name="gestures_title">Hareketleri</string>
     <string name="gestures_summary">Hareket kontrolünü kabul et</string>
 
-    <string name="compact_layouts_title">Kompakt düzen</string>
-    <string name="compact_layouts_summary">Herbir sayfada daha fazlasını görüntülemek için düzeni ayarla</string>
-
     <string name="volume_navigation_title">Ses Düğmesi ile dolaşma</string>
     <string name="volume_navigation_summary">Ses kontrollerini kullanarak ürün sayfalarını çevir</string>
     <string name="volume_navigation_message">Mesaj görünümü</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bd6fc1bb4..2f0817140 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -872,9 +872,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Жести</string>
     <string name="gestures_summary">Приймати управління жестами</string>
 
-    <string name="compact_layouts_title">Компактне розташування</string>
-    <string name="compact_layouts_summary">Налаштувати розташування для максимального відображення на кожній сторінці</string>
-
     <string name="volume_navigation_title">Використовувати управління гучністю для навігації</string>
     <string name="volume_navigation_summary">Прокручування елементів за допомогою клавіш управління гучності</string>
     <string name="volume_navigation_message">Перегляд повідомлень</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index af8ff01ef..cb3b51812 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -861,9 +861,6 @@
     <string name="gestures_title">手势</string>
     <string name="gestures_summary">接收手势控制</string>
 
-    <string name="compact_layouts_title">紧凑布局</string>
-    <string name="compact_layouts_summary">对每个页面调整布局以显示更多内容</string>
-
     <string name="volume_navigation_title">音量键导航</string>
     <string name="volume_navigation_summary">利用音量键选择项目</string>
     <string name="volume_navigation_message">信息视图</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a0bcac2c7..a12d7e1b1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -879,9 +879,6 @@
     <string name="gestures_title">手勢</string>
     <string name="gestures_summary">接收手勢控制</string>
 
-    <string name="compact_layouts_title">精簡格式</string>
-    <string name="compact_layouts_summary">在一頁上顯示最多的訊息</string>
-
     <string name="volume_navigation_title">音量鍵導航</string>
     <string name="volume_navigation_summary">利用音量鍵選擇項目</string>
     <string name="volume_navigation_message">訊息檢視</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 41a0e4342..c2ea562cd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -885,9 +885,6 @@ http://k9mail.googlecode.com/
     <string name="gestures_title">Gestures</string>
     <string name="gestures_summary">Accept gesture control</string>
 
-    <string name="compact_layouts_title">Compact layouts</string>
-    <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>
-
     <string name="volume_navigation_title">Volume key navigation</string>
     <string name="volume_navigation_summary">Flip through items using the volume controls</string>
     <string name="volume_navigation_message">Message view</string>
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index d06574b62..24539de4a 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -70,13 +70,6 @@
                 android:title="@string/animations_title"
                 android:summary="@string/animations_summary" />
 
-            <CheckBoxPreference
-                android:persistent="false"
-                android:key="compact_layouts"
-                android:title="@string/compact_layouts_title"
-                android:summary="@string/compact_layouts_summary" />
-
-
         </PreferenceCategory>
 
         <PreferenceCategory
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index c3d4602a5..8bd111e07 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -190,7 +190,6 @@ public class K9 extends Application {
     private static boolean mQuietTimeEnabled = false;
     private static String mQuietTimeStarts = null;
     private static String mQuietTimeEnds = null;
-    private static boolean compactLayouts = false;
     private static String mAttachmentDefaultPath = "";
 
     private static boolean mBatchButtonsMarkRead = true;
@@ -471,7 +470,6 @@ public class K9 extends Application {
 
         editor.putString("notificationHideSubject", sNotificationHideSubject.toString());
 
-        editor.putBoolean("compactLayouts", compactLayouts);
         editor.putString("attachmentdefaultpath", mAttachmentDefaultPath);
         fontSizes.save(editor);
     }
@@ -641,7 +639,6 @@ public class K9 extends Application {
             sNotificationHideSubject = NotificationHideSubject.valueOf(notificationHideSubject);
         }
 
-        compactLayouts = sprefs.getBoolean("compactLayouts", false);
         mAttachmentDefaultPath = sprefs.getString("attachmentdefaultpath",  Environment.getExternalStorageDirectory().toString());
         fontSizes.load(sprefs);
 
@@ -1042,14 +1039,6 @@ public class K9 extends Application {
         sNotificationHideSubject = mode;
     }
 
-    public static boolean useCompactLayouts() {
-        return compactLayouts;
-    }
-
-    public static void setCompactLayouts(boolean compactLayouts) {
-        K9.compactLayouts = compactLayouts;
-    }
-
     public static boolean batchButtonsMarkRead() {
         return mBatchButtonsMarkRead;
     }
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 099558e4c..6ccbd6640 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -1720,11 +1720,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
             holder.description.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getAccountName());
             holder.email.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getAccountDescription());
 
-            if (K9.useCompactLayouts()) {
-                holder.accountsItemLayout.setMinimumHeight(0);
-            }
-            if (account instanceof SearchAccount || K9.useCompactLayouts()) {
-
+            if (account instanceof SearchAccount) {
                 holder.folders.setVisibility(View.GONE);
             } else {
                 holder.folders.setVisibility(View.VISIBLE);
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index b65a65a1c..a218b8cc2 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1122,9 +1122,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             } else {
                 holder.flaggedMessageCount.setVisibility(View.GONE);
             }
-            if (K9.useCompactLayouts() && holder.folderListItemLayout != null) {
-                holder.folderListItemLayout.setMinimumHeight(0);
-            }
+
             holder.activeIcons.setOnClickListener(new OnClickListener() {
                 public void onClick(View v) {
                     Toast toast = Toast.makeText(getApplication(), getString(R.string.tap_hint), Toast.LENGTH_SHORT);
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index af12481c9..f31768e2c 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -66,7 +66,6 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME = "messagelist_show_contact_name";
     private static final String PREFERENCE_MESSAGELIST_CONTACT_NAME_COLOR = "messagelist_contact_name_color";
     private static final String PREFERENCE_MESSAGEVIEW_FIXEDWIDTH = "messageview_fixedwidth_font";
-    private static final String PREFERENCE_COMPACT_LAYOUTS = "compact_layouts";
 
     private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
     private static final String PREFERENCE_MESSAGEVIEW_SHOW_NEXT = "messageview_show_next";
@@ -115,7 +114,6 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mUseGalleryBugWorkaround;
     private CheckBoxPreference mDebugLogging;
     private CheckBoxPreference mSensitiveLogging;
-    private CheckBoxPreference compactLayouts;
 
     private CheckBoxPreference mQuietTimeEnabled;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeStarts;
@@ -183,9 +181,6 @@ public class Prefs extends K9PreferenceActivity {
         mGestures = (CheckBoxPreference)findPreference(PREFERENCE_GESTURES);
         mGestures.setChecked(K9.gesturesEnabled());
 
-        compactLayouts = (CheckBoxPreference)findPreference(PREFERENCE_COMPACT_LAYOUTS);
-        compactLayouts.setChecked(K9.useCompactLayouts());
-
         mVolumeNavigation = (CheckBoxListPreference)findPreference(PREFERENCE_VOLUME_NAVIGATION);
         mVolumeNavigation.setItems(new CharSequence[] {getString(R.string.volume_navigation_message), getString(R.string.volume_navigation_list)});
         mVolumeNavigation.setCheckedItems(new boolean[] {K9.useVolumeKeysForNavigationEnabled(), K9.useVolumeKeysForListNavigationEnabled()});
@@ -401,7 +396,6 @@ public class Prefs extends K9PreferenceActivity {
         K9.setK9Theme(mTheme.getValue().equals("dark") ? K9.THEME_DARK : K9.THEME_LIGHT);
         K9.setAnimations(mAnimations.isChecked());
         K9.setGesturesEnabled(mGestures.isChecked());
-        K9.setCompactLayouts(compactLayouts.isChecked());
         K9.setUseVolumeKeysForNavigation(mVolumeNavigation.getCheckedItems()[0]);
         K9.setUseVolumeKeysForListNavigation(mVolumeNavigation.getCheckedItems()[1]);
         K9.setStartIntegratedInbox(!mHideSpecialAccounts.isChecked() && mStartIntegratedInbox.isChecked());
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 91ab24857..95a7d59ca 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -48,9 +48,6 @@ public class GlobalSettings {
         s.put("changeRegisteredNameColor", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
-        s.put("compactLayouts", Settings.versions(
-                new V(1, new BooleanSetting(false))
-            ));
         s.put("confirmDelete", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 9ad150823..a7229e93a 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 16;
+    public static final int VERSION = 17;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,