diff options
author | Thomas Roessler <roessler@does-not-exist.org> | 1998-12-22 18:07:19 +0000 |
---|---|---|
committer | Thomas Roessler <roessler@does-not-exist.org> | 1998-12-22 18:07:19 +0000 |
commit | a4ad9e13292767f63fbb888074ae9eb87aa8cac5 (patch) | |
tree | a7ceaccdac280fbcdde3d36faa4713ebbc69605a /sendlib.c | |
parent | 877552c07fce7f76bdf582d5b2d3a9d44c6876a9 (diff) |
Fix MIME forwarding. From Vikas.
Diffstat (limited to 'sendlib.c')
-rw-r--r-- | sendlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |