Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.104 -r1.104.2.1
--- openacs-4/packages/acs-subsite/acs-subsite.info	13 May 2009 21:29:33 -0000	1.104
+++ openacs-4/packages/acs-subsite/acs-subsite.info	15 May 2009 16:00:37 -0000	1.104.2.1
@@ -18,11 +18,12 @@
         <maturity>3</maturity>
 
         <provides url="acs-subsite" version="5.5.0a1"/>
+        <requires url="acs-kernel" version="5.5.0a1"/>
         <requires url="acs-authentication" version="5.5.0a1"/>
         <requires url="acs-content-repository" version="5.5.0a1"/>
-        <requires url="acs-kernel" version="5.5.0a1"/>
         <requires url="acs-tcl" version="5.5.0a1"/>
         <requires url="acs-lang" version="5.5.0a1"/>
+        <requires url="acs-mail-lite" version="5.5.0a1"/>
 
         <callbacks>
             <callback type="after-install"  proc="subsite::package_install"/>
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	6 Jan 2009 02:25:34 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	15 May 2009 16:00:37 -0000	1.10.2.1
@@ -1,4 +1,4 @@
-# /packages/subsite/www/admin/parties/new.tcl
+# /packages/subsite/www/admin/users/new.tcl
 
 ad_page_contract {
 
@@ -232,16 +232,17 @@
 	    }]
 
 	    # we're supposed to notify the administrator when someone new registers
-	    ns_sendmail $notification_address \
-		    [template::element::get_value add_user email] \
-		    "New registration at [ad_url]" "
-	[template::element::get_value add_user first_names] [template::element::get_value add_user last_name] ([template::element::get_value add_user email]) was added as a registered as a user of 
+	    acs_mail_lite::send -send_immediately \
+            -to_addr ns_sendmail $notification_address \
+		    -from_addr [template::element::get_value add_user email] \
+            -subject "New registration at [ad_url]" \
+            -body "[template::element::get_value add_user first_names] [template::element::get_value add_user last_name] ([template::element::get_value add_user email]) was added as a registered as a user of 
 [ad_url]
 
-The user was added by $creation_name from [ad_conn url].
-	"
-        }
+The user was added by $creation_name from [ad_conn url]."
 
+    }
+
 	if { $email_verified_p eq "f" } {
 	
 	    set row_id [db_string user_new_2_rowid_for_email "select rowid from users where user_id = :user_id"]
Index: openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl,v
diff -u -r1.4 -r1.4.4.1
--- openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl	10 Jan 2007 21:22:09 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl	15 May 2009 16:00:37 -0000	1.4.4.1
@@ -99,11 +99,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
     }