diff --git a/ChangeLog b/ChangeLog
index 165e091c8..bc2ec78ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ $Id$
 + [code] Centralized format string expansion, @VARIABLES@ are recommended way
   now.
 + [validator] SQL validator works also with SOAP PHP extension.
+- [interface] Better formatting for SQL validator results.
 
 3.3.6.0 (not yet released)
 - bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 61bb709dc..7e79faf84 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1250,7 +1250,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
             $validate_link = '';
         } //validator
 
-        echo '<code class="sql">';
+        if (!empty($GLOBALS['validatequery'])) {
+            echo '<div class="sqlvalidate">';
+        } else {
+            echo '<code class="sql">';
+        }
         if ($query_too_big) {
             echo $shortened_query_base;
         } else {
@@ -1261,7 +1265,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         if (! empty($GLOBALS['show_as_php'])) {
             echo '";';
         }
-        echo '</code>';
+        if (!empty($GLOBALS['validatequery'])) {
+            echo '</div>';
+        } else {
+            echo '</code>';
+        }
 
         echo '<div class="tools">';
         // avoid displaying a Profiling checkbox that could
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 4cd48eadf..53f0f23dd 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1152,7 +1152,7 @@ label.desc {
     float: <?php echo $left; ?>;
 }
 
-code.sql {
+code.sql, div.sqlvalidate {
     display:            block;
     padding:            0.3em;
     margin-top:         0;