diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 71ca3e7489..a6e210b5be 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -451,6 +451,7 @@ class Core {
                             db.operation().setOperationError(op.id, op.error);
 
                             if (message != null &&
+                                    !EntityOperation.FETCH.equals(op.name) &&
                                     !(ex instanceof IllegalArgumentException))
                                 db.message().setMessageError(message.id, op.error);
 
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 9bd56f5750..8152cbacce 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -482,7 +482,10 @@ public class EntityOperation {
             if (f == null)
                 return;
 
-            queue(context, f, FETCH, m.uid);
+            if (EntityOperation.FETCH.equals(name))
+                EntityOperation.sync(context, f.id, false);
+            else
+                queue(context, f, FETCH, m.uid);
         }
     }