diff --git a/mail/js/app.js b/mail/js/app.js
index 064db08e3b..1222fc5ad9 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3047,7 +3047,7 @@ app.classes.mail = AppJS.extend(
 				subject = this.et2.getArrayMgr('content').getEntry('mail_displaysubject');
 			}
 			// Replace these now, they really cause problems later
-			var filename = subject ? subject.replace(/[\f\n\t\v\/\\\?]/g,"_") : 'unknown';
+			var filename = subject ? subject.replace(/[\f\n\t\v\x0b\:*#?<>%"\/\\\?]/g,"_") : 'unknown';
 			ids.push(_id);
 			names.push(filename+'.eml');
 		}