diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 07bc16746..2eedc119e 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -4072,6 +4072,7 @@ public class MessagingController implements Runnable {
             // Fetch the message back from the store.  This is the Message that's returned to the caller.
             localMessage = localFolder.getMessage(message.getUid());
             localMessage.setFlag(Flag.X_DOWNLOADED_FULL, true);
+
             PendingCommand command = new PendingCommand();
             command.command = PENDING_COMMAND_APPEND;
             command.arguments = new String[] {
diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java
index 8008cac7d..5dc4adf29 100644
--- a/src/com/fsck/k9/preferences/AccountSettings.java
+++ b/src/com/fsck/k9/preferences/AccountSettings.java
@@ -27,7 +27,7 @@ public class AccountSettings {
         s.put("chipColor", new ColorSetting(0xFF0000FF));
         s.put("cryptoApp", new StringSetting(Apg.NAME));
         s.put("cryptoAutoSignature", new BooleanSetting(false));
-        //s.put("cryptoAutoEncrypt", new BooleanSetting(false)); // added to version 3?
+        s.put("cryptoAutoEncrypt", new BooleanSetting(false)); // added to version 3
         s.put("defaultQuotedTextShown", new BooleanSetting(Account.DEFAULT_QUOTED_TEXT_SHOWN));
         s.put("deletePolicy", new DeletePolicySetting(Account.DELETE_POLICY_NEVER));
         s.put("displayCount", new IntegerResourceSetting(K9.DEFAULT_VISIBLE_LIMIT,
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 60da58266..d97d94969 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -32,7 +32,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 2;
+    public static final int VERSION = 3;
 
     public static Map<String, String> validate(Map<String, SettingsDescription> settings,
             Map<String, String> importedSettings, boolean useDefaultValues) {