Index: token/token_cck.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_cck.inc,v
retrieving revision 1.1.2.9
diff -u -r1.1.2.9 token_cck.inc
--- token/token_cck.inc	16 Oct 2007 14:37:59 -0000	1.1.2.9
+++ token/token_cck.inc	31 Jan 2008 21:08:45 -0000
@@ -181,8 +181,26 @@
     }
   }
 }
+if (module_exists('email')) {
+  function email_token_list($type = 'all') {
+    if ($type == 'field' || $type == 'all') {
+      $tokens = array();
 
+      $tokens['email']['email']    = t("Email Address");
 
+      return $tokens;
+    }
+  }
+
+  function email_token_values($type, $object = NULL, $options = array()) {
+    if ($type == 'field') {
+      $item = $object[0];
+
+      $tokens['email']    = $item['email'];
+      return $tokens;
+    }
+  }
+}
 
 if (module_exists('imagefield')) {
   function imagefield_token_list($type = 'all') {