diff --git a/src/documents/mail.py b/src/documents/mail.py
index 6d368987a..20098458e 100644
--- a/src/documents/mail.py
+++ b/src/documents/mail.py
@@ -76,7 +76,7 @@ class Message(Loggable):
                 continue
 
             dispositions = content_disposition.strip().split(";")
-            if not dispositions[0].lower() == "attachment":
+            if (not dispositions[0].lower() == "attachment") and ("filename" not in dispositions[1].lower()):
                 continue
 
             file_data = part.get_payload()