Index: wp-admin/post-new.php
===================================================================
--- wp-admin/post-new.php	(revision 18815)
+++ wp-admin/post-new.php	(working copy)
@@ -36,7 +36,14 @@
 wp_enqueue_script('autosave');
 
 // Show post form.
-$post = get_default_post_to_edit( $post_type, true );
+$posts = get_posts(array('numberposts' => 1, 'post_status' => 'auto-draft'));
+$args = array( 'post_type' => 'attachment', 'numberposts' => -1, 'post_status' => null, 'post_parent' => $post[0]->ID );
+$attachments = get_posts($args);
+if ( empty($posts) && empty($attachments) && $post[0] != $user_ID ) {
+	$post = get_default_post_to_edit( $post_type, true );
+} else {
+	$post = $posts[0];
+}
 $post_ID = $post->ID;
 include('edit-form-advanced.php');
 include('./admin-footer.php');