diff --git a/imap-core/lib/indexer/body-structure.js b/imap-core/lib/indexer/body-structure.js
index 4b7110b..26db9ac 100644
--- a/imap-core/lib/indexer/body-structure.js
+++ b/imap-core/lib/indexer/body-structure.js
@@ -38,7 +38,7 @@ class BodyStructure {
                 case 'text':
                     return this.processTextNode(node, options);
                 case 'message':
-                    if (node.parsedHeader['content-type'].subtype === 'rfc822') {
+                    if (node.parsedHeader['content-type'].subtype === 'rfc822' && !/attachment/i.test(node.parsedHeader['content-disposition'])) {
                         if (!options.attachmentRFC822) {
                             return this.processRFC822Node(node, options);
                         }