Index: openacs-4/packages/bulk-mail/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bulk-mail/www/one.adp	16 May 2002 00:49:16 -0000	1.2
+++ openacs-4/packages/bulk-mail/www/one.adp	19 May 2002 15:15:53 -0000	1.3
@@ -15,7 +15,7 @@
     </tr>
     <tr>
       <td>Subject</td>
-      <td><if @subject@ not nil>@subject@</if><else>&nbsp;</else></td>
+      <td><if @subject@ not nil><pre>@subject@</pre></if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Reply To</td>
Index: openacs-4/packages/bulk-mail/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bulk-mail/www/one.tcl	16 May 2002 00:41:44 -0000	1.2
+++ openacs-4/packages/bulk-mail/www/one.tcl	19 May 2002 15:15:53 -0000	1.3
@@ -17,6 +17,9 @@
 
 db_1row select_message_info {}
 
+set subject [ad_quotehtml $subject]
+set message [ad_quotehtml $message]
+
 set title $subject
 set context_bar [list $subject]
 
Index: openacs-4/packages/dotlrn/www/spam-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/spam-2.adp	17 May 2002 19:14:00 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-2.adp	19 May 2002 15:13:41 -0000	1.3
@@ -31,11 +31,11 @@
 <table bgcolor="#ececec" width="95%" cellpadding="3" cellspacing="3">
   <tr>
     <td width="10%">Subject</td>
-    <td>@subject@</td>
+    <td><pre>@subject@</pre></td>
   </tr>
   <tr>
     <td>Message</td>
-    <td>@message@</td>
+    <td><pre>@message@</pre></td>
   </tr>
 </table>
 
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/spam-2.tcl	17 May 2002 19:14:00 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	19 May 2002 15:13:41 -0000	1.3
@@ -31,6 +31,8 @@
 }
 
 form get_values spam_message subject message
+set subject [ad_quotehtml $subject]
+set message [ad_quotehtml $message]
 
 set spam_name [bulk_mail::parameter -parameter PrettyName -default Spam]
 set context_bar [list [list $referer Admin] "$spam_name Community"]