diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index c4d46ec8d1..d8f6558e9b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3408,7 +3408,8 @@ class Core {
                                             } else if (response.isBAD()) {
                                                 Log.e("UID FETCH " + response);
                                                 // BAD Error in IMAP command UID FETCH: Too long argument (n.nnn + n.nnn + n.nnn secs).
-                                                if (response.toString().contains("Too long argument")) {
+                                                if (response.toString().contains("Too long argument") ||
+                                                        response.toString().contains("Command Error. 10")) {
                                                     chunk_size = chunk_size / 2;
                                                     if (chunk_size > 0)
                                                         prefs.edit().putInt("chunk_size", chunk_size).apply();