Index: openacs-4/packages/acs-admin/www/users/user-batch-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add-2.adp,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/acs-admin/www/users/user-batch-add-2.adp	17 May 2003 09:36:54 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/user-batch-add-2.adp	19 Mar 2004 10:57:16 -0000	1.2.4.1
@@ -1,7 +1,7 @@
 <master>
 <property name=title>Add a batch of users</property>
-@success_text@
+@success_text;noquote@
 <hr/>
-@exception_text@
+@exception_text;noquote@
 
 
Index: openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl	14 Nov 2003 22:06:35 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl	19 Mar 2004 10:57:16 -0000	1.3.2.1
@@ -5,7 +5,7 @@
     userlist
     from
     subject
-    message
+    message:allhtml
 } -properties {
     title:onevalue
     success_text:onevalue
@@ -77,7 +77,7 @@
     
     set sub_message $message
     foreach key $key_list value $value_list {
-	regsub -all "#$key#" $sub_message $value sub_message
+	regsub -all "<$key>" $sub_message $value sub_message
     }
     
     if {[catch {ns_sendmail "$email" "$from" "$subject" "$sub_message"} errmsg]} {
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-admin/www/users/user-batch-add.adp	11 Dec 2003 21:39:45 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.adp	19 Mar 2004 10:57:16 -0000	1.4.2.1
@@ -10,16 +10,16 @@
 <p>Each user will get this email:
 <br />From: <input name="from" value="@admin_email@">
 <br />Subject: <input name=subject value="You have been added as a user to @system_name@ at @system_url@" size=50>
-<p>Message: (The four variables delimited by {) marks will be automatically set for each user.)
+<p>Message:
 <br /><textarea name="message" rows=10 cols=70 wrap=hard>
-{first_names} {last_name}
+Dear &lt;first_names&gt; &lt;last_name&gt;,
 
 You have been added as a user to @system_name@
 at @system_url@
 
 Login information:
-Email: {email}
-Password: {password} 
+Email: &lt;email&gt;
+Password: &lt;password&gt;
 (you may change your password after you log in)
 
 Thank you,