diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index ec08708ba7..e2b38ca859 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -162,6 +162,9 @@ class Core {
                             " group=" + group +
                             " retry=" + retry);
 
+                    if (!ifolder.isOpen())
+                        state.error(new FolderClosedException(ifolder));
+
                     // Fetch most recent copy of message
                     EntityMessage message = null;
                     if (op.message != null)