diff --git a/Products/zms/standard.py b/Products/zms/standard.py
index 3c228dd66..81f8f5bf6 100644
--- a/Products/zms/standard.py
+++ b/Products/zms/standard.py
@@ -2473,7 +2473,7 @@ def sendMail(context, mto, msubject, mbody, REQUEST=None, mattach=None):
           part = MIMEAudio(filedata, fileextn)
         else:
           part = MIMEApplication(filedata)
-        part.add_header('Content-Disposition', 'attachment; filename="%s"'%umlaut_quote(filename).replace(' ','_'))
+        part.add_header('Content-Disposition', 'attachment; filename="%s"'%url_quote(umlaut_quote(filename).replace(' ','_')))
         mime_msg.attach(part)
 
   # Get MailHost.