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 33f1500a9..320d46d46 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
@@ -466,7 +466,7 @@ class Message implements \JsonSerializable
 						$this->sSpamResult = "{$value[1]} / {$required[1]}";
 					}
 				}
-				$this->bIsSpam = 0 === \strpos($spam, 'Yes,');
+				$this->bIsSpam = 'Yes' === \substr($spam, 0, 3);
 //				$spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_FLAG);
 //				$this->bIsSpam = false !== \stripos($spam, 'YES');
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
index 37bdce7d0..9ccdf0d15 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
@@ -59,7 +59,8 @@ abstract class Header
 		X_SPAM_FLAG     = 'X-Spam-Flag',     // YES/NO
 		X_SPAM_LEVEL    = 'X-Spam-Level',    // *******
 		X_SPAM_STATUS   = 'X-Spam-Status',   // Yes|No
-		X_SPAM_BAR      = 'X-Spam-Bar',      // ++
+		X_SPAM_BAR      = 'X-Spam-Bar',      // ++ | --
+		X_SPAM_REPORT   = 'X-Spam-Report',
 	// Rspamd
 		X_SPAMD_RESULT  = 'X-Spamd-Result',  // default: False [7.13 / 9.00],
 		X_SPAMD_BAR     = 'X-Spamd-Bar',     // +++++++