Index: openacs-4/packages/acs-admin/www/send-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/send-email.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/acs-admin/www/send-email.tcl	10 Jan 2007 21:21:59 -0000	1.3
+++ openacs-4/packages/acs-admin/www/send-email.tcl	14 May 2009 12:54:38 -0000	1.3.4.1
@@ -23,9 +23,9 @@
     return_url:onevalue
 }
 
-if {[catch {ns_sendmail $email $email_from $subject $message} errmsg]} {
-    ad_return_error $error_subject "$error_message:
-    <blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote>"
+if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $email_from -subject $subject -body $message} errmsg]} {
+    ad_return_error $error_subject "<p>$error_message</p>
+    <div><code>[ad_quotehtml $errmsg]</code></div>"
     ad_script_abort
 }
 
Index: openacs-4/packages/acs-admin/www/users/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.tcl,v
diff -u -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-admin/www/users/user-add-3.tcl	1 Mar 2005 00:01:21 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/user-add-3.tcl	14 May 2009 12:54:38 -0000	1.5.10.1
@@ -21,13 +21,13 @@
 set context [list [list "./" "Users"] "New user notified"]
 set export_vars [export_url_vars user_id]
 
-set admin_email [db_string unused "select email from 
-parties where party_id = :admin_user_id"]
+set admin_email [db_string get_admin_email {}]
+set subject "You have been added as a user to [ad_system_name] at [ad_url]"
 
-if [catch {ns_sendmail "$email" "$admin_email" "You have been added as a user to [ad_system_name] at [ad_url]" "$message"} errmsg] {
-    ad_return_error "Mail Failed" "The system was unable to send email.  Please notify the user personally.  This problem is probably caused by a misconfiguration of your email system.  Here is the error:
-<blockquote><pre>
+if [catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $admin_email -subject $subject -body $message} errmsg] {
+    ad_return_error "Mail Failed" "<p>The system was unable to send email.  Please notify the user personally.  This problem is probably caused by a misconfiguration of your email system.  Here is the error:</p>
+<div><code>
 [ad_quotehtml $errmsg]
-</pre></blockquote>"
+</code></div>"
     return
 }
Index: openacs-4/packages/acs-admin/www/users/user-add-3.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.xql,v
diff -u -r1.3 -r1.3.22.1
--- openacs-4/packages/acs-admin/www/users/user-add-3.xql	29 Apr 2001 00:47:48 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/user-add-3.xql	14 May 2009 12:54:38 -0000	1.3.22.1
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="unused">      
-      <querytext>
-      select email from 
-parties where party_id = :admin_user_id
-      </querytext>
-</fullquery>
-
+  <fullquery name="get_admin_email">      
+    <querytext>
+      select email from parties where party_id = :admin_user_id
+    </querytext>
+  </fullquery>
  
 </queryset>
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.5 -r1.5.4.1
--- openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl	10 Jan 2007 21:22:00 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/user-batch-add-2.tcl	14 May 2009 12:54:38 -0000	1.5.4.1
@@ -80,11 +80,11 @@
 	regsub -all "<$key>" $sub_message $value sub_message
     }
     
-    if {[catch {ns_sendmail "$email" "$from" "$subject" "$sub_message"} errmsg]} {
-	ad_return_error "Mail Failed" "The system was unable to send email.  Please notify the user personally.  This problem is probably caused by a misconfiguration of your email system.  Here is the error: 
-<blockquote><pre>
+    if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $from -subject $subject -body $sub_message} errmsg]} {
+	ad_return_error "Mail Failed" "<p>The system was unable to send email.  Please notify the user personally.  This problem is probably caused by a misconfiguration of your email system.  Here is the error:</p> 
+<div><code>
 [ad_quotehtml $errmsg]
-</pre></blockquote>"
+</code></div>"
         return
     }