Index: wp-includes/comment.php
===================================================================
--- wp-includes/comment.php	(revision 15310)
+++ wp-includes/comment.php	(working copy)
@@ -1317,10 +1317,6 @@
 		case 'approve':
 		case '1':
 			$status = '1';
-			if ( get_option('comments_notify') ) {
-				$comment = get_comment($comment_id);
-				wp_notify_postauthor($comment_id, $comment->comment_type);
-			}
 			break;
 		case 'spam':
 			$status = 'spam';
@@ -1350,6 +1346,11 @@
 
 	wp_update_comment_count($comment->comment_post_ID);
 
+	if ( get_option('comments_notify') && $status == 1 ) {
+				//$comment = get_comment($comment_id);
+				wp_notify_postauthor($comment_id, $comment->comment_type);
+	}
+
 	return true;
 }