diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable-functions.php
index 552004436c..760efb2024 100644
--- a/wp-includes/pluggable-functions.php
+++ b/wp-includes/pluggable-functions.php
@@ -243,8 +243,8 @@ if ( ! function_exists('wp_notify_postauthor') ) :
 function wp_notify_postauthor($comment_id, $comment_type='') {
 	global $wpdb;
     
-	$comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
-	$post    = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$comment->comment_post_ID' LIMIT 1");
+	$comment = get_comment($comment_id);
+	$post    = get_post($comment->comment_post_ID);
 	$user    = get_userdata( $post->post_author );
 
 	if ('' == $user->user_email) return false; // If there's no email to send the comment to