diff -ur SOGo.orig/SoObjects/Mailer/SOGoDraftObject.m SOGo/SoObjects/Mailer/SOGoDraftObject.m
--- SOGo.orig/SoObjects/Mailer/SOGoDraftObject.m	2015-09-16 22:41:36.000000000 +0400
+++ SOGo/SoObjects/Mailer/SOGoDraftObject.m	2015-10-08 17:25:52.892008104 +0400
@@ -1269,7 +1269,7 @@
     {
       s = [self mimeTypeForExtension:[_name pathExtension]];
       if ([_name length] > 0)
-	s = [s stringByAppendingFormat: @"; name=\"%@\"", _name];
+	s = [s stringByAppendingFormat: @"; name=\"%@\"", [_name stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]];
     }
 
   return s;
@@ -1295,7 +1295,7 @@
     cdtype = @"attachment";
 
   cd = [cdtype stringByAppendingString: @"; filename=\""];
-  cd = [cd stringByAppendingString: _name];
+  cd = [cd stringByAppendingString: [_name stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]];
   cd = [cd stringByAppendingString: @"\""];
 
   // TODO: add size parameter (useful addition, RFC 2183)
diff -ur SOGo.orig/UI/MailerUI/UIxMailEditor.m SOGo/UI/MailerUI/UIxMailEditor.m
--- SOGo.orig/UI/MailerUI/UIxMailEditor.m	2015-09-16 22:41:36.000000000 +0400
+++ SOGo/UI/MailerUI/UIxMailEditor.m	2015-10-08 17:30:14.202730035 +0400
@@ -523,6 +523,7 @@
   NSString *newFilename, *baseFilename, *extension;
   unsigned int variation;
 
+  filename = [filename stringByReplacingOccurrencesOfString:@"\\\"" withString:@"\""]; /* to real filename */
   if (!attachedFiles)
     attachedFiles = [NSMutableArray new];
 
diff -ur SOGo.orig/UI/Templates/MailerUI/UIxMailEditor.wox SOGo/UI/Templates/MailerUI/UIxMailEditor.wox
--- SOGo.orig/UI/Templates/MailerUI/UIxMailEditor.wox	2015-09-16 22:41:36.000000000 +0400
+++ SOGo/UI/Templates/MailerUI/UIxMailEditor.wox	2015-10-08 17:32:23.181441089 +0400
@@ -118,7 +118,7 @@
           <li class="attachButton"><span class="button fileinput-button"><span><img rsrc:src="title_attachment_14x14.png" /> <var:string label:value="Attach"/></span><input id="fileUpload" type="file" name="attachments" tabindex="-1" multiple="multiple"/></span></li>
           <var:foreach list="attachmentAttrs" item="attachment"
           ><li class="progressDone" var:data-filename="attachment.filename">
-            <i class="icon-attachment"><!-- icon --></i><a var:href="attachment.url" target="_new"><var:string value="attachment.filename"/></a><span class="muted">(<var:string value="attachment.size" formatter="sizeFormatter" />)</span>
+            <i class="icon-attachment"><!-- icon --></i><a var:href="attachment.url" target="_new"><var:string value="attachment.filename" const:escapeHTML="YES"/></a><span class="muted">(<var:string value="attachment.size" formatter="sizeFormatter"/>)</span>
           </li></var:foreach>
         </ul>
       </div>