diff --git a/adminer/default.css b/adminer/default.css
index 0c6f6b97..dfe91f6e 100644
--- a/adminer/default.css
+++ b/adminer/default.css
@@ -16,8 +16,9 @@ code { background: #eee; }
 .js .hidden { display: none; }
 .nowrap { white-space: nowrap; }
 .wrap { white-space: normal; }
-.error { color: red; background: #fee; padding: .5em .8em; }
-.message { color: green; background: #efe; padding: .5em .8em; }
+.error { color: red; background: #fee; }
+.message { color: green; background: #efe; }
+.error, .message { padding: .5em .8em; margin: 0 20px 1em 0; }
 .char { color: #007F00; }
 .date { color: #7F007F; }
 .enum { color: #007F7F; }
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index f3046352..d69c96dd 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -39,7 +39,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	}
 	echo "<h2>$title" . (strlen($title2) ? ": " . htmlspecialchars($title2) : "") . "</h2>\n";
 	if ($_SESSION["messages"]) {
-		echo "<p class='message'>" . implode("</p>\n<p class='message'>", $_SESSION["messages"]) . "</p>\n";
+		echo "<div class='message'>" . implode("</p>\n<p class='message'>", $_SESSION["messages"]) . "</div>\n";
 		$_SESSION["messages"] = array();
 	}
 	$databases = &$_SESSION["databases"][$_GET["server"]];
@@ -50,7 +50,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 		session_write_close();
 	}
 	if ($error) {
-		echo "<p class='error'>$error</p>\n";
+		echo "<div class='error'>$error</div>\n";
 	}
 }
 
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 25f0d4c6..974b187e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -101,7 +101,7 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 	$id = "sql-" . count($_SESSION["messages"]);
 	$sql = "";
 	if ($query) {
-		$sql = " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><span id='$id' class='hidden'><br /><code class='jush-sql'>" . htmlspecialchars($query) . '</code><br /><a href="' . htmlspecialchars($SELF . 'sql=&history=' . count($_SESSION["history"][$_GET["server"]][$_GET["db"]])) . '">' . lang('Edit') . '</a></span>';
+		$sql = " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><span id='$id' class='hidden'><pre class='jush-sql'>" . htmlspecialchars($query) . '</pre><a href="' . htmlspecialchars($SELF . 'sql=&history=' . count($_SESSION["history"][$_GET["server"]][$_GET["db"]])) . '">' . lang('Edit') . '</a></span>';
 		$_SESSION["history"][$_GET["server"]][$_GET["db"]][] = $query;
 	}
 	if ($execute) {