diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index e58dfee567..49a0107163 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -287,6 +287,8 @@ public class ApplicationEx extends Application {
         } else if (version < 1238) {
             if (!prefs.contains("subject_ellipsize"))
                 editor.putString("subject_ellipsize", "middle");
+            if (!prefs.contains("auto_optimize"))
+                editor.putBoolean("auto_optimize", false);
         }
 
         if (version < BuildConfig.VERSION_CODE)
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
index be1c5a570c..300d2ed606 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
@@ -391,7 +391,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
                 break;
             }
 
-        swOptimize.setChecked(prefs.getBoolean("auto_optimize", false));
+        swOptimize.setChecked(prefs.getBoolean("auto_optimize", true));
         grpExempted.setVisibility(pollInterval == 0 ? View.GONE : View.VISIBLE);
 
         swSchedule.setChecked(prefs.getBoolean("schedule", false) && pro);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 54fd635e53..a604bcd81c 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1652,7 +1652,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
     private void optimizeAccount(Context context, EntityAccount account, String reason) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean auto_optimize = prefs.getBoolean("auto_optimize", false);
+        boolean auto_optimize = prefs.getBoolean("auto_optimize", true);
         if (!auto_optimize)
             return;