From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 22 Dec 1998 18:07:19 +0000 (+0000)
Subject: Fix MIME forwarding.  From Vikas.
X-Git-Tag: archive/mutt-0-95-exp~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4ad9e13292767f63fbb888074ae9eb87aa8cac5;p=mutt

Fix MIME forwarding.  From Vikas.
---

diff --git a/sendlib.c b/sendlib.c
index f8626cd4..846ebe2c 100644
--- 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);