view-attachments does not extract the message within a x-pkcs7-mime

if it's only signed, but not encrypted.  Such a message results, for
example, from a decrypt-save if the message was previously encrypted
and signed.

diff --git a/recvattach.c b/recvattach.c
index f27d712c1ea149f3d950bfecc6698ba232af0860..5850fe64a3a4b993232278509920a25af6a8113d 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -850,11 +850,12 @@ void mutt_view_attachments (HEADER *hdr)
     return;
 
 
-  if (WithCrypto && (hdr->security & ENCRYPT))
+  if (WithCrypto && ((hdr->security & ENCRYPT) ||
+                     (mutt_is_application_smime(hdr->content) & SMIMEOPAQUE)))
   {
     need_secured  = 1;
-    
-    if (!crypt_valid_passphrase(hdr->security))
+
+    if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase(hdr->security))
     {
       mx_close_message (&msg);
       return;