Index: openacs-4/packages/forums/lib/message/row2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row2.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/forums/lib/message/row2.adp	10 Jun 2015 12:45:27 -0000	1.3
+++ openacs-4/packages/forums/lib/message/row2.adp	6 Nov 2016 11:03:00 -0000	1.3.2.1
@@ -31,23 +31,21 @@
     </div>
  </if>
 
-
-
  <div class="details">
  <div style="float: left; background-color:#f0f0f0;">  
-	<a  id="toggle@message.message_id@" href="#"  onclick="dynamicExpand('@message.message_id@');return false;"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+"></a>       
+	<a id="toggle@message.message_id@" href="#"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+"></a>       
         <if @total_number_messages@ le @max_number_messages@>
-          <a href="#" title="#forums.Expand_only_direct_reply_of_message#" onclick="expandChilds('@message.message_id@','@children_direct_list@'); return false;"><img src="/resources/forums/expand.png"  width="20" height="20" alt="#forums.Expand_only_direct_reply_of_message#" style="border:0"></a>          	
-          <a href="#" title="Expand all messages" onclick="expandChilds('@message.message_id@','@children_string@'); return false;"><img  src="/resources/forums/ExpandAll16.gif" width="15" height="15" alt="#forums.Expand_all_messages#"  style="border:0"></a>   
-    	  <a href="#" title="Collapse all messages" onclick="collapseChilds('@message.message_id@','@children_string@'); return false;"><img  src="/resources/forums/CollapseAll16.gif" width="15" height="15" alt="#forums.Collapse_all_messages#" style="border:0"></a> 
+          <a id="expand-direct-@message.message_id@" href="#" title="#forums.Expand_only_direct_reply_of_message#"><img src="/resources/forums/expand.png"  width="20" height="20" alt="#forums.Expand_only_direct_reply_of_message#" style="border:0;"></a>
+          <a id="expand-all-@message.message_id@" href="#" title="Expand all messages"><img src="/resources/forums/ExpandAll16.gif" width="15" height="15" alt="#forums.Expand_all_messages#"  style="border:0;"></a>
+    	  <a id="collapse-all-@message.message_id@" href="#" title="Collapse all messages"><img src="/resources/forums/CollapseAll16.gif" width="15" height="15" alt="#forums.Collapse_all_messages#" style="border:0;"></a>
    	</if>
- </div>   
+ </div>
   
 
-<div id= subject@message.message_id@ style="display:inline">
-  <if @display_subject_p@ true>    
-    <if @preview@ nil>   
-        <div class="subject" >  
+<div id="subject@message.message_id@" style="display:inline">
+  <if @display_subject_p@ true>
+    <if @preview@ nil>
+        <div class="subject">
         &nbsp;
         <a href="@message.direct_url@" title="Direct link to this post" class="reference">@message.number@</a>:
         <a href="message-view?message_id=@message.message_id@" title="Link to this post on a separate page" class="alone">@message.subject@</a>