Index: wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
===================================================================
--- wp-includes/js/tinymce/plugins/wpeditimage/editimage.html	(revision 23074)
+++ wp-includes/js/tinymce/plugins/wpeditimage/editimage.html	(working copy)
@@ -73,14 +73,14 @@
 			</td>
 		</tr>
 
-		<tr id="cap_field">
+		<tr>
 			<th valign="top" scope="row" class="label">
-				<label for="img_cap">
-				<span class="alignleft">{#wpeditimage.caption}</span>
+				<label for="img_title">
+				<span class="alignleft">{#wpeditimage.img_title}</span>
 				</label>
 			</th>
 			<td class="field">
-				<textarea id="img_cap_text"></textarea>
+				<input type="text" id="img_title" name="img_title" value="" aria-required="true" size="60" />
 			</td>
 		</tr>
 
@@ -95,6 +95,17 @@
 			</td>
 		</tr>
 
+		<tr id="cap_field">
+			<th valign="top" scope="row" class="label">
+				<label for="img_cap">
+				<span class="alignleft">{#wpeditimage.caption}</span>
+				</label>
+			</th>
+			<td class="field">
+				<textarea id="img_cap_text"></textarea>
+			</td>
+		</tr>
+
 		<tr>
 			<th valign="top" scope="row" class="label">
 				<label for="link_href">
@@ -147,17 +158,6 @@
 
 		<tr>
 			<th valign="top" scope="row" class="label">
-				<label for="img_title">
-				<span class="alignleft">{#wpeditimage.img_title}</span>
-				</label>
-			</th>
-			<td class="field">
-				<input type="text" id="img_title" name="img_title" value="" aria-required="true" size="60" />
-			</td>
-		</tr>
-
-		<tr>
-			<th valign="top" scope="row" class="label">
 				<label for="img_classes">
 				<span class="alignleft">{#wpeditimage.css}</span>
 				</label>
Index: wp-includes/js/media-editor.js
===================================================================
--- wp-includes/js/media-editor.js	(revision 23074)
+++ wp-includes/js/media-editor.js	(working copy)
@@ -554,7 +554,8 @@
 				props = wp.media.string.props( props, attachment );
 
 				options = {
-					id: attachment.id
+					id:           attachment.id,
+					post_content: attachment.description
 				};
 
 				if ( props.linkUrl )
Index: wp-includes/js/media-views.js
===================================================================
--- wp-includes/js/media-views.js	(revision 23076)
+++ wp-includes/js/media-views.js	(working copy)
@@ -2829,7 +2829,8 @@
 					width:         '',
 					height:        '',
 					compat:        false,
-					alt:           ''
+					alt:           '',
+					description:   '',
 				});
 
 			options.buttons  = this.buttons;
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 23076)
+++ wp-includes/media.php	(working copy)
@@ -1395,7 +1395,7 @@
 	}
 
 	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'taxonomies' => true, 'description' => true ) );
+		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
 
 	return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );
 }
@@ -1740,15 +1740,22 @@
 			<label class="setting" data-setting="title">
 				<span><?php _e('Title'); ?></span>
 				<input type="text" value="{{ data.title }}" {{ maybeReadOnly }}
-				<# if ( 'video' === data.type ) { #>
-					placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
-				<# } else if ( 'audio' === data.type ) { #>
-					placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
-				<# } else { #>
-					placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
-				<# } #>/>
+				<# if ( ! maybeReadOnly ) { #>
+					<# if ( 'video' === data.type ) { #>
+						placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
+					<# } else if ( 'audio' === data.type ) { #>
+						placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
+					<# } else { #>
+						placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
+					<# } #>
+				<# } #>
+				/>
 			</label>
 		<# } #>
+			<label class="setting" data-setting="description">
+				<span><?php _e('Description'); ?></span>
+				<textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
+			</label>
 	</script>
 
 	<script type="text/html" id="tmpl-media-selection">
Index: wp-admin/includes/ajax-actions.php
===================================================================
--- wp-admin/includes/ajax-actions.php	(revision 23074)
+++ wp-admin/includes/ajax-actions.php	(working copy)
@@ -1884,6 +1884,9 @@
 	if ( isset( $changes['caption'] ) )
 		$post['post_excerpt'] = $changes['caption'];
 
