diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 4cb059279..02d7543c7 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -747,6 +747,7 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
         mPreviewLines = K9.messageListPreviewLines();
         mCheckboxes = K9.messageListCheckboxes();
 
+        restoreInstanceState(savedInstanceState);
         decodeArguments();
 
         mInitialized = true;
@@ -785,8 +786,6 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
         // This needs to be done before initializing the cursor loader below
         initializeSortSettings();
 
-        restoreInstanceState(savedInstanceState);
-
         mLoaderJustInitialized = true;
         LoaderManager loaderManager = getLoaderManager();
         int len = mAccountUuids.length;