Permit the user to set the typical MIME parameters used with

application/pgp messages.

1 files changed, 9 insertions, 0 deletions

diff --git a/compose.c b/compose.c
index c3ac8ac2..7766c515 100644
--- a/compose.c
+++ b/compose.c
@@ -737,6 +737,15 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
 	  
 	  if ((s = mutt_get_parameter("charset", b->parameter)))
 	    mutt_set_parameter("charset", s, &par);
+	  
+	  /* These are needed for "traditional" PGP.
+	   * Should we switch to a "negative list" instead?
+	   */
+
+	  if ((s = mutt_get_parameter("x-action", b->parameter)))
+	    mutt_set_parameter("x-action", s, &par);
+	  if ((s = mutt_get_parameter("format", b->parameter)))
+	    mutt_set_parameter("format", s, &par);
 
 	  /* ignore the other parameters for now */
 	  mutt_free_parameter(&b->parameter);