+	if ( isset( $changes['description'] ) )
+		$post['post_content'] = $changes['description'];
+
 	if ( isset( $changes['alt'] ) ) {
 		$alt = get_post_meta( $id, '_wp_attachment_image_alt', true );
 		$new_alt = stripslashes( $changes['alt'] );
@@ -1923,10 +1926,6 @@
 	if ( 'attachment' != $post['post_type'] )
 		wp_send_json_error();
 
-	// Handle the description field automatically, if a plugin adds it back.
-	if ( isset( $attachment_data['post_content'] ) )
-		$post['post_content'] = $attachment_data['post_content'];
-
 	$post = apply_filters( 'attachment_fields_to_save', $post, $attachment_data );
 
 	if ( isset( $post['errors'] ) ) {
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 23074)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -296,30 +296,6 @@
 }
 
 /**
- * Display attachment/media-specific information
- *
- * @since 3.5.0
- *
- * @param object $post
- */
-function attachment_content_meta_box( $post ) {
-	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
-	$editor_args = array(
-		'textarea_name' => 'content',
-		'textarea_rows' => 5,
-		'media_buttons' => false,
-		'tinymce' => false,
-		'quicktags' => $quicktags_settings,
-	);
-?>
-<p>
-	<label class="screen-reader-text" for="content"><strong><?php _e( 'Attachment Page Content' ); ?></strong></label>
-	<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
-</p>
-<?php
-}
-
-/**
  * Display post format form elements.
  *
  * @since 3.1.0
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 23074)
+++ wp-admin/includes/media.php	(working copy)
@@ -1286,8 +1286,7 @@
 
 	$default_args = array(
 		'errors' => null,
-		'taxonomies' => false,
-		'description' => false,
+		'in_modal' => false,
 	);
 
 	$user_can_edit = current_user_can( 'edit_post', $attachment_id );
@@ -1297,7 +1296,7 @@
 
 	$form_fields = array();
 
-	if ( $args['taxonomies'] ) {
+	if ( $args['in_modal'] ) {
 		foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
 			$t = (array) get_taxonomy($taxonomy);
 			if ( ! $t['public'] || ! $t['show_ui'] )
@@ -1329,12 +1328,9 @@
 	$form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
 
 	unset( $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
-		$form_fields['post_title'], $form_fields['post_excerpt'],
+		$form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
 		$form_fields['url'], $form_fields['menu_order'], $form_fields['image_url'] );
 
-	if ( ! $args['description'] )
-		unset( $form_fields['post_content'] );
-
 	$media_meta = apply_filters( 'media_meta', '', $post );
 
 	$defaults = array(
@@ -1361,6 +1357,9 @@
 
 		$field = array_merge( $defaults, $field );
 
+		if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) )
+			continue;
+
 		if ( $field['input'] == 'hidden' ) {
 			$hidden_fields[$name] = $field['value'];
 			continue;
@@ -2282,12 +2281,12 @@
 
 	$att_url = wp_get_attachment_url( $post->ID );
 
-	$image_edit_button = '';
-	if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
-		$nonce = wp_create_nonce( "image_editor-$post->ID" );
-		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
-	}
-
+	if ( wp_attachment_is_image( $post->ID ) ) :
+		$image_edit_button = '';
+		if ( wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
+			$nonce = wp_create_nonce( "image_editor-$post->ID" );
+			$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
+		}
  	?>
 	<div class="wp_attachment_holder">
 		<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
@@ -2298,6 +2297,7 @@
 		</div>
 		<div style="display:none" class="image-editor" id="image-editor-<?php echo $attachment_id; ?>"></div>
 	</div>
+	<?php endif; ?>
 
 	<div class="wp_attachment_details">
 		<p>
@@ -2312,6 +2312,21 @@
 		</p>
 	<?php endif; ?>
 
+	<?php
+		$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+		$editor_args = array(
+			'textarea_name' => 'content',
+			'textarea_rows' => 5,
+			'media_buttons' => false,
+			'tinymce' => false,
+			'quicktags' => $quicktags_settings,
+		);
+	?>
+	<p>
+		<label for="content"><strong><?php _e( 'Description' ); ?></strong></label>
+		<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
+	</p>
+
 	</div>
 	<?php
 	$extras = get_compat_media_markup( $post->ID );
@@ -2348,7 +2363,12 @@
 		<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
 	</div>
 	<div class="misc-pub-section">
-		<?php _e( 'File type:' ); ?> <strong><?php echo $post->post_mime_type; ?></strong>
+		<?php _e( 'File type:' ); ?> <strong><?php
+			if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+				echo esc_html( strtoupper( $matches[1] ) );
+			else
+				echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+		?>
 	</div>
 
 <?php if ( $media_dims ) : ?>
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 23074)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -107,7 +107,6 @@
 	wp_enqueue_script( 'image-edit' );
 	wp_enqueue_style( 'imgareaselect' );
 	add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' );
-	add_meta_box( 'attachmentdata', __('Attachment Page Content'), 'attachment_content_meta_box', null, 'normal', 'core' );
 	add_action( 'edit_form_after_title', 'edit_form_image_editor' );
 } else {
 	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );