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 070a27521..36e552664 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
@@ -473,7 +473,6 @@ class BodyStructure
 		++$iExtraItemPos;
 
 		$sDisposition = '';
-		$sFileName = '';
 
 		if ($iExtraItemPos < \count($aBodyStructure)) {
 			$aDispList = $aBodyStructure[$iExtraItemPos];
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
index b4ac54835..d931abed3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
@@ -100,7 +100,7 @@ class Attachment implements \JsonSerializable
 			'MimeIndex' => (string) $this->oBodyStructure->PartID(),
 			'MimeType' => $this->oBodyStructure->ContentType(),
 			'MimeTypeParams' => $this->oBodyStructure->ContentTypeParameters(),
-			'FileName' => \MailSo\Base\Utils::SecureFileName($this->oBodyStructure->FileName(true)),
+			'FileName' => \MailSo\Base\Utils::SecureFileName($this->FileName(true)),
 			'EstimatedSize' => $this->oBodyStructure->EstimatedSize(),
 			'Cid' => $this->oBodyStructure->ContentID(),
 			'ContentLocation' => $this->oBodyStructure->ContentLocation(),