--- email.module	2008-12-23 08:41:48.000000000 -0600
+++ email.module.new	2008-12-25 15:07:37.000000000 -0600
@@ -427,8 +427,10 @@ function email_mail($key, &$message, $pa
  */
 function email_token_list($type = 'all') {
   if ($type == 'field' || $type == 'all') {
-    $tokens['email']['raw']       = t('Raw email address');
-    $tokens['email']['formatted'] = t('Formatted email address');
+    $tokens['email']['raw']           = t('Raw email address');
+    $tokens['email']['raw-all']       = t("Raw email addresses. - all addresses with commas in between values");
+    $tokens['email']['formatted']     = t('Formatted email address');
+    $tokens['email']['formatted-all'] = t("Formatted email addresses. - all addresses with line breaks in between values");
     return $tokens;
   }
 }
@@ -439,8 +441,20 @@ function email_token_list($type = 'all')
 function email_token_values($type, $object = NULL, $options = array()) {
   if ($type == 'field') {
     $item = $object[0];
-    $tokens['raw']       = $item['email'];
-    $tokens['formatted'] = $item['view'];
+    $tokens['raw']           = $item['email'];
+    $tokens['raw-all']       = $item['email'];
+    $tokens['formatted']     = $item['view'];
+    $tokens['formatted-all'] = $item['view'];
+    $i = 0;
+      foreach ($object as $value) {
+          if($value['email'] || $value['view']){
+             $values[] = $value['email'];
+             $views[] = $value['view'];
+             $i++;
+          }
+       }
+     $tokens['raw-all']  = implode(', ' , $values);
+     $tokens['formatted-all'] = implode("\n", $views);
     return $tokens;
   }
 }