diff --git a/ChangeLog b/ChangeLog
index 3f58ff1fc..034645fe1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
     * db_details_structure.php3, mult_submits.inc.php3, tbl_alter.php3,
       tbl_properties_structure.php3: Show result of CHECK/OPTIMIZE/REPAIR
       queries for multiple tables.
+    * db_details_structure.php3: Display correctly table names that contain
+      html entities.
 
 2003-03-23 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.lib.php3, libraries/config_import.lib.php3,
diff --git a/db_details_structure.php3 b/db_details_structure.php3
index 515b0f08b..a17e18e85 100644
--- a/db_details_structure.php3
+++ b/db_details_structure.php3
@@ -127,10 +127,10 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
         $table_name    = htmlspecialchars($table);
 
         $alias = (!empty($tooltip_aliasname) && isset($tooltip_aliasname[$table]))
-                   ? str_replace('"', '&quot;', $tooltip_aliasname[$table])
+                   ? htmlspecialchars($tooltip_aliasname[$table])
                    : htmlspecialchars($sts_data['Name']);
         $truename = (!empty($tooltip_truename) && isset($tooltip_truename[$table]))
-                   ? str_replace('"', '&quot;', $tooltip_truename[$table])
+                   ? htmlspecialchars($tooltip_truename[$table])
                    : htmlspecialchars($sts_data['Name']);
 
         // Sets parameters for links