diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 05036a64c..c246408ae 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -150,7 +150,7 @@ public class MessageList
                 {
                     for (MessageInfoHolder message : messages)
                     {
-                        if (mFolderName == null || message.folder.name.equals(mFolderName))
+                        if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName)))
                         {
                             if (message != null && message.selected && mSelectedCount > 0)
                             {
@@ -173,7 +173,7 @@ public class MessageList
             for (final MessageInfoHolder message : messages)
             {
 
-                if (mFolderName == null || message.folder.name.equals(mFolderName))
+                if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName)))
                 {
 
                     runOnUiThread(new Runnable()