diff --git a/res/drawable/ic_button_spam.png b/res/drawable/ic_button_spam.png
deleted file mode 100644
index 6fe49ee6a..000000000
Binary files a/res/drawable/ic_button_spam.png and /dev/null differ
diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index ca3c64298..083fc383a 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -30,13 +30,6 @@
             android:layout_weight="1"
             android:src="@drawable/ic_button_delete"
         />
-        <ImageButton
-            android:id="@+id/batch_spam_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_spam"
-        />
         <ImageButton
             android:id="@+id/batch_flag_button"
             android:layout_width="0dip"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 65d541585..9cd9f95e1 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -314,14 +314,9 @@ public class MessageList
     private boolean mCheckboxes = true;
     private int mSelectedCount = 0;
 
-    /**
-     * Area with buttons visible when multiple
-     * mails are marked.
-     */
     private View mBatchButtonArea;
     private ImageButton mBatchReadButton;
     private ImageButton mBatchDeleteButton;
-    private ImageButton mBatchSpamButton;
     private ImageButton mBatchFlagButton;
     private ImageButton mBatchDoneButton;
 
@@ -907,13 +902,10 @@ public class MessageList
         mBatchReadButton.setOnClickListener(this);
         mBatchDeleteButton = (ImageButton) findViewById(R.id.batch_delete_button);
         mBatchDeleteButton.setOnClickListener(this);
-        mBatchSpamButton = (ImageButton) findViewById(R.id.batch_spam_button);
-        mBatchSpamButton.setOnClickListener(this);
         mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
         mBatchFlagButton.setOnClickListener(this);
         mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
 
-
         mBatchDoneButton.setOnClickListener(this);
 
         // Gesture detection
@@ -2970,18 +2962,6 @@ public class MessageList
             Animation animation = AnimationUtils.loadAnimation(this, R.anim.footer_appear);
             animation.setAnimationListener(this);
             mBatchButtonArea.startAnimation(animation);
-
-
-            // hide spam button if there is no spam folder
-            if (mAccount != null)
-            {
-                String folderName = mAccount.getSpamFolderName();
-                if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)
-                        || !mController.isMoveCapable(mAccount))
-                {
-                    mBatchSpamButton.setVisibility(View.GONE);
-                }
-            }
         }
     }
 
@@ -3100,7 +3080,6 @@ public class MessageList
     {
         boolean newState = false;
         List<Message> messageList = new ArrayList<Message>();
-        // messages to be removed from the view
         List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
 
         if (v == mBatchDoneButton)
@@ -3128,10 +3107,6 @@ public class MessageList
                     {
                         removeHolderList.add(holder);
                     }
-                    else if (v == mBatchSpamButton)
-                    {
-                        removeHolderList.add(holder);
-                    }
                     else if (v == mBatchFlagButton)
                     {
                         holder.flagged = newState;
@@ -3154,17 +3129,6 @@ public class MessageList
                 mSelectedCount = 0;
                 toggleBatchButtons();
             }
-            else if (v == mBatchSpamButton)
-            {
-                String folderName = mAccount.getSpamFolderName();
-                if (K9.FOLDER_NONE.equalsIgnoreCase(folderName))
-                {
-                    return;
-                }
-                mController.moveMessages(mAccount, mCurrentFolder.name, messageList.toArray(EMPTY_MESSAGE_ARRAY), folderName, null);
-                mSelectedCount = 0;
-                toggleBatchButtons();
-            }
             else
             {
                 mController.setFlag(messageList.toArray(EMPTY_MESSAGE_ARRAY), (v == mBatchReadButton ? Flag.SEEN : Flag.FLAGGED), newState);