Index: openacs-4/packages/forums/lib/message/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/lib/message/edit.tcl	17 Dec 2003 15:45:29 -0000	1.1
+++ openacs-4/packages/forums/lib/message/edit.tcl	29 Jun 2004 10:18:28 -0000	1.2
@@ -18,13 +18,15 @@
 forums::form::message message
 
 if {[form is_valid message]} {
-    template::form get_values message message_id subject content html_p
+    template::form get_values message message_id subject message_body
+    set content [string trimright [template::util::richtext::get_property contents $message_body]]
+    set format [string trimright [template::util::richtext::get_property format $message_body]]
 
     forum::message::edit \
             -message_id $message_id \
             -subject $subject \
             -content $content \
-            -html_p $html_p
+            -format $format
 
     ad_returnredirect "$return_url?message_id=$message_id"
     ad_script_abort
@@ -33,8 +35,7 @@
 # Prepare the other data 
 element set_properties message message_id -value $message(message_id)
 element set_properties message subject -value $message(subject)
-element set_properties message content -value $message(content)
-element set_properties message html_p -value $message(html_p)
+element set_properties message message_body -value [list $message(content) $message(format)]
 
 if {[info exists alt_template]} {
   ad_return_template $alt_template