diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/src/com/fsck/k9/activity/FolderInfoHolder.java
index 7eb06b2fd..5e4bbde53 100644
--- a/src/com/fsck/k9/activity/FolderInfoHolder.java
+++ b/src/com/fsck/k9/activity/FolderInfoHolder.java
@@ -22,11 +22,6 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
     public Folder folder;
     public boolean pushActive;
 
-    /**
-     * Outbox is handled differently from any other folder.
-     */
-    public boolean outbox;
-
     @Override
     public boolean equals(Object o)
     {
@@ -133,7 +128,6 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
         if (this.name.equals(account.getOutboxFolderName()))
         {
             this.displayName = String.format(context.getString(R.string.special_mailbox_name_outbox_fmt), this.name);
-            this.outbox = true;
         }
 
         if (this.name.equals(account.getDraftsFolderName()))
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 3ffb4503f..3caabb9ff 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -766,7 +766,7 @@ public class FolderList extends K9ListActivity
         if (!folder.name.equals(mAccount.getTrashFolderName()))
             menu.findItem(R.id.empty_trash).setVisible(false);
 
-        if (folder.outbox)
+        if (folder.name.equals(mAccount.getOutboxFolderName()))
         {
             menu.findItem(R.id.check_mail).setVisible(false);
         }
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 8155d13e2..d62852f7e 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1750,7 +1750,7 @@ public class MessageList
         }
         else
         {
-            if (mCurrentFolder != null && mCurrentFolder.outbox)
+            if (mCurrentFolder != null && mCurrentFolder.name.equals(mAccount.getOutboxFolderName()))
             {
                 menu.findItem(R.id.check_mail).setVisible(false);
             }