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.23 -r1.24
--- openacs-4/packages/forums/lib/message/row.adp	11 Oct 2017 10:14:23 -0000	1.23
+++ openacs-4/packages/forums/lib/message/row.adp	15 Jun 2018 19:59:03 -0000	1.24
@@ -23,9 +23,14 @@
     </div>
     <div class="attribution">
 	#forums.Posted_by# 
-      <if @useScreenNameP;literal@ true>@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>
+	<if @useScreenNameP;literal@ true>
+      	  @user_name@
+	</if>
+	<else>
+	  <a href="user-history?user_id=@message.user_id@" title="#forums.show_posting_history_message_username#">
+	    @user_name@
+	  </a>
+	</else> #forums.on# <span class="post-date">@message.posting_date_pretty@</span>
   </div>
   </div>
 
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.13 -r1.14
--- openacs-4/packages/forums/lib/message/row.tcl	7 Aug 2017 23:48:11 -0000	1.13
+++ openacs-4/packages/forums/lib/message/row.tcl	15 Jun 2018 19:59:03 -0000	1.14
@@ -21,23 +21,12 @@
 set viewer_id [ad_conn user_id]
 set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0]
 
-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)]
-} else {
-    set message(content) [ad_html_text_convert -from $message(format) -to text/html -- $message(content)]
-}
+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)
-} else {
-    set message(screen_name) ""
-}
+set user_name [acs_user::get_element \
+                   -user_id $message(user_id) \
+                   -element [expr {$useScreenNameP ? "screen_name" : "name"}]]
 
-
 # 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)]
Index: openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql	7 Oct 2007 22:37:01 -0000	1.5
+++ openacs-4/packages/forums/lib/message/thread-chunk-oracle.xql	15 Jun 2018 19:59:03 -0000	1.6
@@ -22,7 +22,6 @@
                    subject,
                    content,
                    format,
-                   person.name(user_id) as user_name,
                    to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    tree.tree_level(tree_sortkey) as tree_level,
                    state,
@@ -42,7 +41,6 @@
                    subject,
                    content,
                    format,
-                   person.name(user_id) as user_name,
                    to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    tree.tree_level(tree_sortkey) as tree_level,
                    state,
Index: openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql	15 May 2007 20:14:39 -0000	1.6
+++ openacs-4/packages/forums/lib/message/thread-chunk-postgresql.xql	15 Jun 2018 19:59:03 -0000	1.7
@@ -21,18 +21,15 @@
                    t.subject,
                    t.content,
                    t.format,
-                   person__name(t.user_id) as user_name,
                    to_char(t.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    tree_level(t.tree_sortkey) as tree_level,
                    t.state,
                    t.user_id,
                    t.parent_id,
                    t.open_p,
-                   t.max_child_sortkey,
-                   u.screen_name
-            from   $table_name t, users u
+                   t.max_child_sortkey
+            from   $table_name t
             where  t.forum_id = :forum_id
-	    and	   u.user_id = t.user_id
             and    t.tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
             order  by $order_by
         </querytext>
@@ -45,18 +42,15 @@
                    t.subject,
                    t.content,
                    t.format,
-                   person__name(t.user_id) as user_name,
                    to_char(t.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    tree_level(t.tree_sortkey) as tree_level,
                    t.state,
                    t.user_id,
                    t.parent_id,
                    t.open_p,
-                   t.max_child_sortkey,
-		   u.screen_name
-            from   $table_name t, users u
+                   t.max_child_sortkey
+            from   $table_name t
             where  t.forum_id = :forum_id
-	    and	   u.user_id = t.user_id
             and    t.tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
             order  by $order_by
         </querytext>
Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/forums/lib/message/thread-chunk.tcl	17 May 2018 07:41:20 -0000	1.14
+++ openacs-4/packages/forums/lib/message/thread-chunk.tcl	15 Jun 2018 19:59:03 -0000	1.15
@@ -8,11 +8,7 @@
 
 }
 
-if {$forum(posting_policy) eq "moderated"} {
-    set forum_moderated_p 1
-} else {
-    set forum_moderated_p 0
-}
+set forum_moderated_p [expr {$forum(posting_policy) eq "moderated"}]
 
 # get the colors from the params
 set table_border_color [parameter::get -parameter table_border_color]
@@ -44,12 +40,6 @@
 #
 #####
 
-if {$forum(presentation_type) eq "flat"} {
-    set order_by "fma.posting_date, fma.tree_sortkey"
-} else {
-    set order_by "fma.tree_sortkey"
-}
-
 set root_message_id $message(root_message_id)
 set message_id_list [db_list select_message_ordering {}]
 
@@ -65,8 +55,7 @@
     set message(parent_root_url) [export_vars -base [ad_conn url] { { message_id $message(parent_id) } }]
 }
 
-set message(open_p) "t"
-set message(reply_p) [expr {$message(open_p) == "t" || $message(user_id) eq [ad_conn user_id]}]
+set message(reply_p) [expr {$message(user_id) == [ad_conn user_id]}]
 set message(tree_level) 0
 
 
@@ -87,17 +76,24 @@
 set old_message_id 0
 set message_ids {}
 
-db_multirow -extend { posting_date_pretty direct_url number parent_number parent_direct_url reply_p viewed_p open_p} responses $query {} {
-    set open_p t
-    set tree_level [min [expr {$tree_level - $message(tree_level)}] 10]
+db_multirow -extend {
+    posting_date_pretty
+    direct_url
+    number
+    parent_number
+    parent_direct_url
+    reply_p
+    viewed_p
+} responses $query {} {    
+    set tree_level [expr {min($tree_level - $message(tree_level), 10)}]
     set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi]
     set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"]
     set direct_url "$direct_url_base\#msg_$message_id"
     set number [expr {[lsearch $message_id_list $message_id] + 1}]
     set parent_number [expr {[lsearch $message_id_list $parent_id] + 1}]
     set parent_direct_url "$direct_url_base\#msg_$parent_id"
     set parent_root_url [export_vars -base [ad_conn url] {{message_id $parent_id}}]
-    set reply_p [expr {$open_p == "t" || $user_id eq [ad_conn user_id]}]
+    set reply_p [expr {$user_id == [ad_conn user_id]}]
     
     # DEDS: get the response ids the Tcl way or else we need to hit
     # the db for each response to count its children
@@ -132,7 +128,7 @@
 set message(tree_level) 0
 
 if {[info exists alt_template] && $alt_template ne ""} {
-  ad_return_template $alt_template
+    ad_return_template $alt_template
 }
 
 set response_arrays_stub ""