diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index 7f6c4f598..a0d75ac6d 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -109,14 +109,6 @@
                 android:entryValues="@array/settings_preview_lines_values"
                 android:dialogTitle="@string/global_settings_preview_lines_label"
                 />
-
-
-            <CheckBoxPreference
-                android:persistent="false"
-                android:key="messagelist_stars"
-                android:title="@string/global_settings_flag_label"
-                android:summary="@string/global_settings_flag_summary" />
-
             <CheckBoxPreference
                 android:persistent="false"
                 android:key="messagelist_show_correspondent_names"
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index 94c7d9ce0..1033b66de 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -167,7 +167,6 @@ public class K9 extends Application {
         NEVER
     }
 
-    private static boolean mMessageListStars = true;
     private static int mMessageListPreviewLines = 2;
 
     private static boolean mShowCorrespondentNames = true;
@@ -436,7 +435,6 @@ public class K9 extends Application {
         editor.putBoolean("measureAccounts", mMeasureAccounts);
         editor.putBoolean("countSearchMessages", mCountSearchMessages);
         editor.putBoolean("hideSpecialAccounts", mHideSpecialAccounts);
-        editor.putBoolean("messageListStars", mMessageListStars);
         editor.putInt("messageListPreviewLines", mMessageListPreviewLines);
 
         editor.putBoolean("showCorrespondentNames", mShowCorrespondentNames);
@@ -586,7 +584,6 @@ public class K9 extends Application {
         mMeasureAccounts = sprefs.getBoolean("measureAccounts", true);
         mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);
         mHideSpecialAccounts = sprefs.getBoolean("hideSpecialAccounts", false);
-        mMessageListStars = sprefs.getBoolean("messageListStars", true);
         mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
 
         mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
@@ -880,14 +877,6 @@ public class K9 extends Application {
         mMessageListPreviewLines = lines;
     }
 
-    public static boolean messageListStars() {
-        return mMessageListStars;
-    }
-
-    public static void setMessageListStars(boolean stars) {
-        mMessageListStars = stars;
-    }
-
     public static boolean showCorrespondentNames() {
         return mShowCorrespondentNames;
     }
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 67497ff27..f45fe52e5 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -1680,7 +1680,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                 holder.newMessageCount.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
 
                 holder.flaggedMessageCount.setText(Integer.toString(stats.flaggedMessageCount));
-                holder.flaggedMessageCount.setVisibility(K9.messageListStars() && stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
+                holder.flaggedMessageCount.setVisibility(stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
 
                 holder.flaggedMessageCount.setOnClickListener(new AccountClickListener(account, SearchModifier.FLAGGED));
                 holder.newMessageCount.setOnClickListener(new AccountClickListener(account, SearchModifier.UNREAD));
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index a218b8cc2..fa2deb5c9 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1114,7 +1114,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
                 holder.newMessageCount.setVisibility(View.GONE);
             }
 
-            if (K9.messageListStars() && folder.flaggedMessageCount > 0) {
+            if (folder.flaggedMessageCount > 0) {
                 holder.flaggedMessageCount.setText(Integer
                                                    .toString(folder.flaggedMessageCount));
                 holder.flaggedMessageCount.setOnClickListener(new FolderClickListener(mAccount, folder.name, folder.displayName, SearchModifier.FLAGGED));
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 7c6681842..77916a6fc 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -295,7 +295,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
     private boolean mSortAscending = true;
     private boolean mSortDateAscending = false;
 
-    private boolean mStars = true;
     private int mSelectedCount = 0;
 
     private FontSizes mFontSizes = K9.getFontSizes();
@@ -815,8 +814,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
         }
         StorageManager.getInstance(getApplication()).addListener(mStorageListener);
 
-        mStars = K9.messageListStars();
-
         // TODO Add support for pull to fresh on searches.
         if(mQueryString == null) {
             mPullToRefreshView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index b177e8c92..a93664450 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -60,8 +60,6 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_COUNT_SEARCH = "count_search";
     private static final String PREFERENCE_HIDE_SPECIAL_ACCOUNTS = "hide_special_accounts";
     private static final String PREFERENCE_MESSAGELIST_PREVIEW_LINES = "messagelist_preview_lines";
-    private static final String PREFERENCE_MESSAGELIST_STARS = "messagelist_stars";
-    private static final String PREFERENCE_MESSAGELIST_CHECKBOXES = "messagelist_checkboxes";
     private static final String PREFERENCE_MESSAGELIST_SHOW_CORRESPONDENT_NAMES = "messagelist_show_correspondent_names";
     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";
@@ -101,7 +99,6 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mCountSearch;
     private CheckBoxPreference mHideSpecialAccounts;
     private ListPreference mPreviewLines;
-    private CheckBoxPreference mStars;
     private CheckBoxPreference mShowCorrespondentNames;
     private CheckBoxPreference mShowContactName;
     private CheckBoxPreference mChangeContactNameColor;
@@ -215,9 +212,6 @@ public class Prefs extends K9PreferenceActivity {
         mPreviewLines = setupListPreference(PREFERENCE_MESSAGELIST_PREVIEW_LINES,
                                             Integer.toString(K9.messageListPreviewLines()));
 
-        mStars = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_STARS);
-        mStars.setChecked(K9.messageListStars());
-
         mShowCorrespondentNames = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SHOW_CORRESPONDENT_NAMES);
         mShowCorrespondentNames.setChecked(K9.showCorrespondentNames());
 
@@ -404,7 +398,6 @@ public class Prefs extends K9PreferenceActivity {
         K9.setCountSearchMessages(mCountSearch.isChecked());
         K9.setHideSpecialAccounts(mHideSpecialAccounts.isChecked());
         K9.setMessageListPreviewLines(Integer.parseInt(mPreviewLines.getValue()));
-        K9.setMessageListStars(mStars.isChecked());
         K9.setShowCorrespondentNames(mShowCorrespondentNames.isChecked());
         K9.setShowContactName(mShowContactName.isChecked());
         K9.setChangeContactNameColor(mChangeContactNameColor.isChecked());
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 2922ebae1..87d27f792 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -140,9 +140,6 @@ public class GlobalSettings {
         s.put("messageListPreviewLines", Settings.versions(
                 new V(1, new IntegerRangeSetting(1, 100, 2))
             ));
-        s.put("messageListStars", Settings.versions(
-                new V(1, new BooleanSetting(true))
-            ));
         s.put("messageViewFixedWidthFont", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));