diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index c8632018d..10a274d2e 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -62,14 +62,14 @@ $messages[6] = __('Categories deleted.'); ?>
 
 <?php screen_options('link-category') ?>
 
+<div class="wrap nosubsub">
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
+
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
 
-<div class="wrap nosubsub">
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
-
 <form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="category-search-input"><?php _e( 'Search Categories' ); ?>:</label>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index f7b8e4788..f7a8ae443 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -92,6 +92,9 @@ else
 
 <?php screen_options('post') ?>
 
+<div class="wrap">
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
@@ -115,9 +118,6 @@ if ( (int) $_GET['locked'] ) {
 </p></div>
 <?php } ?>
 
-<div class="wrap">
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-
 <form id="posts-filter" action="" method="get">
 <ul class="subsubsub">
 <?php
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 6e5114690..2bf070ed0 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -76,6 +76,9 @@ switch ($order_by) {
 
 <?php screen_options('link') ?>
 
+<div class="wrap nosubsub">
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
+
 <?php
 if ( isset($_GET['deleted']) ) {
 	echo '<div id="message" class="updated fade"><p>';
@@ -86,9 +89,6 @@ if ( isset($_GET['deleted']) ) {
 }
 ?>
 
-<div class="wrap nosubsub">
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
-
 <form class="search-form" action="" method="get">
 <p class="search-box">
 	<label class="hidden" for="link-search-input"><?php _e( 'Search Links' ); ?>:</label>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 9b257eee1..f9a8e13a5 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -163,12 +163,9 @@ $messages[1] = __('Media attachment updated.');
 $messages[2] = __('Media deleted.');
 $messages[3] = __('Error saving media attachment.');
 
-if ( isset($_GET['message']) && (int) $_GET['message'] )
+if ( isset($_GET['message']) && (int) $_GET['message'] ) {
 	$message = $messages[$_GET['message']];
-
-if ( isset($message) ) { ?>
-<div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }
 ?>
 
@@ -177,6 +174,13 @@ if ( isset($message) ) { ?>
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
+<?php
+if ( isset($message) ) { ?>
+<div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
+<?php 
+}
+?>
+
 <ul class="subsubsub">
 <?php
 $type_links = array();