Index: wp-includes/pluggable-functions.php
===================================================================
--- wp-includes/pluggable-functions.php	(revision 2552)
+++ wp-includes/pluggable-functions.php	(working copy)
@@ -176,6 +176,9 @@
 	$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID='$post->post_author' LIMIT 1");
 
 	if ('' == $user->user_email) return false; // If there's no email to send the comment to
+
+	// Don't notify admin or post_author about their own comment
+	if ( $post->post_author == $user->ID || $user->user_level >= 9 ) return false;
 
 	$comment_author_domain = gethostbyaddr($comment->comment_author_IP);
 
@@ -266,4 +269,4 @@
 }
 endif;
 
-?>
\ No newline at end of file
+?>