diff --git a/ChangeLog b/ChangeLog
index eb0e085bb..b0cac8ec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $HeadURL$
 - 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 5f8da3c5b..b6d09d552 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1407,6 +1407,7 @@ if (typeof(window.parent) != 'undefined'
             $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