From 0efbbfb75f57da5598c5a479d0b320e31d280c52 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 4 Dec 2018 19:16:05 +0100 Subject: [PATCH] Fix smime messages stop activesync --- api/src/Mail.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/Mail.php b/api/src/Mail.php index ee1c23b0ab..01292bb903 100644 --- a/api/src/Mail.php +++ b/api/src/Mail.php @@ -5652,7 +5652,7 @@ class Mail { $structure = $mail->getStructure(); $isSmime = Mail\Smime::isSmime(($mimeType = $structure->getType())) || Mail\Smime::isSmime(($protocol=$structure->getContentTypeParameter('protocol'))); - if ($isSmime) + if ($isSmime && !class_exists('mail_zpush', false)) { return $this->resolveSmimeMessage($structure, array( 'uid' => $_uid, @@ -5968,8 +5968,8 @@ class Mail if ($_partID != '') { $mailStructureObject = $_headerObject->getStructure(); - if (Mail\Smime::isSmime(($mimeType = $mailStructureObject->getType())) || - Mail\Smime::isSmime(($protocol=$mailStructureObject->getContentTypeParameter('protocol')))) + if (!class_exists('mail_zpush', false) && (Mail\Smime::isSmime(($mimeType = $mailStructureObject->getType())) || + Mail\Smime::isSmime(($protocol=$mailStructureObject->getContentTypeParameter('protocol'))))) { $mailStructureObject = $this->resolveSmimeMessage($mailStructureObject, array( 'uid' => $_uid,