diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/src/com/fsck/k9/activity/FolderInfoHolder.java
index f493e5e71..11f4fa272 100644
--- a/src/com/fsck/k9/activity/FolderInfoHolder.java
+++ b/src/com/fsck/k9/activity/FolderInfoHolder.java
@@ -97,7 +97,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
 
         this.status = truncateStatus(folder.getStatus());
 
-        this.displayName = getDisplayName(context, folder);
+        this.displayName = getDisplayName(context, account, name);
     }
 
     /**
@@ -109,16 +109,15 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
      *
      * @param context
      *         A {@link Context} instance that is used to get the string resources.
-     * @param folder
-     *         The {@link Folder} instance for which to return the display name.
+     * @param account
+     *         The {@link Account} the folder belongs to.
+     * @param name
+     *         The name of the folder for which to return the display name.
      *
      * @return The localized name for the provided folder if it's a special folder or the original
      *         folder name if it's a non-special folder.
      */
-    public static String getDisplayName(Context context, Folder folder) {
-        Account account = folder.getAccount();
-        String name = folder.getName();
-
+    public static String getDisplayName(Context context, Account account, String name) {
         final String displayName;
         if (name.equals(account.getSpamFolderName())) {
             displayName = String.format(
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 8d49172ef..a3355d35b 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -515,7 +515,10 @@ public class MessageList extends K9ListActivity implements
     private void setWindowTitle() {
         // regular folder content display
         if (mFolderName != null) {
-            mNavigationSpinner.setTitle(mFolderName);
+            String displayName = FolderInfoHolder.getDisplayName(MessageList.this, mAccount,
+                mFolderName);
+
+            mNavigationSpinner.setTitle(displayName);
             mNavigationSpinner.setSubTitle(mAccount.getEmail());
 
         // query result display
diff --git a/src/com/fsck/k9/activity/setup/FolderSettings.java b/src/com/fsck/k9/activity/setup/FolderSettings.java
index 53f01a13a..29e2a32f6 100644
--- a/src/com/fsck/k9/activity/setup/FolderSettings.java
+++ b/src/com/fsck/k9/activity/setup/FolderSettings.java
@@ -74,7 +74,7 @@ public class FolderSettings extends K9PreferenceActivity {
 
         addPreferencesFromResource(R.xml.folder_settings_preferences);
 
-        String displayName = FolderInfoHolder.getDisplayName(this, mFolder);
+        String displayName = FolderInfoHolder.getDisplayName(this, mAccount, mFolder.getName());
         Preference category = findPreference(PREFERENCE_TOP_CATERGORY);
         category.setTitle(displayName);