diff --git a/ChangeLog b/ChangeLog
index 499d11174..2e2d6acc5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2003-11-11 Garvin Hicking <antikarneval@supergarv.de>
     * libraries/display_tbl.lib.php3: Added more secure checks
       for each'ing on arrays built by the query analyzer. (Bug #839630)
+    * libraries/display_tbl.lib.php3: Fixed Bug #839834 - Colspan for
+      repeated headers were wrong since introduction of multi-row delete.
 
 2003-11-10 Marc Delisle  <lem9@users.sourceforge.net>
     * scripts/extchg.sh: bug 839081: generator.sh was not converted
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 323fdf0f3..53c323991 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -625,7 +625,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         //     ... before the result table
         if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
             && $is_display['text_btn'] == '1') {
-            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0;
+            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 ?>
     <td colspan="<?php echo $fields_cnt; ?>" align="center">
@@ -653,7 +653,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         //     ... at the left column of the result table header if possible
         //     and required
         else if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && $is_display['text_btn'] == '1') {
-            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0;
+            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 echo "\n";
                 ?>
@@ -674,7 +674,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         //     ... else if no button, displays empty(ies) col(s) if required
         else if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
                  && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) {
-            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0;
+            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 echo "\n";
                 ?>
@@ -858,7 +858,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         if ($GLOBALS['cfg']['ModifyDeleteAtRight']
             && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
             && $is_display['text_btn'] == '1') {
-            $vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1;
+            $vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 1;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 echo "\n";
                 ?>
@@ -881,7 +881,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         else if ($GLOBALS['cfg']['ModifyDeleteAtRight']
                  && ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
                  && (!$GLOBALS['is_header_sent'])) {
-            $vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1;
+            $vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 1;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 echo "\n";
                 ?>