diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index fea1809ff..ebdf120d0 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -12,9 +12,11 @@ import java.util.TreeMap;
 import android.content.SharedPreferences;
 import android.os.Environment;
 
+import com.fsck.k9.Account;
 import com.fsck.k9.FontSizes;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
+import com.fsck.k9.Account.SortType;
 import com.fsck.k9.helper.DateFormatter;
 import com.fsck.k9.preferences.Settings.*;
 
@@ -182,6 +184,12 @@ public class GlobalSettings {
         s.put("showCorrespondentNames", Settings.versions(
                 new V(1, new BooleanSetting(true))
             ));
+        s.put("sortTypeEnum", Settings.versions(
+                new V(10, new EnumSetting(SortType.class, Account.DEFAULT_SORT_TYPE))
+            ));
+        s.put("sortAscending", Settings.versions(
+                new V(10, new BooleanSetting(Account.DEFAULT_SORT_ASCENDING))
+            ));
         s.put("startIntegratedInbox", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
@@ -202,23 +210,23 @@ public class GlobalSettings {
                 new V(4, new BooleanSetting(true))
             ));
         s.put("batchButtonsMarkRead", Settings.versions(
-        		new V(8, new BooleanSetting(true))
-        	));
+                new V(8, new BooleanSetting(true))
+            ));
         s.put("batchButtonsDelete", Settings.versions(
-        		new V(8, new BooleanSetting(true))
-        	));
+                new V(8, new BooleanSetting(true))
+            ));
         s.put("batchButtonsArchive", Settings.versions(
-        		new V(8, new BooleanSetting(false))
-        	));
+                new V(8, new BooleanSetting(false))
+            ));
         s.put("batchButtonsMove", Settings.versions(
-        		new V(8, new BooleanSetting(false))
-        	));
+                new V(8, new BooleanSetting(false))
+            ));
         s.put("batchButtonsFlag", Settings.versions(
-        		new V(8, new BooleanSetting(true))
-        	));
+                new V(8, new BooleanSetting(true))
+            ));
         s.put("batchButtonsUnselect", Settings.versions(
-        		new V(8, new BooleanSetting(true))
-        	));
+                new V(8, new BooleanSetting(true))
+            ));
 
         SETTINGS = Collections.unmodifiableMap(s);
 
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 8a9db172e..728e99239 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 9;
+    public static final int VERSION = 10;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,