diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index 246231322..5ad1fce8a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -478,7 +478,7 @@ class BodyStructure implements \JsonSerializable
 		$oStructure->sContentType = \strtolower(\trim($sContentTypeMain.'/'.$sContentTypeSub));
 		$oStructure->aContentTypeParams = $aContentTypeParams;
 		$oStructure->sCharset = $sCharset;
-		$oStructure->sContentID = $sContentID;
+		$oStructure->sContentID = \trim($sContentID);
 		$oStructure->sDescription = $sDescription;
 		$oStructure->sMailEncodingName = \strtolower($sMailEncodingName);
 		$oStructure->sDisposition = \strtolower($sDisposition);