diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 9d8a545699..380b6aaf8b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3121,6 +3121,9 @@ class Core {
 
                                 // https://datatracker.ietf.org/doc/html/rfc2683#section-3.2.1.5
                                 int chunk_size = prefs.getInt("chunk_size", DEFAULT_SYNC_CHUNCK_SIZE);
+                                if (chunk_size < 200 &&
+                                        (account.isGmail() || account.isOutlook()))
+                                    chunk_size = 200;
                                 List<List<Pair<Long, Long>>> chunks = Helper.chunkList(ranges, chunk_size);
 
                                 Log.i(folder.name + " executing uid fetch count=" + uids.size() +
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index ccfe50cbba..784a2de1ba 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -163,6 +163,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
         return "imap.gmail.com".equalsIgnoreCase(host);
     }
 
+    boolean isOutlook() {
+        return "outlook.office365.com".equalsIgnoreCase(host);
+    }
+
     boolean isYahooJp() {
         return "imap.mail.yahoo.co.jp".equalsIgnoreCase(host);
     }