diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 46f7f38eb3..5375f0481e 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -439,6 +439,18 @@ public class EntityOperation {
             } catch (JSONException ex) {
                 Log.e(ex);
             }
+
+        if (message != null) {
+            EntityMessage m = db.message().getMessage(message);
+            if (m == null || m.uid == null)
+                return;
+
+            EntityFolder f = db.folder().getFolder(folder);
+            if (f == null)
+                return;
+
+            queue(context, f, FETCH, m.uid);
+        }
     }
 
     @Override