diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index d3abfc1400..890b866ef5 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2199,9 +2199,8 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 						$post_link = get_the_title($post->ID);
 					}
 					echo "<td $attributes>\n";
-					echo $post_link;
-
 					echo '<div class="response-links"><span class="post-com-count-wrapper">';
+					echo $post_link . '<br />';
 					$pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) );
 					if ( $pending_comments )
 						echo '<strong>';
@@ -2210,7 +2209,10 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true,
 						echo '</strong>';
 					echo '</span> ';
 					echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
-					echo '</div></td>';
+					echo '</div>';
+					if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) )
+						echo $thumb;
+					echo '</td>';
 				}
 				break;
 			default:
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index fe19ada700..06bf3567d4 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1156,7 +1156,11 @@ strong .post-com-count {
 }
 
 .response-links {
-	margin: 4px 0;
+	float: left;
+}
+
+#the-comment-list .attachment-80x60 {
+	padding: 4px 8px;
 }
 
 /* Admin Footer */