Fix Content-Disposition of PGP/MIME messages. The second part

should get a file name for convenience, not the first one.

diff --git a/pgp.c b/pgp.c
index 63d67ef512fd293a4039761a261a0c35c0179fcd..b11f007f31b3a2c1e9ad6f4bde5538633e44c1af 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1473,18 +1473,16 @@ static BODY *pgp_encrypt_message (BODY *a, char *keylist, int sign)
   t->parts->type = TYPEAPPLICATION;
   t->parts->subtype = safe_strdup ("pgp-encrypted");
   t->parts->encoding = ENC7BIT;
-  t->parts->use_disp = 1;
-  t->parts->disposition = DISPINLINE;
-  t->parts->d_filename = safe_strdup ("msg.asc"); /* non pgp/mime can save */
 
   t->parts->next = mutt_new_body ();
   t->parts->next->type = TYPEAPPLICATION;
   t->parts->next->subtype = safe_strdup ("octet-stream");
   t->parts->next->encoding = ENC7BIT;
   t->parts->next->filename = safe_strdup (tempfile);
-  t->parts->next->use_disp = 0;
+  t->parts->next->use_disp = 1;
   t->parts->next->disposition = DISPINLINE;
   t->parts->next->unlink = 1; /* delete after sending the message */
+  t->parts->next->d_filename = safe_strdup ("msg.asc"); /* non pgp/mime can save */
 
   return (t);
 }