diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 9e694818d..0a61e4e55 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -771,7 +771,6 @@ public class MessageList
         sortDateAscending = mController.isSortAscending(SORT_TYPE.SORT_DATE);
 
         mController.addListener(mAdapter.mListener);
-        mAdapter.markAllMessagesAsDirty();
 
         if (mFolderName != null)
         {
@@ -781,7 +780,10 @@ public class MessageList
             }
             else
             {
+                mAdapter.markAllMessagesAsDirty();
                 mController.listLocalMessagesSynchronous(mAccount, mFolderName,  mAdapter.mListener);
+                mAdapter.pruneDirtyMessages();
+                mAdapter.notifyDataSetChanged();
             }
             mController.notifyAccountCancel(this, mAccount);
 
@@ -795,8 +797,6 @@ public class MessageList
         }
 
         mHandler.refreshTitle();
-        mAdapter.pruneDirtyMessages();
-        mAdapter.notifyDataSetChanged();
 
         restoreListState();
     }