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 -r1.21 -r1.21.2.1
--- openacs-4/packages/forums/lib/message/row.adp	3 Jul 2015 17:36:38 -0000	1.21
+++ openacs-4/packages/forums/lib/message/row.adp	11 Oct 2015 18:13:34 -0000	1.21.2.1
@@ -1,11 +1,11 @@
-<if @rownum@ odd><div id="msg_@message.message_id@" class="odd level@message.tree_level@"></if>
+<if @rownum;literal@ odd><div id="msg_@message.message_id@" class="odd level@message.tree_level@"></if>
 <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>
   </div>
-  <if @display_subject_p@ true>
-    <if @preview@ nil>
+  <if @display_subject_p;literal@>
+    <if @preview;literal@ false>
       <div class="subject">
         <a href="@message.direct_url@" title="#forums.Direct_link_to_this_post#" class="reference">@message.number@</a>:
         <a href="message-view?message_id=@message.message_id@" title="#forums.link_on_separate_page#" class="alone">@message.subject@</a>
@@ -23,7 +23,7 @@
     </div>
     <div class="attribution">
 	#forums.Posted_by# 
-      <if @useScreenNameP@>@message.screen_name@</if>
+      <if @useScreenNameP;literal@>@message.screen_name@</if>
       <else><a href="user-history?user_id=@message.user_id@"
       title="#forums.show_posting_history_message_username#">@message.user_name@</a></else> #forums.on# <span class="post-date">@message.posting_date_pretty@</span>
   </div>
@@ -39,17 +39,17 @@
     </if>
   </div>
   </div>
-    <if @preview@ nil and @any_action_p@>
-    <if @permissions.post_p@ eq 1 or @moderate_p@ or @viewer_id@ ne "0">
+    <if @preview;literal@ false and @any_action_p;literal@>
+    <if @permissions.post_p;literal@ eq 1 or @moderate_p;literal@ or @viewer_i;literal@ ne "0">
     <div class="action-list">
     <ul>
-      <if @permissions.post_p@ eq 1>
-        <if @presentation_type@ ne "flat"><li><a href="message-post?parent_id=@message.message_id@" class="button" title="#forums.reply#">#forums.reply#</a></li></if>
+      <if @permissions.post_p;literal@ eq 1>
+        <if @presentation_type;literal@ ne "flat"><li><a href="message-post?parent_id=@message.message_id@" class="button" title="#forums.reply#">#forums.reply#</a></li></if>
       </if>
-      <if @viewer_id@ ne "0">
+      <if @viewer_id;literal@ ne "0">
          <li><a href="message-email?message_id=@message.message_id@" class="button" title="#forums.forward#">#forums.forward#</a></li>
       </if>
-      <if @moderate_p@>
+      <if @moderate_p;literal@>
         <li><a href="moderate/message-edit?message_id=@message.message_id@" class="button" title="#forums.edit#">#forums.edit#</a></li>
         <li><a href="moderate/message-delete?message_id=@message.message_id@" class="button" title="#forums.delete#">#forums.delete#</a></li>	
 	<if @message.parent_id@ nil>
@@ -59,11 +59,11 @@
 	<else>
 	  <li><a href="moderate/message-move?message_id=@message.message_id@" class="button" title="#forums.Move_to_other_thread#">#forums.Move_to_other_thread#</a></li>
 	</else>
-        <if @forum_moderated_p@>
-          <if @message.state@ ne approved>
+        <if @forum_moderated_p;literal@>
+          <if @message.state;literal@ ne approved>
             <li><a href="moderate/message-approve?message_id=@message.message_id@" class="button" title="#forums.approve#">#forums.approve#</a></li>
           </if>
-          <if @message.state@ ne rejected and @message.max_child_sortkey@ nil>
+          <if @message.state;literal@ ne rejected and @message.max_child_sortkey@ nil>
             <li><a href="moderate/message-reject?message_id=@message.message_id@" class="button" title="#forums.reject#">#forums.reject#</a></li>
           </if>
         </if>
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 -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/forums/lib/message/row.tcl	10 Oct 2015 17:57:53 -0000	1.12.2.2
+++ openacs-4/packages/forums/lib/message/row.tcl	11 Oct 2015 18:13:35 -0000	1.12.2.3
@@ -1,32 +1,35 @@
-ad_page_contract {
+ad_include_contract {
 
-    a message chunk to be included in a table listing of messages
+    A message chunk to be included in a table listing of messages
 
     @author yon (yon@openforce.net)
     @author arjun (arjun@openforce.net)
     @creation-date 2002-06-02
     @cvs-id $Id$
 
+} {
+    {rownum:integer 1}
+    {presentation_type:word ""}
+    {forum_moderated_p:boolean 0}
+    {moderate_p:boolean 0}
+    {preview:boolean 0}
+    {alt_template:token ""}
+    {permissions}
+    {message}
 }
 
 set viewer_id [ad_conn user_id]
 set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0]
 
-if {(![info exists rownum] || $rownum eq "")} { 
-    set rownum 1
-}
-
-if {(![info exists presentation_type] || $presentation_type eq "")} {
-    set presentation_type ""
-}
-
-#set message(content) [::util::disk_cache_eval \
+if {0 && [info exists message(message_id)]} {
+    set message(content) [::util::disk_cache_eval \
                           -call [list ad_html_text_convert -from $message(format) -to text/html -- $message(content)] \
                           -key fragments \
                           -id $message(message_id)]
-set message(content) [ad_html_text_convert -from $message(format) -to text/html -- $message(content)]
+} else {
+    set message(content) [ad_html_text_convert -from $message(format) -to text/html -- $message(content)]
+}
 
-
 if {$useScreenNameP} {
     acs_user::get -user_id $viewer_id -array user_info
     set message(screen_name) $user_info(screen_name)
@@ -35,21 +38,14 @@
 }
 
 
-
 # convert emoticons to images if the parameter is set
 if { [string is true [parameter::get -parameter DisplayEmoticonsAsImagesP -default 0]] } {
     set message(content) [forum::format::emoticons -content $message(content)]
 }
 
-# JCD: display subject only if changed from the root subject
-if {![info exists root_subject]} {
-    set display_subject_p 1
-} else {
-    regsub {^(Response to |\s*Re:\s*)*} $message(subject) {} subject
-    set display_subject_p [expr {$subject ne $root_subject }] 
-}
+set display_subject_p 1
 
-if {([info exists alt_template] && $alt_template ne "")} {
+if {$alt_template ne ""} {
   ad_return_template $alt_template
 }
 if {![info exists message(message_id)]} {
@@ -62,7 +58,7 @@
 set allow_edit_own_p [parameter::get -parameter AllowUsersToEditOwnPostsP -default 0]
 set own_p [expr {$message(user_id) eq $viewer_id && $allow_edit_own_p}]
 
-if { [info exists preview] } {
+if { $preview } {
     set any_action_p 0
 } else {
     set notflat_p [expr {$presentation_type ne "flat"}]