diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 135cb2b7fb..74bbedc2f6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-02-14 19:14 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
+
+   * source/rtl/tbrowse.prg
+     ! SetColumnWidth() fixed for multi-line headers.
+
 2004-02-14 05:33 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
 
    * include/hbapigt.h
diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg
index c5bb7117d0..8bf6cb19d5 100644
--- a/harbour/source/rtl/tbrowse.prg
+++ b/harbour/source/rtl/tbrowse.prg
@@ -519,7 +519,7 @@ METHOD SetColumnWidth( oCol ) CLASS TBrowse
                nLen := Len( xRes )
 
             case cType == "D"
-                nLen := Len(DToC( xRes ) )
+               nLen := Len(DToC( xRes ) )
 
             otherwise
                nLen := 0
@@ -528,7 +528,7 @@ METHOD SetColumnWidth( oCol ) CLASS TBrowse
 
          cHeading := oCol:Heading + ";"
          while (nL := Len(__StrTkPtr(@cHeading, @nTokenPos, ";"))) > 0
-               nColWidth += nL
+            nColWidth := Max(nL, nColWidth)
          enddo
       endif