diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index e382678..fb0da40 100755
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -508,7 +508,7 @@ class Message
     {
         $parameters = self::getParametersFromStructure($structure);
 
-        if ((isset($parameters['name']) || isset($parameters['filename']))
+        if ((!empty($parameters['name']) || !empty($parameters['filename']))
             || (isset($structure->subtype) && strtolower($structure->subtype) == 'rfc822')
         ) {
             $attachment          = new Attachment($this, $structure, $partIdentifier);