Fix "noconv" handling for the message body when we generate inline

PGP.

diff --git a/pgp.c b/pgp.c
index 09abc2ed7f10924c69f93c55db0e9ee7ccc971e1..3d6f52c3a7570f7ff31d3c4cea918ee242007a60 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1253,6 +1253,7 @@ BODY *pgp_traditional_encryptsign (BODY *a, int flags, char *keylist)
   char pgperrfile[_POSIX_PATH_MAX];
   char pgpinfile[_POSIX_PATH_MAX];
 
+  char from_charset[STRING];
   const char *send_charset;
   
   FILE *pgpout = NULL, *pgperr = NULL, *pgpin = NULL;
@@ -1284,7 +1285,12 @@ BODY *pgp_traditional_encryptsign (BODY *a, int flags, char *keylist)
     return NULL;
   }
 
-  if (!mutt_is_us_ascii (Charset))
+  if (a->noconv)
+    mutt_get_body_charset (from_charset, sizeof (from_charset), a);
+  else
+    strfcpy (from_charset, NONULL(Charset), sizeof (from_charset));
+  
+  if (!mutt_is_us_ascii (from_charset))
   {
     int c;
     FGETCONV *fc;