Index: openacs-4/packages/dotlrn/www/member-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email.tcl,v
diff -u -r1.3.8.1 -r1.3.8.2
--- openacs-4/packages/dotlrn/www/member-email.tcl	11 Sep 2015 11:40:44 -0000	1.3.8.1
+++ openacs-4/packages/dotlrn/www/member-email.tcl	12 Sep 2016 11:16:15 -0000	1.3.8.2
@@ -27,7 +27,7 @@
     {email:richtext,optional {label "Message"} {html {rows 30 cols 80}}}
 } -on_request {
 
-    set from_addr [cc_email_from_party [ad_conn user_id]]
+    set from_addr [party::email -party_id [ad_conn user_id]]
     set subject "Welcome to [dotlrn_community::get_community_name $community_id]!"
 
 } -on_submit {
Index: openacs-4/packages/dotlrn/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v
diff -u -r1.17.4.2 -r1.17.4.3
--- openacs-4/packages/dotlrn/www/register.tcl	11 Sep 2015 11:40:46 -0000	1.17.4.2
+++ openacs-4/packages/dotlrn/www/register.tcl	12 Sep 2016 11:16:15 -0000	1.17.4.3
@@ -91,7 +91,7 @@
             set query [db_map bulk_mail_query]
 
             set full_name [acs_user::get_element -user_id $user_id -element name]
-            set email "[cc_email_from_party $user_id]"
+            set email [party::email -party_id $user_id]
             set subject "$full_name ($email) has requested to join $community_name."
             
             set message "$full_name ($email) has requested to join $community_name.
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl	12 Sep 2015 16:47:24 -0000	1.6.2.2
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl	12 Sep 2016 11:16:15 -0000	1.6.2.3
@@ -59,7 +59,7 @@
     set i 0
     foreach user_id $pending_users {
 	incr i
-	set email [cc_email_from_party $user_id]
+	set email [party::email -party_id $user_id]
 	ns_write "$i, $email : ..."
 
 	# approve user in dotlrn
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v
diff -u -r1.25.2.1 -r1.25.2.2
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	11 Sep 2015 11:40:54 -0000	1.25.2.1
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	12 Sep 2016 11:16:15 -0000	1.25.2.2
@@ -72,7 +72,7 @@
         }
  
         # Check if this user already exists
-        set user_id [cc_lookup_email_user $row(email)]
+        set user_id [party::get_by_email -email $row(email)]
         if { $user_id ne "" } {
             append body [_ dotlrn.user_email_already_exists [list user_email $row(email)]]
             lappend list_of_user_ids $user_id