Index: mail_edit.module
===================================================================
--- mail_edit.module	(revision 128)
+++ mail_edit.module	(working copy)
@@ -68,6 +68,33 @@
   $tokens = module_invoke($mailkey_obj->module, 'mail_edit_tokens_list', $mailkey_obj->mailkey);
   drupal_alter($mailkey_obj->id, $tokens);    //allow other modules to alter tokens for specific mailkey id
 
+  $rows = array();
+  $rows[] = array(
+    array('data' => t('Standard tokens:'),
+      'class' => 'region',
+      'colspan' => 2
+      )
+    );
+  foreach ($tokens as $token => $description) {
+    $rows[] = array($token, $description);
+  }
+  
+  $user_tokens = array();
+  $glob_tokens = token_get_list('user');
+  if (isset($glob_tokens['user'])) {
+    $rows[] = array(
+      array('data' => t('Additional tokens:'),
+        'class' => 'region',
+        'colspan' => 2
+        )
+      );
+    foreach ($glob_tokens['user'] as $token => $description) {
+      $rows[] = array('['. $token .']', $description);
+    }
+  }
+  
+  $doc = theme('table', array(t('Token'), t('Replacement value')), $rows, array('class' => 'description'));
+  
   $form = array();
   $form['update'] = array(
     '#type'   => 'hidden',
@@ -103,14 +130,6 @@
     '#rows' => 15,
 
   );
-  $placeholders = $tokens;
-  // Display the user documentation of placeholders supported by this module mailkey
-  $doc = "<dl>\n";
-  foreach ($placeholders as $name => $description) {
-    $doc .= '<dt>'. $name .'</dt>';
-    $doc .= '<dd>'. $description .'</dd>';
-  }
-  $doc .= "</dl>\n";
   $form['mail']['token_help'] = array(
     '#title' => t('Replacement patterns'),
     '#type' => 'fieldset',
@@ -405,9 +424,9 @@
     $result->tokens = array_keys($tokens);
     $result->values = array_values($tokens);
     //perform replacement of tokens
-    $mail['subject'] = str_replace($result->tokens, $result->values, $template->subject);
+    $mail['subject'] = str_replace($result->tokens, $result->values, token_replace($template->subject, 'user', $mail['params']['account']));
     unset($mail['body']);
-    $mail['body'][]  = str_replace($result->tokens, $result->values, $template->body);
+    $mail['body'][] = str_replace($result->tokens, $result->values, token_replace($template->body, 'user', $mail['params']['account']));
   }
 //  drupal_set_message('<pre>' . print_r($mail, 1) . '</pre>');
 }