diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index e4ed5830e..e39d05969 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -809,7 +809,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 holder.newMessageCount.setVisibility(unreadMessageCount > 0 ? View.VISIBLE : View.GONE);
                 
                 holder.flaggedMessageCount.setText(Integer.toString(stats.flaggedMessageCount));
-                holder.flaggedMessageCount.setVisibility(stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
+                holder.flaggedMessageCount.setVisibility(K9.messageListStars() && stats.flaggedMessageCount > 0 ? View.VISIBLE : View.GONE);
             }
             else
             {
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index e83471c3c..581fe6bcf 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1244,7 +1244,7 @@ public class FolderList extends K9ListActivity
                 holder.newMessageCount.setVisibility(View.GONE);
             }
             
-            if (folder.flaggedMessageCount > 0)
+            if (K9.messageListStars() && folder.flaggedMessageCount > 0)
             {
                 holder.flaggedMessageCount.setText(Integer
                         .toString(folder.flaggedMessageCount));