Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/forums/tcl/messages-procs.tcl	27 Oct 2014 16:41:37 -0000	1.45
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	22 Jun 2015 21:20:27 -0000	1.46
@@ -101,7 +101,8 @@
 
     set SecureOutboundP [parameter::get -parameter "SecureOutboundP" -default 0]
     if { $SecureOutboundP && [ns_conn isconnected] && [security::secure_conn_p] } {
-        set message_html "<p>#forums.Message_content_witheld# #forums.To_view_message_follow_link# <a href=\"${url}message-view?message_id=$message(root_message_id)\">${url}message-view?message_id=$message(root_message_id)</a></p>"
+	set href ${url}message-view?message_id=$message(root_message_id)
+        set message_html "<p>#forums.Message_content_witheld# #forums.To_view_message_follow_link# <a href=\"[ns_quotehtml $href]\">[ns_quotehtml $href]</a></p>"
         set message_text [ad_html_text_convert -from text/html -to text/plain -- $message_html]
     }
 
@@ -338,10 +339,10 @@
     if {$order_by eq "posting_date"} {
         # subject selected
         set subject_link "<b>$subject_label</b>"
-        set child_link "<a href=\"$toggle_url\">$child_label</a>"
+        set child_link "<a href=\"[ns_quotehtml $toggle_url]\">$child_label</a>"
     } else {
         # child selected
-        set subject_link "<a href=\"$toggle_url\">$subject_label</a>"
+        set subject_link "<a href=\"[ns_quotehtml $toggle_url]\">$subject_label</a>"
         set child_link "<b>$child_label</b>"
     }
     set sort_filter "$subject_link | $child_link"