Fix MIME forwarding. From Vikas.

diff --git a/sendlib.c b/sendlib.c
index f8626cd493b55fe277e7266cf7e9b9daefd8f468..846ebe2cde36025a3f48b255e530f6f3b798f57f 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -986,6 +986,7 @@ BODY *mutt_make_message_attach (CONTEXT *ctx, HEADER *hdr, int attach_msg)
   chflags = CH_XMIT;
   cmflags = 0;
 
+  /* If we are attaching a message, ignore OPTMIMEFORWDECODE */
   if (!attach_msg && option (OPTMIMEFORWDECODE))
   {
     chflags |= CH_MIME | CH_TXTPLAIN;
@@ -994,8 +995,8 @@ BODY *mutt_make_message_attach (CONTEXT *ctx, HEADER *hdr, int attach_msg)
     pgp &= ~PGPENCRYPT;
 #endif
   }
-  else
 #ifdef _PGPPATH
+  else
     if(option(OPTFORWDECRYPT)
        && (hdr->pgp & PGPENCRYPT))
   {
@@ -1014,7 +1015,6 @@ BODY *mutt_make_message_attach (CONTEXT *ctx, HEADER *hdr, int attach_msg)
   }
 #endif
 
-  /* If we are attaching a message, ignore OPTMIMEFORWDECODE */
   mutt_copy_message (fp, ctx, hdr, cmflags, chflags);
   
   fflush(fp);