diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 50fd244cb..0c2bdf3b6 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -236,6 +236,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         removeMessageListFragment();
         removeMessageViewFragment();
 
+        mMessageReference = null;
+        mSearch = null;
+        mFolderName = null;
+
         decodeExtras(intent);
         initializeDisplayMode(null);
         initializeFragments();