diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 88660be19b..6c58c60d16 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -412,10 +412,16 @@ class Core {
                                 ex.getCause() instanceof MessageRemovedException ||
                                 ex.getCause() instanceof MessageRemovedIOException ||
                                 ex.getCause() instanceof BadCommandException ||
-                                ex.getCause() instanceof CommandFailedException) {
+                                ex.getCause() instanceof CommandFailedException ||
+                                (ex instanceof FolderClosedException &&
+                                        ex.getCause() instanceof IOException &&
+                                        EntityFolder.DRAFTS.equals(folder.type) &&
+                                        EntityOperation.ADD.equals(op.name))) {
                             // com.sun.mail.iap.BadCommandException: B13 BAD [TOOBIG] Message too large
                             // com.sun.mail.iap.CommandFailedException: AY3 NO [CANNOT] Cannot APPEND to a SPAM folder
                             // com.sun.mail.iap.CommandFailedException: B16 NO [ALERT] Cannot MOVE messages out of the Drafts folder
+                            // Drafts: javax.mail.FolderClosedException: * BYE Jakarta Mail Exception:
+                            //   javax.net.ssl.SSLException: Write error: ssl=0x8286cac0: I/O error during system call, Broken pipe
                             Log.w("Unrecoverable");
 
                             try {