Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 9130)
+++ wp-admin/includes/template.php	(working copy)
@@ -693,7 +693,6 @@
 	$posts_columns['tags'] = __('Tags');
 	if ( !isset($_GET['post_status']) || !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
 		$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
-	$posts_columns['status'] = __('Status');
 	$posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 
 	return $posts_columns;
@@ -1275,8 +1274,28 @@
 		?>
 		<td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; } ?></strong>
 		<?php
-			if ( !empty($post->post_password) ) { _e(' &#8212; <strong>Protected</strong>'); } elseif ('private' == $post->post_status) { _e(' &#8212; <strong>Private</strong>'); }
+			$post_states = array();
+			if ( !empty($post->post_password) )
+				$post_states[] = __('Protected');
+			if ( 'private' == $post->post_status )
+				$post_states[] = __('Private');
+			if ( 'draft' == $post->post_status )
+				$post_states[] = __('Draft');
+			if ( 'pending' == $post->post_status )
+				$post_states[] = __('Pending');
 
+			if ( ! empty($post_states) ) {
+				$state_count = count($post_states);
+				$i = 0;
+				echo '<div id="post-states">';
+				foreach ( $post_states as $state ) {
+					++$i;
+					( $i == $state_count ) ? $sep = '' : $sep = ', ';
+					echo "<span class='post-state'>$state$sep</span>";
+				}
+				echo '</div>';
+			}
+
 			if ( 'excerpt' == $mode )
 				the_excerpt();
 
@@ -1357,32 +1376,6 @@
 		<?php
 		break;
 
-		case 'status':
-		?>
-		<td <?php echo $attributes ?>>
-		<a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink">
-		<?php
-			switch ( $post->post_status ) {
-				case 'publish' :
-				case 'private' :
-					_e('Published');
-					break;
-				case 'future' :
-					_e('Scheduled');
-					break;
-				case 'pending' :
-					_e('Pending Review');
-					break;
-				case 'draft' :
-					_e('Unpublished');
-					break;
-			}
-		?>
-		</a>
-		</td>
-		<?php
-		break;
-
 		case 'control_view':
 		?>
 		<td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td>

