diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 7827ac9e54..e0ea5c3bd0 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1427,7 +1427,8 @@ public class MessageHelper {
                         return parts;
                     }
                 }
-            } else if (imessage.isMimeType("application/pkcs7-mime")) {
+            } else if (imessage.isMimeType("application/pkcs7-mime") ||
+                    imessage.isMimeType("application/x-pkcs7-mime")) {
                 ContentType ct = new ContentType(imessage.getContentType());
                 String smimeType = ct.getParameter("smime-type");
                 if ("enveloped-data".equals(smimeType)) {