diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index fa520dc08..d5c38e193 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -450,6 +450,20 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
 
         @Override
         public void handleMessage(android.os.Message msg) {
+            // The following messages don't need an attached activity.
+            switch (msg.what) {
+                case ACTION_REMOTE_SEARCH_FINISHED: {
+                    MessageListFragment.this.remoteSearchFinished();
+                    return;
+                }
+            }
+
+            // Discard messages if the fragment isn't attached to an activity anymore.
+            Activity activity = getActivity();
+            if (activity == null) {
+                return;
+            }
+
             switch (msg.what) {
                 case ACTION_FOLDER_LOADING: {
                     String folder = (String) msg.obj;
@@ -466,10 +480,6 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
                     MessageListFragment.this.progress(progress);
                     break;
                 }
-                case ACTION_REMOTE_SEARCH_FINISHED: {
-                    MessageListFragment.this.remoteSearchFinished();
-                    break;
-                }
             }
         }
     }