Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 21575)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -121,39 +121,43 @@
 		add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
 }
 
+
 if ( post_type_supports($post_type, 'page-attributes') )
-	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
+		add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
 
-if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) )
-		add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
+if ( get_post_meta($post->ID, '_system_page', true) != '1' ) {
 
-if ( post_type_supports($post_type, 'excerpt') )
-	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
+	if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) )
+			add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
 
-if ( post_type_supports($post_type, 'trackbacks') )
-	add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
+	if ( post_type_supports($post_type, 'excerpt') )
+		add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
 
-if ( post_type_supports($post_type, 'custom-fields') )
-	add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
+	if ( post_type_supports($post_type, 'trackbacks') )
+		add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
 
-do_action('dbx_post_advanced');
-if ( post_type_supports($post_type, 'comments') )
-	add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
+	if ( post_type_supports($post_type, 'custom-fields') )
+		add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
 
-if ( ('publish' == $post->post_status || 'private' == $post->post_status) && post_type_supports($post_type, 'comments') )
-	add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
+	do_action('dbx_post_advanced');
+	if ( post_type_supports($post_type, 'comments') )
+		add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
 
-if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) )
-	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
+	if ( ('publish' == $post->post_status || 'private' == $post->post_status) && post_type_supports($post_type, 'comments') )
+		add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
 
-if ( post_type_supports($post_type, 'author') ) {
-	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
-		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
+	if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) )
+		add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
+
+	if ( post_type_supports($post_type, 'author') ) {
+		if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
+			add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
+	}
+
+	if ( post_type_supports($post_type, 'revisions') && 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
+		add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
 }
 
-if ( post_type_supports($post_type, 'revisions') && 0 < $post_ID && wp_get_post_revisions( $post_ID ) )
-	add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
-
 do_action('add_meta_boxes', $post_type, $post);
 do_action('add_meta_boxes_' . $post_type, $post);
 
@@ -309,7 +313,8 @@
 </div>
 <?php } ?>
 
-<?php if ( post_type_supports($post_type, 'editor') ) { ?>
+<?php if ( post_type_supports($post_type, 'editor') && ( get_post_meta($post->ID, '_system_page', true) != '1' ) ) { ?>
+
 <div id="postdivrich" class="postarea">
 
 <?php wp_editor($post->post_content, 'content', array('dfw' => true, 'tabfocus_elements' => 'sample-permalink,post-preview') ); ?>
Index: wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- wp-admin/includes/class-wp-posts-list-table.php	(revision 21575)
+++ wp-admin/includes/class-wp-posts-list-table.php	(working copy)
@@ -540,7 +540,10 @@
 
 				$actions = array();
 				if ( $can_edit_post && 'trash' != $post->post_status ) {
-					$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
+					
+					if ( get_post_meta($post->ID, '_system_page', true) != '1' )
+						$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
+
 					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick&nbsp;Edit' ) . '</a>';
 				}
 				if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php	(revision 21575)
+++ wp-admin/includes/post.php	(working copy)
@@ -1247,6 +1247,18 @@
 }
 
 /**
+ * Outputs the notice message to say that this page is used for posts and content will be ignored.
+ *
+ * @since 3.5
+ * @return none
+ */
+function _admin_notice_page_for_posts() {
+        $message = __( 'This page is used to display a list of posts; content here will not be displayed. You can change this in your <a href="%s">Reading Settings</a>.' );
+        echo '<div class="error"><p>' . sprintf( $message, esc_url( admin_url( 'options-reading.php' ) ) ) . '</p></div>';
+}
+
+
+/**
  * Creates autosave data for the specified post from $_POST data.
  *
  * @package WordPress
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 21575)
+++ wp-admin/options-reading.php	(working copy)
@@ -90,6 +90,30 @@
 	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
 		update_option( 'show_on_front', 'posts' );
 ?>
+
+<?php
+	if ( get_option('page_for_posts') != '0' ) :
+
+		if ( get_post_meta( get_option('page_for_posts'), '_system_page' ) ) :
+			update_post_meta( get_option('page_for_posts'), '_system_page', '1');
+		else :
+			add_post_meta( get_option('page_for_posts'), '_system_page', '1', true );
+		endif;
+
+		if ( get_option('page_for_posts') != get_option('page_for_posts_last') ) :
+			update_post_meta( get_option('page_for_posts_last'), '_system_page', '0');
+		endif;
+
+		update_option('page_for_posts_last', get_option('page_for_posts') );
+
+	else:
+
+		update_post_meta( get_option('page_for_posts_last') , '_system_page', '0', '1');
+		update_option('page_for_posts_last', '0');
+
+	endif;
+?>
+
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><?php _e( 'Front page displays' ); ?></th>
Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 21575)
+++ wp-admin/post.php	(working copy)
@@ -164,6 +164,10 @@
 		wp_enqueue_script('autosave');
 	}
 
+	if ( $post_id == get_option( 'page_for_posts' ) ) { 
+ 	    add_action( 'admin_notices', '_admin_notice_page_for_posts' ); 
+ 	} 
+
 	$title = $post_type_object->labels->edit_item;
 	$post = get_post_to_edit($post_id);