diff --git a/ChangeLog b/ChangeLog
index 71a102ee9..c8a66045d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
       #927554) [still missing images/button_export.png, waiting for somebody
       to make it :-)].
     * libraries/auth/cookie.auth.lib.php: Fix possible undefined variable use.
+    * libraries/display_tbl.lib.php: Convert charset for column fields (thanks
+      to Marc for noticing this).
 
 2004-04-15 Olivier Mueller <om@omnis.ch>
     * left.php: RFE #859208, Logout button in left frame
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index f062df904..e64149885 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -817,7 +817,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
 <th <?php echo $column_style; ?> <?php if ($disp_direction == 'horizontalflipped') echo 'valign="bottom"'; ?>>
     <?php echo $comments_table_wrap_pre; ?>
     <a href="sql.php?<?php echo $url_query; ?>" <?php echo (($disp_direction == 'horizontalflipped' AND $GLOBALS['cfg']['HeaderFlipType'] == 'css') ? 'style="direction: ltr; writing-mode: tb-rl;"' : '') . ' title="' . $GLOBALS['strSort'] . '"'; ?>>
-        <?php echo ($disp_direction == 'horizontalflipped'  && $GLOBALS['cfg']['HeaderFlipType'] == 'fake' ? PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), "<br />\n") : htmlspecialchars($fields_meta[$i]->name)); ?> </a><?php echo $order_img . "\n"; ?>
+        <?php echo ($disp_direction == 'horizontalflipped'  && $GLOBALS['cfg']['HeaderFlipType'] == 'fake' ? PMA_flipstring(htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name)), "<br />\n") : htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name))); ?> </a><?php echo $order_img . "\n"; ?>
     <?php echo $comments_table_wrap_post; ?>
 </th>
                 <?php
@@ -837,7 +837,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                 ?>
 <th <?php echo $column_style; ?> <?php if ($disp_direction == 'horizontalflipped') echo 'valign="bottom"'; ?>  <?php echo ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'css' ? 'style="direction: ltr; writing-mode: tb-rl;"' : ''); ?>>
     <?php echo $comments_table_wrap_pre; ?>
-    <?php echo ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake'? PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), "<br />\n") : htmlspecialchars($fields_meta[$i]->name)) . "\n"; ?>
+    <?php echo ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake'? PMA_flipstring(PMA_convert_display_charset(htmlspecialchars($fields_meta[$i]->name)), "<br />\n") : htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name))) . "\n"; ?>
     <?php echo $comments_table_wrap_post; ?>
 </th>
                 <?php