diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index fd06588518..df55382820 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2203,7 +2203,8 @@ class Core {
                             ex.getCause() instanceof ConnectionException))
                 recoverable = false;
 
-            if (ex instanceof FolderClosedException)
+            if (ex instanceof FolderClosedException ||
+                    ex instanceof FolderNotFoundException)
                 recoverable = false;
 
             if (ex instanceof IllegalStateException && (