diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index d51aa1d06..ddf37259d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -157,10 +157,11 @@ class MailClient
 			// SPAM
 			\MailSo\Mime\Enumerations\Header::X_SPAM_STATUS,
 			\MailSo\Mime\Enumerations\Header::X_SPAMD_RESULT,
-			\MailSo\Mime\Enumerations\Header::X_BOGOSITY
+			\MailSo\Mime\Enumerations\Header::X_BOGOSITY,
 			// Virus
-			,\MailSo\Mime\Enumerations\Header::X_VIRUS_SCANNED,
-			,\MailSo\Mime\Enumerations\Header::X_VIRUS_STATUS
+			\MailSo\Mime\Enumerations\Header::X_VIRUS,
+			\MailSo\Mime\Enumerations\Header::X_VIRUS_SCANNED,
+			\MailSo\Mime\Enumerations\Header::X_VIRUS_STATUS
 		), true);
 //
 //		return \MailSo\Imap\Enumerations\FetchType::ENVELOPE;
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 5bef7260b..dcfce1ff6 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
@@ -479,6 +479,9 @@ class Message implements \JsonSerializable
 				$this->bIsSpam = false !== \stripos($spam, 'YES');
 			}
 
+			if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS)) {
+				$this->bHasVirus = true;
+			}
 			if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS_STATUS)) {
 				if (false !== \stripos($spam, 'infected')) {
 					$this->bHasVirus = true;
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 6d1df385c..c9006581c 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
@@ -70,7 +70,8 @@ abstract class Header
 		X_HAM_REPORT    = 'X-Ham-Report',
 		X_MICROSOFT_ANTISPAM = 'x-microsoft-antispam',
 
-	// X-Quarantine-ID
+//	 	X_QUARANTINE_ID = 'X-Quarantine-ID',
+	// Rspamd
 		X_VIRUS = 'X-Virus',
 	// ClamAV
 		X_VIRUS_SCANNED = 'X-Virus-Scanned',