Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php	(revision 28018)
+++ wp-includes/admin-bar.php	(working copy)
@@ -520,9 +520,14 @@
 			&& current_user_can( 'edit_post', $current_object->ID )
 			&& $post_type_object->show_ui && $post_type_object->show_in_admin_bar )
 		{
+			$title = $post_type_object->labels->edit_item;
+			if( 'draft' == $current_object->post_status ) {
+				$title .= ' (' . __( 'Draft' ) . ')';
+			}
+
 			$wp_admin_bar->add_menu( array(
 				'id' => 'edit',
-				'title' => $post_type_object->labels->edit_item,
+				'title' => $title,
 				'href' => get_edit_post_link( $current_object->ID )
 			) );
 		} elseif ( ! empty( $current_object->taxonomy )
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 28018)
+++ wp-includes/link-template.php	(working copy)
@@ -1208,8 +1208,12 @@
 	if ( !$url = get_edit_post_link( $post->ID ) )
 		return;
 
-	if ( null === $link )
+	if ( null === $link ) {
 		$link = __('Edit This');
+		if( 'draft' == $post->post_status ) {
+			$link .= ' (' . __( 'Draft' ) . ')';
+		}
+	}
 
 	$post_type_obj = get_post_type_object( $post->post_type );
 	$link = '<a class="post-edit-link" href="' . $url . '">' . $link . '</a>';
Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 28018)
+++ wp-includes/post-template.php	(working copy)
@@ -521,6 +521,7 @@
 		if ( isset( $post->post_type ) ) {
 			$classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
 			$classes[] = 'postid-' . $post_id;
+			$classes[] = 'single-status-' . $post->post_status;
 
 			// Post Format
 			if ( post_type_supports( $post->post_type, 'post-formats' ) ) {