From b26daed8090cd71b90c390254d5ec4d790ab6fbf Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Wed, 27 Jun 2018 10:31:45 -0600 Subject: * For S/MIME messages, replying to some signed messages might place the full text of the original message in a multipart type attachment, instead of the first body part of the replied message. --- pith/reply.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pith/reply.c b/pith/reply.c index 97b8c19f..0fb8199e 100644 --- a/pith/reply.c +++ b/pith/reply.c @@ -1072,7 +1072,11 @@ reply_body(MAILSTREAM *stream, ENVELOPE *env, struct mail_bodystruct *orig_body, else if(orig_body->type == TYPEMULTIPART){ /*------ Message is Multipart ------*/ if(orig_body->subtype - && !strucmp(orig_body->subtype, "signed") + && (!strucmp(orig_body->subtype, "signed") +#ifdef SMIME + || !strucmp(orig_body->subtype, OUR_PKCS7_ENCLOSURE_SUBTYPE) +#endif /* SMIME */ + ) && orig_body->nested.part){ /* operate only on the signed part */ body = reply_body(stream, env, -- cgit v1.2.3-70-g09d2