diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 5cb5803f1..17e259db8 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -44,7 +44,7 @@ addLoadEvent(focusit);
 
 <div id="postdiv" class="postarea">
 <h3><?php _e('Comment') ?></h3>
-<?php the_editor($comment->comment_content, 'content'); ?>
+<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index f28690626..7d99c6d30 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -282,7 +282,7 @@ input.delete:hover {
 	color: #fff;
 }
 
-#postdivrich #quicktags, #postdiv #quicktags {
+#quicktags {
 	background: #cee1ef;
 	padding: 0;
 	border: 0 none;
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index a12f850e9..c5be59fc2 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -918,7 +918,7 @@ function wp_default_editor() {
 	return apply_filters( 'wp_default_editor', $r ); // filter
 }
 
-function the_editor($content, $id = 'content', $prev_id = 'title') {
+function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true) {
 	$rows = get_option('default_post_edit_rows');
 	if (($rows < 3) || ($rows > 100))
 		$rows = 12;
@@ -937,11 +937,14 @@ function the_editor($content, $id = 'content', $prev_id = 'title') {
 			<a id="edButtonHTML" class="active"><?php _e('HTML'); ?></a>
 			<a id="edButtonPreview" onclick="switchEditors.go('<?php echo $id; ?>');"><?php _e('Visual'); ?></a>
 		<?php }
-	} ?>
+	} 
+	
+	if ( $media_buttons ) { ?>
 		<div id="media-buttons">
 		<?php _e('Add media:'); ?>
 		<?php do_action( 'media_buttons'); ?>
 		</div>
+	<?php } ?>
 	</div>
 
 	<div id="quicktags">