Index: openacs-4/packages/forums/lib/message/row.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v
diff -u -N -r1.21.2.4 -r1.21.2.5
--- openacs-4/packages/forums/lib/message/row.adp	7 Jul 2016 08:04:02 -0000	1.21.2.4
+++ openacs-4/packages/forums/lib/message/row.adp	27 Sep 2016 10:58:07 -0000	1.21.2.5
@@ -2,7 +2,7 @@
 <else><div id="msg_@message.message_id@" class="even level@message.tree_level@"></else>
     <div class="details">
   <div style="float: left; padding-right: 4px;">
-    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(forums_toggle(@message.message_id@))" title="#forums.collapse_message#"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="#forums.collapse#"></a>
+    <a id="toggle@message.message_id@" class="dynexpanded" href="#" title="#forums.collapse_message#"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="#forums.collapse#"></a>
   </div>
   <if @display_subject_p;literal@>
     <if @preview;literal@ false>
Index: openacs-4/packages/forums/lib/message/row.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.tcl,v
diff -u -N -r1.12.2.4 -r1.12.2.5
--- openacs-4/packages/forums/lib/message/row.tcl	13 Oct 2015 10:44:53 -0000	1.12.2.4
+++ openacs-4/packages/forums/lib/message/row.tcl	27 Sep 2016 10:58:07 -0000	1.12.2.5
@@ -61,11 +61,20 @@
 if { $preview } {
     set any_action_p 0
 } else {
-    set notflat_p [expr {$presentation_type ne "flat"}]
+    set notflat_p          [expr {$presentation_type ne "flat"}]
     set post_and_notflat_p [expr {$post_p && $notflat_p}]
-    set any_action_p [expr { $post_and_notflat_p || $viewer_id || $moderate_p }]
+    set any_action_p       [expr {$post_and_notflat_p || $viewer_id || $moderate_p}]
 }
 
+template::add_body_script -script [subst {
+    document.getElementById('toggle$message(message_id)').addEventListener('click', function (event) {
+        event.preventDefault();
+        forums_toggle('$message(message_id)');
+        return false;
+    }, false);
+}]
+
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4