diff --git a/ChangeLog b/ChangeLog
index d5a94fce7..5e1f5f9d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1734285 Copy database with VIEWs
 - bug #1722502 DROP TABLE in export VIEW
 - bug #1729027 Sorting results of VIEW browsing
+- bug #1727138 HTML not encoded (more than 1000 characters)
 
 2.10.2.0 (2007-06-15)
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 0cbbad5c7..e073b6373 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1048,6 +1048,7 @@ function PMA_showMessage($message, $sql_query = null)
         $max_characters = 1000;
         if (! defined('PMA_QUERY_TOO_BIG') && strlen($query_base) > $max_characters) {
             define('PMA_QUERY_TOO_BIG',1);
+            $query_base = htmlspecialchars($sql_query);
         }
 
         // Parse SQL if needed