diff --git a/kmailicalifaceimpl.cpp b/kmailicalifaceimpl.cpp
index 02664af7d..95bfbb562 100644
--- a/kmailicalifaceimpl.cpp
+++ b/kmailicalifaceimpl.cpp
@@ -192,6 +192,8 @@ static DwBodyPart* findBodyPart( const KMMessage& msg, const QString& attachment
     if ( part->hasHeaders()
          && attachmentName == part->Headers().ContentDisposition().Filename().c_str() )
       return part;
+    if ( part->hasHeaders() && attachmentName == part->Headers().ContentType().Name().c_str() )
+      return part;
   }
   return 0;
 }