=== modified file 'uc_roles/uc_roles.ca.inc'
--- uc_roles/uc_roles.ca.inc	2009-08-12 15:20:40 +0000
+++ uc_roles/uc_roles.ca.inc	2009-08-25 13:18:46 +0000
@@ -127,7 +127,7 @@
         '#argument_map' => $user_args,
         '#settings' => array(
           'from' => uc_store_email_from(),
-          'addresses' => '[user-mail]',
+          'addresses' => '[mail]',
           'subject' => uc_get_message('uc_roles_revoke_subject'),
           'message' => uc_get_message('uc_roles_revoke_message'),
           'format' => 1,
@@ -173,7 +173,7 @@
         '#argument_map' => $user_args,
         '#settings' => array(
           'from' => uc_store_email_from(),
-          'addresses' => '[user-mail]',
+          'addresses' => '[mail]',
           'subject' => uc_get_message('uc_roles_reminder_subject'),
           'message' => uc_get_message('uc_roles_reminder_message'),
           'format' => 1,
@@ -347,8 +347,6 @@
  * @see uc_roles_action_user_email_form()
  */
 function uc_roles_action_user_email($account, $role_expiration, $settings) {
-  $account = uc_order_user_load($order);
-
   // Token replacements for the subject and body
   $settings['replacements'] = array(
     'global' => NULL,