Index: openacs-4/packages/webmail/www/message-send-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-2.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/webmail/www/message-send-2.tcl	25 Jul 2018 02:19:52 -0000	1.6
+++ openacs-4/packages/webmail/www/message-send-2.tcl	25 Jul 2018 02:27:53 -0000	1.7
@@ -141,7 +141,7 @@
 	set old_message_id [db_string old_message_id "
 	                        SELECT message_id FROM wm_messages
 	                        WHERE msg_id = :response_to_msg_id" -default ""]
-	set references [DoubleApos [string trim "$old_references $old_message_id"]]
+	set references [string trim "$old_references $old_message_id"]
 	if { ![empty_string_p $references] } {
 	    db_dml insert_references "INSERT INTO wm_outgoing_headers 
 		               (outgoing_msg_id, name, value, sort_order)
Index: openacs-4/packages/webmail/www/message-send-add-attachment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-add-attachment.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/webmail/www/message-send-add-attachment.tcl	1 Mar 2005 00:01:46 -0000	1.3
+++ openacs-4/packages/webmail/www/message-send-add-attachment.tcl	25 Jul 2018 02:27:53 -0000	1.4
@@ -43,12 +43,8 @@
 if { [empty_string_p $content_type] } {
     set content_type "application/octet-stream"
 }
+set file_name [ad_sanitize_filename $upload_file]
 
-# Get rid of UNIX style directory names.
-set filename [file tail [DoubleApos $upload_file]]
-# Get rid of DOS style directory names.
-regsub {.*\\([^\\]+)$} $filename {\1} filename
-
 db_dml wm_add_attachment {
              INSERT INTO wm_outgoing_message_parts 
              (outgoing_msg_id, data, filename, content_type, sort_order)