Index: comment_notify.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/comment_notify/comment_notify.module,v
retrieving revision 1.35
diff -u -r1.35 comment_notify.module
--- comment_notify.module	24 Oct 2008 02:09:14 -0000	1.35
+++ comment_notify.module	26 Oct 2008 13:58:46 -0000
@@ -85,22 +85,22 @@
   // If this is a POST then it is a preview and we remind people that there post isn't done yet.
   $op = isset($_POST['op']) ? $_POST['op'] : '';
 
-  if ($op == t('Preview comment')) {
-    drupal_set_message(t('ATTENTION: Your comment is NOT YET posted - please click the post button to confirm your post'));
+  if ($op == t('Preview')) {
+    if (!empty($form_state['post']->comment) && (!empty($user->mail) || !empty($form_state['post']->mail))) {
+      drupal_set_message(t('ATTENTION: Your comment is NOT YET posted - please click the post button to confirm your post'));
 
-    //extra submit button on top
-    if (!form_get_errors() && ((variable_get('comment_preview', COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview comment')) || ($op == t('Post comment')))) {
+      //extra submit button on top
       $form['submitextra'] = array(
         '#type' => 'fieldset',
         '#title' => t('Comment is not posted yet - please click post button to confirm your post'),
         '#weight' => -99,
-        '#collapsible' => FALSE
+        '#collapsible' => FALSE,
       );
 
       $form['submitextra']['submit'] = array(
         '#type' => 'submit',
-        '#value' => t('Post comment'),
-        '#weight' => -20
+        '#value' => t('Save'),
+        '#weight' => -20,
       );
     }
   }