diff --git a/ChangeLog b/ChangeLog
index ffda9f8e7..fed05ac27 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-10-09 Loïc Chapeaux  <lolo@phpheaven.net>
+    * libraries/display_tbl.lib.php3, bug 619735: display broken (bad HTML)
+
 2002-10-09 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/get_foreign.lib.php3, there are no functions
       in this file that need to be protected from being defined
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 19409bdf8..a53480af6 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -8,7 +8,7 @@
 
 
 
-if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
+if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
     define('PMA_DISPLAY_TBL_LIB_INCLUDED', 1);
 
     /**
@@ -731,10 +731,10 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
             reset ($query_parts);
             while (list(, $query_pair) = each($query_parts)) {
                 list($eachvar, $eachval) = explode('=', $query_pair);
-                $link_or_button .= '            <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . urldecode($eachval) . '" />' . "\n";
+                $link_or_button .= '            <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . htmlspecialchars(urldecode($eachval)) . '" />' . "\n";
             } // end while
             $link_or_button     .= '            <input type="submit" value="'
-                                . $message . '" />' . "\n" . '</form>' . "\n";
+                                . htmlspecialchars($message) . '" />' . "\n" . '</form>' . "\n";
         } // end if... else...
 
         return $link_or_button;