From fce9ba3a41341f71bb8e743e4bd671fdc2ae9fff Mon Sep 17 00:00:00 2001 From: hadi Date: Mon, 19 Jun 2023 17:05:37 +0200 Subject: [PATCH] * Mail: fix mixed up inline images and attachments in smime signed messages --- api/src/Mail.php | 2 +- mail/js/app.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/Mail.php b/api/src/Mail.php index 73cae99da4..a6a2b61597 100644 --- a/api/src/Mail.php +++ b/api/src/Mail.php @@ -6136,7 +6136,7 @@ class Mail // everything else we only consider after we checked all if (!isset($attachment)) $attachment = $part; // do we want content fetched, can be done later, if not needed - if (isset($_stream)) + if (isset($_stream) && empty($structure->getMetadata('X-EGroupware-Smime'))) { $this->fetchPartContents($_uid, $attachment, $_stream); } diff --git a/mail/js/app.js b/mail/js/app.js index 87550d2433..54fb8fb514 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -6060,7 +6060,7 @@ app.classes.mail = AppJS.extend( { if (_obj1[i]['mail_id'] != _obj2[i]['mail_id'] || _obj1[i]['partID'] != _obj2[i]['partID']) return false; } - + if (_obj1.length != _obj2.length) return false; return true; }; if (_attachments && _attachments.length)