diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 95c38417d..15b876802 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -55,7 +55,7 @@ echo "<a href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment
 
 <ul>
 <li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
-<li><a href="moderation.php"><?php _e('Moderate Comments') ?></a></li>
+<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li>
 <?php do_action('comment_relatedlinks_list'); ?>
 </ul>
 </div>
diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 59bd9b653..5a2dd6573 100644
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -88,7 +88,7 @@ function floated_admin_avatar( $name ) {
 	return "$avatar $name";
 }
 
-if ( is_admin() && ('edit-comments.php' == $pagenow || 'moderation.php' == $pagenow || 'edit.php' == $pagenow) ) {
+if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
 	if ( get_option('show_avatars') )
 		add_filter( 'comment_author', 'floated_admin_avatar' );
 }
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index df7bd27b5..940046ca6 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -24,7 +24,7 @@ function wp_dashboard_setup() {
 	// Recent Comments Widget
 	if ( current_user_can( 'moderate_comments' ) && $mod_comments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'") ) {
 		$notice = sprintf( __ngettext( '%d comment awaiting moderation', '%d comments awaiting moderation', $mod_comments ), $mod_comments );
-		$notice = "<a href='moderation.php'>$notice</a>";
+		$notice = "<a href='edit-comments.php?comment_status=moderated'>$notice</a>";
 	} else {
 		$notice = '';
 	}
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 03dd6109c..9b8ba158d 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -59,7 +59,7 @@ include('admin-header.php');
 <td>
 <p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
+<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p>
 <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
 </p>
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index db7bf1ab8..a7dcc941f 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -895,7 +895,7 @@ function wp_notify_moderator($comment_id) {
 
 	$strCommentsPending = sprintf( __ngettext('%s comment', '%s comments', $comments_waiting), $comments_waiting );
 	$notify_message .= sprintf( __('Currently %s are waiting for approval. Please visit the moderation panel:'), $strCommentsPending ) . "\r\n";
-	$notify_message .= get_option('siteurl') . "/wp-admin/moderation.php\r\n";
+	$notify_message .= get_option('siteurl') . "/wp-admin/edit-comments.php?comment_status=moderated\r\n";
 
 	$subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );
 	$admin_email = get_option('admin_email');