diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 04e929ee67..a9bb2faca9 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1094,7 +1094,9 @@ class Core {
         }
 
         // Fetch appended/copied when needed
-        boolean fetch = (copy || !"connected".equals(target.state));
+        boolean fetch = (copy ||
+                !"connected".equals(target.state) ||
+                !MessageHelper.hasCapability(ifolder, "IDLE"));
         if (draft || fetch)
             try {
                 Log.i(target.name + " moved message fetch=" + fetch);