diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 6dffc6121..65092e60f 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1211,8 +1211,6 @@ public class MessageList
 
     private void changeSort(SORT_TYPE newSortType) {
         if (sortType == newSortType) {
-            mAccount.setSortAscending( !(mController.isSortAscending(newSortType)  ));
-            mAccount.save(Preferences.getPreferences(this));
             onToggleSortAscending();
         } else {
             sortType = newSortType;
@@ -1261,6 +1259,9 @@ public class MessageList
 
         sortAscending = mController.isSortAscending(sortType);
         sortDateAscending = mController.isSortAscending(SORT_TYPE.SORT_DATE);
+            
+        mAccount.setSortAscending( sortAscending);
+        mAccount.save(Preferences.getPreferences(this));
 
         reSort();
     }