--- commentmail.module 
+++ commentmail.module 
@@ -153,17 +153,12 @@
     $body = variable_get('commentmail_mail_approve', t(COMMENTMAIL_DEFAULT_APPROVE));
   }
   else  {
-    //Check the message status to send approval or notify mail
-    if($params['comment']->status == COMMENT_PUBLISHED){
-      $body = variable_get('commentmail_mail_notify', t(COMMENTMAIL_DEFAULT_NOTIFY));
-    } else {
-      $body = variable_get('commentmail_mail_approve', t(COMMENTMAIL_DEFAULT_APPROVE));
-    }
+    $body = variable_get('commentmail_mail_notify', t(COMMENTMAIL_DEFAULT_NOTIFY));
   }
 
   // Check if the user is logged in.
   if ($params['comment']->uid) {
-    $account = user_load(array('uid' => $params['comment']->uid));
+    $account = user_load(array('uid' => $comment_obj->uid));
     $params['comment']->mail = $account->mail;
     $params['comment']->homepage = $account->homepage;
   }