Index: comment_notify/comment_notify.info
===================================================================
--- comment_notify/comment_notify.info	(revision 22483)
+++ comment_notify/comment_notify.info	(working copy)
@@ -4,6 +4,7 @@
 dependencies[] = comment
 dependencies[] = token
 core = 7.x
+configure = admin/config/people/comment_notify
 files[] = comment_notify.install
 files[] = comment_notify.module
 files[] = comment_notify.tokens.inc
Index: comment_notify/comment_notify.module
===================================================================
--- comment_notify/comment_notify.module	(revision 22483)
+++ comment_notify/comment_notify.module	(working copy)
@@ -425,6 +425,7 @@
     return;
   }
 
+  $comment->comment_body[LANGUAGE_NONE][0]['value'] = check_markup ($comment->comment_body[LANGUAGE_NONE][0]['value'], $comment->comment_body[LANGUAGE_NONE][0]['format']);
   if (!isset($comment->mail)) {
     $comment_account = user_load_by_name($comment->name);
     $comment_mail = $comment_account->mail;
@@ -445,7 +446,7 @@
       'body'  => comment_notify_variable_registry_get('node_notify_default_mailtext'), //JS @todo:change this.
     );
     foreach ($raw_values as $k => $v) {
-      $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $user));
+      $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $user), array('sanitize' => FALSE));
     }
 
     drupal_mail('comment_notify', 'comment_notify_mail', $author->mail, $language, $message);
@@ -490,7 +491,7 @@
       );
 
       foreach ($raw_values as $k => $v) {
-        $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $user));
+        $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $user), array('sanitize' => FALSE));
       }
 
       //      array(