diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
index 0e9adfdc7..4697cfd23 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
@@ -76,12 +76,9 @@ class HeaderCollection extends \MailSo\Base\Collection
 
 	public function GetAsEmailCollection(string $sHeaderName, bool $bCharsetAutoDetect = false) : ?EmailCollection
 	{
-		$oResult = null;
-		$sValue = $this->ValueByName($sHeaderName, $bCharsetAutoDetect);
-		if (\strlen($sValue)) {
-			$oResult = new EmailCollection($sValue);
-		}
-		return $oResult;
+		return new EmailCollection(
+			$this->ValueByName($sHeaderName, $bCharsetAutoDetect)
+		);
 	}
 
 	public function ParametersByName(string $sHeaderName) : ?ParameterCollection