diff --git a/kmmsgpartdlg.cpp b/kmmsgpartdlg.cpp
index c493dac14..900c13a81 100644
--- a/kmmsgpartdlg.cpp
+++ b/kmmsgpartdlg.cpp
@@ -425,8 +425,9 @@ void KMMsgPartDialogCompat::applyChanges()
 
     cDisp += " filename";
     if ( name != QString( encName ) )
-      cDisp += '*';
-    cDisp += "=\"" + encName + '"';
+      cDisp += "*=" + encName;
+    else
+      cDisp += "=\"" + encName + '"';
     mMsgPart->setContentDisposition( cDisp );
   }