Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	23 Oct 2003 10:28:35 -0000	1.19
+++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	28 Oct 2003 17:04:04 -0000	1.20
@@ -19,12 +19,12 @@
   <msg key="Confirm_Post_to_Forum">Confirm Post to Forum:</msg>
   <msg key="Create_a_New_Forum">Create a New Forum</msg>
   <msg key="Create_New_Forum">Create New Forum</msg>
-  <msg key="delete">delete</msg>
+  <msg key="delete">Delete</msg>
   <msg key="disable">disable</msg>
   <msg key="disable_it">disable it</msg>
   <msg key="disabled">disabled</msg>
   <msg key="Edit">Edit</msg>
-  <msg key="edit">edit</msg>
+  <msg key="edit">Edit</msg>
   <msg key="Edit_again">Edit again</msg>
   <msg key="Edit_forum">Edit forum</msg>
   <msg key="Edit_Message">Edit Message:</msg>
@@ -48,7 +48,7 @@
   <msg key="ForumID">ForumID</msg>
   <msg key="Forums">Forums</msg>
   <msg key="Forums_Posting_hist_lt">Forums: Posting history for</msg>
-  <msg key="forward">forward</msg>
+  <msg key="forward">Forward</msg>
   <msg key="Fwd">Fwd:</msg>
   <msg key="html">HTML</msg>
   <msg key="Last_Post">Last Post</msg>
@@ -92,6 +92,7 @@
   <msg key="Post_a_Reply">Post a Reply</msg>
   <msg key="Post_to_Forum">Post to Forum:</msg>
   <msg key="Posted">Posted</msg>
+  <msg key="Posted_by">Posted by</msg>
   <msg key="Posting_Date">Posting Date</msg>
   <msg key="Posting_History">Posting History</msg>
   <msg key="Posting_history_for">Posting history for</msg>
@@ -102,7 +103,9 @@
   <msg key="reject">reject</msg>
   <msg key="Rejected">Rejected</msg>
   <msg key="Replies">Replies</msg>
-  <msg key="reply">reply</msg>
+  <msg key="reply">Reply</msg>
+  <msg key="Reply_to_first_post_in_thread">Reply to first post in thread</msg>
+  <msg key="Reply_to_first_post_on_page_label">Reply to first post on this page</msg>
   <msg key="Search">Search:</msg>
   <msg key="Search_1">Search</msg>
   <msg key="Search_colon">Search:</msg>
Index: openacs-4/packages/forums/www/message-view-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/forums/www/message-view-oracle.xql	28 Oct 2003 09:54:55 -0000	1.6
+++ openacs-4/packages/forums/www/message-view-oracle.xql	28 Oct 2003 17:04:04 -0000	1.7
@@ -11,7 +11,7 @@
             where  fm.message_id = :root_message_id
             and    fma.forum_id = :forum_id
             and    fma.tree_sortkey between fm.tree_sortkey and tree.right(fm.tree_sortkey)
-            order  by $order_by
+            order  by fma.message_id
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/forums/www/message-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/message-view-postgresql.xql	28 Oct 2003 09:54:55 -0000	1.7
+++ openacs-4/packages/forums/www/message-view-postgresql.xql	28 Oct 2003 17:04:04 -0000	1.8
@@ -11,7 +11,7 @@
             where  fm.message_id = :root_message_id
             and    fma.forum_id = :forum_id
             and    fma.tree_sortkey between fm.tree_sortkey and tree_right(fm.tree_sortkey)
-            order  by $order_by
+            order  by fma.message_id
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/forums/www/message-view.adp	28 Oct 2003 09:54:55 -0000	1.19
+++ openacs-4/packages/forums/www/message-view.adp	28 Oct 2003 17:04:04 -0000	1.20
@@ -76,7 +76,7 @@
 
 <if @reply_url@ not nil>
   <blockquote>
-    <a href="@reply_url@"><b>#forums.Post_a_Reply#</b></a>
+    <a href="@reply_url@"><b>#forums.Reply_to_first_post_on_page_label#</b></a>
   </blockquote>
 </if>
 
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/forums/www/message-view.tcl	28 Oct 2003 09:54:55 -0000	1.22
+++ openacs-4/packages/forums/www/message-view.tcl	28 Oct 2003 17:04:04 -0000	1.23
@@ -106,6 +106,10 @@
 
 set message(number) [expr [lsearch $message_id_list $message(message_id)] + 1]
 set message(parent_number) {}
+if { [exists_and_not_null message(parent_id)] } {
+    set message(parent_number) [expr [lsearch $message_id_list $message(parent_id)] + 1]
+    set message(parent_direct_url) "[export_vars -base message-view { { message_id $message(root_message_id) } }]\#$message(parent_id)"
+}
 
 
 
@@ -157,7 +161,7 @@
 }
 
 if { $post_p || [ad_conn user_id] == 0 } {
-    set reply_url [export_vars -base message-post { { parent_id $last_message_id } }]
+    set reply_url [export_vars -base message-post { { parent_id $message(message_id) } }]
 }
 
 set thread_url [export_vars -base forum-view { { forum_id $message(forum_id) } }]