summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2018-06-27 10:31:45 -0600
committerEduardo Chappa <chappa@washington.edu>2018-06-27 10:31:45 -0600
commitb26daed8090cd71b90c390254d5ec4d790ab6fbf (patch)
tree4f4931ababd1fea403b0dd3d03d079992225f9af
parent7346da5899d868cf83eb535a71d067007a1e1e47 (diff)
downloadalpine-b26daed8090cd71b90c390254d5ec4d790ab6fbf.tar.xz
* 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.
-rw-r--r--pith/reply.c6
1 files changed, 5 insertions, 1 deletions
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,