Use text/plain; format=... when we are asked to detect inline PGP

material in in text/plain body parts.

diff --git a/pgp.c b/pgp.c
index 041f422184e2edbb4cb3c0c272b6f3ca2813c7c3..2166e248cfc798a4cc72c668c7ca220ee7168c2f 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -446,11 +446,8 @@ static int pgp_check_traditional_one_body (FILE *fp, BODY *b, int tagged_only)
 
   /* fix the content type */
   
-  b->type = TYPEAPPLICATION;
-  mutt_str_replace (&b->subtype, "pgp");
-  
-  mutt_set_parameter ("format", "text", &b->parameter);
-  mutt_set_parameter ("x-action", enc ? "encrypt" : "sign", &b->parameter);
+  mutt_set_parameter ("format", "fixed", &b->parameter);
+  mutt_set_parameter ("x-action", enc ? "pgp-encrypted" : "pgp-signed", &b->parameter);
   
   return 1;
 }