Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 18341)
+++ wp-admin/post.php	(working copy)
@@ -54,7 +54,9 @@
 	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
 		$status = get_post_status( $post_id );
 
-		if ( isset( $_POST['publish'] ) ) {
+		if ( 'draft' == $status ) {
+			$message = 10;
+		} elseif ( isset( $_POST['publish'] ) ) {
 			switch ( $status ) {
 				case 'pending':
 					$message = 8;
@@ -66,7 +68,7 @@
 					$message = 6;
 			}
 		} else {
-				$message = 'draft' == $status ? 10 : 1;
+			$message = 1;
 		}
 
 		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );