X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=adce68c258291f0c26a8bce3d1f7c48e23b38092;hp=9c379dc38663ce2f45fb29ebadf9006d108e935c;hb=ef7b80006ebb47372d69c64e8b2b2f0764333d55;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372

diff --git a/handler.c b/handler.c
index 9c379dc..adce68c 100644
--- a/handler.c
+++ b/handler.c
@@ -583,7 +583,7 @@ static void enriched_putc (int c, struct enriched_state *stte)
   }
 }
 
-static void enriched_puts (char *s, struct enriched_state *stte)
+static void enriched_puts (const char *s, struct enriched_state *stte)
 {
   char *c;
 
@@ -936,7 +936,7 @@ static int message_handler (BODY * a, STATE * s)
 {
   struct stat st;
   BODY *b;
-  LOFF_T off_start;
+  off_t off_start;
   int rc = 0;
 
   off_start = ftello (s->fpin);
@@ -1304,16 +1304,24 @@ void mutt_decode_attachment (BODY * b, STATE * s)
   fseeko (s->fpin, b->offset, 0);
   switch (b->encoding) {
   case ENCQUOTEDPRINTABLE:
-    mutt_decode_quoted (s, b->length, istext, cd);
+    mutt_decode_quoted (s, b->length, istext ||
+                        ((WithCrypto & APPLICATION_PGP) &&
+                         mutt_is_application_pgp (b)), cd);
     break;
   case ENCBASE64:
-    mutt_decode_base64 (s, b->length, istext, cd);
+    mutt_decode_base64 (s, b->length, istext ||
+                        ((WithCrypto & APPLICATION_PGP) &&
+                         mutt_is_application_pgp (b)), cd);
     break;
   case ENCUUENCODED:
-    mutt_decode_uuencoded (s, b->length, istext, cd);
+    mutt_decode_uuencoded (s, b->length, istext
+                           || ((WithCrypto & APPLICATION_PGP) &&
+                               mutt_is_application_pgp (b)), cd);
     break;
   default:
-    mutt_decode_xbit (s, b->length, istext, cd);
+    mutt_decode_xbit (s, b->length, istext
+                      || ((WithCrypto & APPLICATION_PGP) &&
+                          mutt_is_application_pgp (b)), cd);
     break;
   }