Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -N -r1.51 -r1.52
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	29 Jun 2015 11:03:39 -0000	1.51
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	2 Jul 2015 23:03:13 -0000	1.52
@@ -467,7 +467,7 @@
             }
         }
 
-        append formatted_message $substitution
+        append formatted_message [ns_quotehtml $substitution]
     }
 
     append formatted_message $remaining_message