diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-03-02 16:13:08 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-03-02 16:22:17 +0100 |
commit | fddb9ff3839c239cb9c2f420562b651c540b5dcb (patch) | |
tree | b157b5ac6db8fd40cbb15bfdbd60f1a4806bb272 /program/steps | |
parent | ec2453866b3ecc55c133ff47ef6427516b5a26be (diff) |
Display notice that message is encrypted also for application/pkcs7-mime messages (#1488526)
Diffstat (limited to 'program/steps')
-rw-r--r-- | program/steps/mail/func.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 5058dccc6..19290e40a 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1079,9 +1079,9 @@ function rcmail_message_body($attrib) $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers)); } else if ($part->type == 'content') { - // unsapported + // unsupported (e.g. encrypted) if ($part->realtype) { - if ($part->realtype == 'multipart/encrypted') { + if ($part->realtype == 'multipart/encrypted' || $part->realtype == 'application/pkcs7-mime') { $out .= html::span('part-notice', rcube_label('encryptedmessage')); } continue; |