Index: comment_notify.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/comment_notify/comment_notify.module,v
retrieving revision 1.76
diff -u -p -r1.76 comment_notify.module
--- comment_notify.module	22 Feb 2010 18:39:07 -0000	1.76
+++ comment_notify.module	22 Feb 2010 18:50:43 -0000
@@ -20,13 +20,19 @@ define('AUTHOR_MAILTEXT',
 
 You have received a comment on: "[node:title]"
 
+----
+[comment:title]
+[comment:body]
+----
+
 You can view the comment at the following url
 [comment:url]
 
-You will receive emails like this for all replies to your posts. You can disable this by logging in and going to your account settings.
+You will receive emails like this for all replies to your posts. You can
+disable this by logging in and changing the settings on your user account at
+[user:edit-url].
 
-Webmaster of [site:name]
-[site:mission]
+-- [site:name] team
 [site:url]');
 
 define('DEFAULT_MAILTEXT',
@@ -34,9 +40,9 @@ define('DEFAULT_MAILTEXT',
 
 [comment:name] has commented on: "[node:title]"
 
-The post is about
 ----
-[node:summary]
+[comment:title]
+[comment:body]
 ----
 
 You can view the comment at the following url
@@ -45,15 +51,10 @@ You can view the comment at the followin
 You can stop receiving emails when someone replies to this post,
 by going to [comment:unsubscribe_url]
 
-If you have auto-following enabled in your account, you will receive emails like this for all replies to a blog post you commented on. You can disable this by logging in and going to your account settings or unchecking the flag at the time you post the comment.
-
 You can set up auto-following feature for all future posts
 by creating your own user with a few clicks here [site:url]/user/register
 
-Thanks for your feedback,
-
-Webmaster of [site:name]
-[site:mission]
+-- [site:name] team
 [site:url]');