--- token_comment_orig.inc	2008-07-14 12:07:04.000000000 -0400
+++ token_comment.inc	2008-10-23 13:12:15.625000000 -0400
@@ -30,11 +30,22 @@ function comment_token_values($type, $ob
       $values['comment-body']            = check_markup($comment->comment, $comment->format);
       $values['comment-author-name']     = check_plain($comment->name);
       $values['comment-author-uid']      = $comment->uid;
+      $values['comment-homepage-link']   = $comment->homepage ? l($comment->name, $comment->homepage) : NULL;
+      if ($comment->uid) {
+        // Registered user.
+        $values['comment-email-link']    = l($comment->name, 'user/'. $comment->uid .'/contact');
+      }
+      else {
+        // Unregistered user.
+        $values['comment-email-link']    = $comment->mail ? ('<a href="mailto: '. $comment->mail .'">'. $comment->name .'</a>') : NULL;
+      }
 
       // Raw counterparts of user supplied data.
       $values['comment-title-raw']       = $comment->subject;
       $values['comment-body-raw']        = $comment->comment;
       $values['comment-author-name-raw'] = $comment->name;
+      $values['comment-email-raw']       = $comment->mail;
+      $values['comment-homepage-raw']    = $comment->homepage;
 
       // Included in case a consuming module wants to format the body
       $values['comment-body-format']     = $comment->format;
@@ -73,6 +84,11 @@ function comment_token_list($type = 'all
     $tokens['comment']['comment-author-name']     = t("Comment author's user name");
     $tokens['comment']['comment-author-name-raw'] = t("Comment author's user name. WARNING - raw user input");
 
+    $tokens['comment']['comment-email-link']      = t("Comment user's email link.");
+    $tokens['comment']['comment-email-raw']       = t("Comment user's email address. WARNING - raw user input");
+    $tokens['comment']['comment-homepage-link']   = t("Comment user's home page link.");
+    $tokens['comment']['comment-homepage-raw']    = t("Comment user's home page. WARNING - raw user input");
+
     $tokens['comment']['comment-yyyy']            = t("Comment creation year (four digit)");
     $tokens['comment']['comment-yy']              = t("Comment creation year (two digit)");
     $tokens['comment']['comment-month']           = t("Comment creation month (full word)");