diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 14045226c..b64325fe2 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -176,7 +176,8 @@ static NSString    *userAgent      = nil;
 {
   if (!path)
     {
-      path = [[self userSpoolFolderPath] stringByAppendingPathComponent: nameInContainer];
+
+      path = [[self userSpoolFolderPath] stringByAppendingPathComponent: [nameInContainer asSafeFilename]];
       [path retain];
     }