diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 90157adf7..6b5803cc1 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -1298,12 +1298,11 @@ public class MessageList extends K9ListActivity {
          }
 
         public void removeMessage(MessageInfoHolder holder) {
-            if (holder.folder == null) {
+            if (holder == null) {
                 return;
             }
 
-
-            if (holder == null) {
+            if (holder.folder == null) {
                 return;
             }