diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index d7aeecc..74ebac5 100755
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -444,7 +444,9 @@ class Message
     {
         $parameters = self::getParametersFromStructure($structure);
 
-        if (isset($parameters['name']) || isset($parameters['filename'])) {
+        if ((isset($parameters['name']) || isset($parameters['filename']))
+            || (isset($structure->subtype) && strtolower($structure->subtype) == 'rfc822')
+        ) {
             $attachment          = new Attachment($this, $structure, $partIdentifier);
             $this->attachments[] = $attachment;
         } elseif ($structure->type == 0 || $structure->type == 1) {