From 3ba51f04b5d5c04d6c759a8d6da12e6e9cfb06a1 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 19 Jul 2022 11:28:22 +0200 Subject: [PATCH] Resolve #456 --- snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php index 3ffcb4e4d..e7c9f83b3 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php @@ -428,9 +428,9 @@ class Message implements \JsonSerializable $oMessage->bIsSpam = false !== \stripos($oMessage->sSubject, '*** SPAM ***'); } else if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_BOGOSITY)) { $oMessage->sSpamResult = $spam; - $oMessage->bIsSpam = !!\preg_match('/yes|spam/', $spam); + $oMessage->bIsSpam = !\str_contains($spam, 'Ham'); if (\preg_match('/spamicity=([\\d\\.]+)/', $spam, $spamicity)) { - $oMessage->setSpamScore(\floatval($spamicity[1])); + $oMessage->setSpamScore(100 * \floatval($spamicity[1])); } } else if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_STATUS)) { $oMessage->sSpamResult = $spam;