diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 9bfa7be753..13e1d7bb78 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -8937,7 +8937,9 @@ public class FragmentMessages extends FragmentBase
                             Log.e(ex);
                         }
 
-                        if (!parts.hasBody() && remotes.size() == 1)
+                        if (!parts.hasBody() && remotes.size() == 1 &&
+                                ("application/pkcs7-mime".equals(remote.type) ||
+                                        "application/x-pkcs7-mime".equals(remote.type)))
                             try (FileInputStream fos = new FileInputStream(remote.getFile(context))) {
                                 new CMSSignedData(fos).getSignedContent().getContent();
                                 signedData = true;