--- mail_edit.module	2010-12-15 02:09:27.000000000 -0800
+++ mail_edit_new.module	2010-12-15 02:09:03.000000000 -0800
@@ -401,6 +401,7 @@ function mail_edit_mail_alter(&$mail) {
   if ($template) {// do not try to alter anything if we didnt modify this mail template
     //fetch our token values
     $tokens = module_invoke($mail_data->module, 'mail_edit_tokens_value', $mail_data->mailkey, $mail);
+    drupal_alter($mail['id'].'_token_values', $tokens, $mail_data->mailkey, $mail);
     $result = new stdClass();
     $result->tokens = array_keys($tokens);
     $result->values = array_values($tokens);