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 -r1.52 -r1.53
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	2 Jul 2015 23:03:13 -0000	1.52
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	11 Jul 2015 16:45:23 -0000	1.53
@@ -465,9 +465,12 @@
                 set command "set $var"
                 set substitution [uplevel $command]
             }
+            if {$quote_p} {
+                set substitution [ns_quotehtml $substitution]
+            }
         }
 
-        append formatted_message [ns_quotehtml $substitution]
+        append formatted_message $substitution
     }
 
     append formatted_message $remaining_message