diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 6ef00608d7..154feb6e7b 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -888,7 +888,10 @@ abbr.required,
color: #333;
}
-#timestampdiv input {
+#timestampdiv input,
+#emaildiv input,
+#uridiv input,
+.stuffbox #name {
border-color: #ddd;
}
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 8857ab1fe9..6ef3cbc94e 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -87,7 +87,6 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-
comment_content, 'content', 'newcomment_author_url', false, 4); ?>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 38ed28e6d6..88a219a032 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -405,8 +405,12 @@ textarea.all-options, input.all-options {
padding: 0;
}
-#emaildiv input, #uridiv input, .stuffbox #name {
+#emaildiv input,
+#uridiv input,
+.stuffbox #name {
width: 94%;
+ border-style: solid;
+ border-width: 1px;
}
#wpbody-content .metabox-holder {
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 863b5e3566..cc0646c60c 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1478,9 +1478,12 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
if (($rows < 3) || ($rows > 100))
$rows = 12;
- $rows = "rows='$rows'"; ?>
+ $richedit = user_can_richedit();
+ $rows = "rows='$rows'";
+
+ if ( $richedit || $media_buttons ) { ?>
+