diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 1bf1fba6f..c12dad60a 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -874,24 +874,24 @@ public class Account implements BaseAccount {
         if (messageRead) {
             if (messageFlagged) {
                 chip = mFlaggedReadColorChip;
-            } else if (toMe) {
-                chip = mToMeReadColorChip;
-            } else if (ccMe) {
-                chip = mCcMeReadColorChip;
-            } else if (fromMe) {
-                chip = mFromMeReadColorChip;
+          //  } else if (toMe) {
+          //      chip = mToMeReadColorChip;
+          //  } else if (ccMe) {
+          //      chip = mCcMeReadColorChip;
+          //  } else if (fromMe) {
+          //      chip = mFromMeReadColorChip;
             } else {
                 chip = mReadColorChip;
             }
         } else {
             if (messageFlagged) {
                 chip = mFlaggedUnreadColorChip;
-            } else if (toMe) {
-                chip = mToMeUnreadColorChip;
-            } else if (ccMe) {
-                chip = mCcMeUnreadColorChip;
-            } else if (fromMe) {
-                chip = mFromMeUnreadColorChip;
+          //  } else if (toMe) {
+          //      chip = mToMeUnreadColorChip;
+          //  } else if (ccMe) {
+          //      chip = mCcMeUnreadColorChip;
+          //  } else if (fromMe) {
+          //      chip = mFromMeUnreadColorChip;
             } else {
                 chip = mUnreadColorChip;
             }
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index 802d3b0e5..d2c843b94 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -218,7 +218,7 @@ public class K9 extends Application {
         WHEN_IN_LANDSCAPE
     }
 
-    private static boolean mMessageListCheckboxes = false;
+    private static boolean mMessageListCheckboxes = true;
     private static int mMessageListPreviewLines = 2;
 
     private static boolean mShowCorrespondentNames = true;
@@ -680,7 +680,7 @@ public class K9 extends Application {
         mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);
         mHideSpecialAccounts = sprefs.getBoolean("hideSpecialAccounts", false);
         mMessageListSenderAboveSubject = sprefs.getBoolean("messageListSenderAboveSubject", false);
-        mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", false);
+        mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", true);
         mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
 
         mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 5357149ae..9a88fde94 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -136,7 +136,7 @@ public class GlobalSettings {
                 new V(1, new BooleanSetting(true))
             ));
         s.put("messageListCheckboxes", Settings.versions(
-                new V(1, new BooleanSetting(false))
+                new V(1, new BooleanSetting(true))
             ));
         s.put("messageListPreviewLines", Settings.versions(
                 new V(1, new IntegerRangeSetting(1, 100, 2))