diff --git a/ChangeLog b/ChangeLog
index c9acc6b82..22f1c70c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@ danbarry
 - bug #1959855 [interface] Font size option problem when no config file
   (todo (trunk): navi frame size does not change for theme original)
 - bug #1982489 [relation] Relationship view should check for changes 
+- bug [history] Do not save too big queries in history
 
 2.11.7.0 (2008-06-23)
 - bug #1908719 [interface] New field cannot be auto-increment and primary key
diff --git a/Documentation.html b/Documentation.html
index 5a89f7f1c..389bd4774 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1101,7 +1101,8 @@ ALTER TABLE `pma_column_comments`
     <dd>The maximum number of characters when a SQL query is displayed. The
     default limit of 1000 should be correct to avoid the display of tons
     of hexadecimal codes that represent BLOBs, but some users have real
-    SQL queries that are longer than 1000 characters.</dd>
+    SQL queries that are longer than 1000 characters. Also, if a query's
+    length exceeds this limit, this query is not saved in the history.</dd>
 
     <dt id="cfg_OBGzip">$cfg['OBGzip'] string/boolean</dt>
     <dd>Defines whether to use GZip output buffering for increased
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 7122d6416..0bb3c09c9 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -681,6 +681,10 @@ function PMA_setDbComment($db, $comment = '')
  */
 function PMA_setHistory($db, $table, $username, $sqlquery)
 {
+    if (strlen($sqlquery) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+        return;
+    }
+
     $cfgRelation = PMA_getRelationsParam();
 
     if (! isset($_SESSION['sql_history'])) {
diff --git a/querywindow.php b/querywindow.php
index e6d8a1ba4..f3946aa89 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -27,7 +27,6 @@
  * @uses    PMA_getRelationsParam()
  * @uses    PMA_isValid()
  * @uses    PMA_ifSetOr()
- * @uses    PMA_setHistory()
  * @uses    PMA_getHistory()
  * @uses    PMA_generate_common_url()
  * @uses    PMA_generate_common_hidden_inputs()