Index: token/token_cck.inc
===================================================================
--- token/token_cck.inc	(revision 267)
+++ token/token_cck.inc	(working copy)
@@ -137,6 +137,7 @@
       $tokens['user reference']['uid']   = t("Referenced user ID");
       $tokens['user reference']['name']  = t("Referenced user name");
       $tokens['user reference']['link']  = t("Formatted html link to referenced user");
+      $tokens['user reference']['mail']  = t("Referenced user e-mail");
 
       return $tokens;
     }
@@ -145,10 +146,12 @@
   function userreference_token_values($type, $object = NULL) {
     if ($type == 'field') {
       $item = $object[0];
+      $account = user_load(array('uid' => $item['uid']));
 
       $tokens['uid']   = $item['uid'];
       $tokens['name']  = strip_tags($item['view']);
       $tokens['link']  = $item['view'];
+      $tokens['mail']  = $account->mail;
 
       return $tokens;
     }
@@ -296,4 +299,4 @@
       return $tokens;
     }
   }
-}
\ No newline at end of file
+}
Index: token/token_node.inc
===================================================================
--- token/token_node.inc	(revision 21)
+++ token/token_node.inc	(working copy)
@@ -8,14 +8,16 @@
   switch ($type) {
     case 'node':
       $node = $object;
+      $account = user_load(array('uid' => $node->uid));
 
       $values['nid']            = $node->nid;
       $values['type']           = $node->type;
       $values['type-name']      = node_get_types('name', $node->type);
       $values['title']          = check_plain($node->title);
 
-      $values['author-uid']     = $node->uid;
-      $values['author-name']    = $node->name;
+      $values['author-uid']     = $author->uid;
+      $values['author-name']    = $author->name;
+      $values['author-mail']    = $author->mail;
 
       $values['yyyy']           = date('Y', $node->created);
       $values['yy']             = date('y', $node->created);
@@ -134,6 +136,7 @@
 
     $tokens['node']['author-uid']     = t("Node author's user id");
     $tokens['node']['author-name']    = t("Node author's user name");
+    $tokens['node']['author-mail']    = t("Node author's e-mail address");
 
     $tokens['node']['term']           = t("Name of top taxonomy term");
     $tokens['node']['term-id']        = t("ID of top taxonomy term");