diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 8f6f814174..2d5114ed29 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -502,6 +502,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     EntityMessage message = db.message().getMessageByUid(browsable.id, uid);
                     if (message == null)
                         add.add(m);
+                } catch (FolderClosedException ex) {
+                    throw ex;
                 } catch (Throwable ex) {
                     Log.w(ex);
                     add.add(m);