diff --git a/src/com/fsck/k9/activity/FolderMessageList.java b/src/com/fsck/k9/activity/FolderMessageList.java
index ddf2bdfd8..3000db9e5 100644
--- a/src/com/fsck/k9/activity/FolderMessageList.java
+++ b/src/com/fsck/k9/activity/FolderMessageList.java
@@ -1219,7 +1219,7 @@ public class FolderMessageList extends ExpandableListActivity {
                 } else if (k9.INBOX.equalsIgnoreCase(s2)) {
                     return 1;
                 } else
-                    return s1.toUpperCase().compareTo(s2.toUpperCase());
+                    return s1.compareToIgnoreCase(s2);
             }
         }