diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index fe8ecde783..db386d269a 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -5853,8 +5853,8 @@ public class MessageHelper {
         }
 
         private void flushBuffer() throws IOException {
-            if (boundary != null && boundaries != 2)
-                throw new IOException("Content boundaries=" + boundaries);
+            if (boundary != null && boundaries < 1)
+                throw new IOException("Signed part missing");
             if (buffer.size() > 0)
                 writeBuffer();
         }