diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt
index 6b752927b3f93ece5ef5348e8b3ba3731ab3b6f4..2d4d5e06f01f2c6ebb058fd446de3c65b2c349ff 100644
--- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt
+++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/EmailCheckFrequency.kt
@@ -7,6 +7,7 @@ enum class EmailCheckFrequency(
     val minutes: Int,
 ) {
     MANUAL(-1),
+    EVERY_5_MINUTES(5),
     EVERY_15_MINUTES(15),
     EVERY_30_MINUTES(30),
     EVERY_HOUR(1.fromHour()),
@@ -18,7 +19,7 @@ enum class EmailCheckFrequency(
     ;
 
     companion object {
-        val DEFAULT = EVERY_HOUR
+        val DEFAULT = EVERY_5_MINUTES
         fun all() = entries.toImmutableList()
 
         fun fromMinutes(minutes: Int): EmailCheckFrequency {
diff --git a/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt b/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt
index 1f6ac848dab71e4f6eb1e34f27a047edacc9b098..d464186894a8f9c1cc81a921e3dfd93767225f5d 100644
--- a/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt
+++ b/legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt
@@ -183,7 +183,7 @@ class Account(
 
     @get:Synchronized
     @set:Synchronized
-    var folderPushMode = FolderMode.ALL
+    var folderPushMode = FolderMode.NONE
 
     @get:Synchronized
     @set:Synchronized
diff --git a/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt b/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
index 10f89ea0a858a10dbc1337193734f9d6149c2e2e..5edc9054d205ef0662613442e44bc3211f5c14fd 100644
--- a/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
+++ b/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
@@ -175,7 +175,7 @@ class AccountPreferenceSerializer(
             folderSyncMode =
                 getEnumStringPref<FolderMode>(storage, "$accountUuid.folderSyncMode", FolderMode.FIRST_CLASS)
 
-            folderPushMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderPushMode", FolderMode.ALL)
+            folderPushMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderPushMode", FolderMode.NONE)
 
             isSignatureBeforeQuotedText = storage.getBoolean("$accountUuid.signatureBeforeQuotedText", false)
             replaceIdentities(loadIdentities(accountUuid, storage))
@@ -575,7 +575,7 @@ class AccountPreferenceSerializer(
             messagesNotificationChannelVersion = 0
             folderDisplayMode = FolderMode.NOT_SECOND_CLASS
             folderSyncMode = FolderMode.FIRST_CLASS
-            folderPushMode = FolderMode.ALL
+            folderPushMode = FolderMode.NONE
             sortType = DEFAULT_SORT_TYPE
             setSortAscending(DEFAULT_SORT_TYPE, DEFAULT_SORT_ASCENDING)
             showPictures = ShowPictures.ALWAYS
diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
index c5c3441fc437cff0a821d0eeb2abbab8c653e27d..af8a84472edec28a8c0799dc3445a608544830ea 100644
--- a/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
+++ b/legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
@@ -98,7 +98,9 @@ class AccountSettingsDescriptions {
                 new V(100, null)
         ));
         s.put("folderPushMode", Settings.versions(
-                new V(1, new EnumSetting<>(FolderMode.class, FolderMode.ALL))
+                new V(1, new EnumSetting<>(FolderMode.class, FolderMode.FIRST_CLASS)),
+                new V(72, new EnumSetting<>(FolderMode.class, FolderMode.NONE)),
+                new V(98, null)
         ));
         s.put("folderSyncMode", Settings.versions(
                 new V(1, new EnumSetting<>(FolderMode.class, FolderMode.FIRST_CLASS)),
diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt
index e5b1623becef85905ac2f33f8f56838fa53eb8f4..71499141d1d73df84b73f18eebaaeee347ac0cda 100644
--- a/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt
+++ b/legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/CombinedSettingsUpgraderTo98.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.preferences.legacy.FolderClass
 
 class CombinedSettingsUpgraderTo98 : CombinedSettingsUpgrader {
     override fun upgrade(account: ValidatedSettings.Account): ValidatedSettings.Account {
-        val folderPushMode = account.settings["folderPushMode"] as? FolderMode ?: FolderMode.ALL
+        val folderPushMode = account.settings["folderPushMode"] as? FolderMode ?: FolderMode.NONE
 
         val newFolders = account.folders.map { folder ->
             val newFolderSettings = folder.settings.toMutableMap().apply {