diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java
index b2e7e1c02..0a5142a81 100644
--- a/src/com/fsck/k9/preferences/AccountSettings.java
+++ b/src/com/fsck/k9/preferences/AccountSettings.java
@@ -41,12 +41,12 @@ public class AccountSettings {
         s.put("cryptoApp", Settings.versions(
                 new V(1, new StringSetting(Apg.NAME))
             ));
+        s.put("cryptoAutoEncrypt", Settings.versions(
+                new V(3, new BooleanSetting(false))
+            ));
         s.put("cryptoAutoSignature", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
-        s.put("cryptoAutoEncrypt", Settings.versions(
-                new V(3, new BooleanSetting(false)) // added to version 3
-            ));
         s.put("defaultQuotedTextShown", Settings.versions(
                 new V(1, new BooleanSetting(Account.DEFAULT_QUOTED_TEXT_SHOWN))
             ));
@@ -119,7 +119,7 @@ public class AccountSettings {
                         Account.DEFAULT_MESSAGE_FORMAT))
             ));
         s.put("messageFormatAuto", Settings.versions(
-                new V(2, new BooleanSetting(Account.DEFAULT_MESSAGE_FORMAT_AUTO)) // added to version 2
+                new V(2, new BooleanSetting(Account.DEFAULT_MESSAGE_FORMAT_AUTO))
             ));
         s.put("messageReadReceipt", Settings.versions(
                 new V(1, new BooleanSetting(Account.DEFAULT_MESSAGE_READ_RECEIPT))
@@ -148,9 +148,6 @@ public class AccountSettings {
         s.put("replyAfterQuote", Settings.versions(
                 new V(1, new BooleanSetting(Account.DEFAULT_REPLY_AFTER_QUOTE))
             ));
-        s.put("stripSignature", Settings.versions(
-                new V(2, new BooleanSetting(Account.DEFAULT_STRIP_SIGNATURE)) // added to version 2
-            ));
         s.put("ring", Settings.versions(
                 new V(1, new BooleanSetting(true))
             ));
@@ -175,6 +172,9 @@ public class AccountSettings {
         s.put("spamFolderName", Settings.versions(
                 new V(1, new StringSetting("Spam"))
             ));
+        s.put("stripSignature", Settings.versions(
+                new V(2, new BooleanSetting(Account.DEFAULT_STRIP_SIGNATURE))
+            ));
         s.put("subscribedFoldersOnly", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index be5fd36da..53c0f94f7 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -45,7 +45,7 @@ public class GlobalSettings {
                 new V(1, new BooleanSetting(false))
             ));
         s.put("confirmDeleteStarred", Settings.versions(
-                new V(2, new BooleanSetting(false)) // added to version 2
+                new V(2, new BooleanSetting(false))
             ));
         s.put("confirmMarkAllAsRead", Settings.versions(
                 new V(1, new BooleanSetting(false))