Index: openacs-4/packages/dotlrn/www/spam-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/spam-2.tcl	4 Dec 2002 09:51:04 -0000	1.6
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	24 Jul 2004 08:34:10 -0000	1.7
@@ -24,25 +24,29 @@
 } -properties {
     subject:onevalue
     message:onevalue
+    format:onevalue
     spam_name:onevalue
     context_bar:onevalue
     community_id:onevalue
     portal_id:onevalue
 }
 
-form get_values spam_message subject message message_type
+form get_values spam_message subject message
 
+set content [string trimright [template::util::richtext::get_property contents $message]]
+set format [string trimright [template::util::richtext::get_property format $message]]
+
 # the following is just to make sure the previewing works ok.
 # in case the user types a html message and chooses the messsage 
 # to be a plain text type or vice-versa.
-if {$message_type == "html"} {
-	if [ad_looks_like_html_p $message] {
-	     set preview_message "<pre>$message</pre>"
+if {$format == "text/html"} {
+	if [ad_looks_like_html_p $content] {
+	     set preview_message "<pre>$content</pre>"
            } else {
-	     set preview_message "$message"
+	     set preview_message "$content"
         }
 } else {
-	set preview_message [ad_quotehtml $message]
+	set preview_message [ad_quotehtml $content]
 }
 
 set context_bar [list [list $referer Admin] "[_ dotlrn.Spam_Community]"]