diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f4b8cd0546..eee05a7726 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-19 19:11 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbqt/THbQtUI.prg
+    ! Code cleanup.
+
+  * contrib/hbqt/hbqt_hbqplaintextedit.cpp
+    ! Fix to honor tab width with font change.
+
 2010-05-19 16:41 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbqplaintextedit.cpp
   * contrib/hbide/hbide.prg
diff --git a/harbour/contrib/hbqt/THbQtUI.prg b/harbour/contrib/hbqt/THbQtUI.prg
index da009014a2..1f9f331a14 100644
--- a/harbour/contrib/hbqt/THbQtUI.prg
+++ b/harbour/contrib/hbqt/THbQtUI.prg
@@ -479,12 +479,11 @@ METHOD HbQtUI:build( cFileOrBuffer, qParent )
 
    ::qObj[ cMNam ] := ::oWidget
 
-//HB_TRACE( HB_TR_ALWAYS, "------------------------------------------------------------" )
    FOR EACH a_ IN ::widgets
       IF a_:__enumIndex() > 1
          IF type( a_[ 3 ] ) == "UI"
             cBlock := "{|o| " + a_[ 4 ] + "}"
-//HB_TRACE( HB_TR_ALWAYS, "Constr   ", pad( a_[ 2 ], 20 ), cBlock )
+
             bBlock := &( cBlock )
 
             x := eval( bBlock, ::qObj )
@@ -492,11 +491,10 @@ METHOD HbQtUI:build( cFileOrBuffer, qParent )
                ::qObj[ a_[ 2 ] ] := x
             ENDIF
          ELSE
-//HB_TRACE( HB_TR_ALWAYS, "----------------------------", a_[ 3 ] )
+
          ENDIF
       ENDIF
    NEXT
-//HB_TRACE( HB_TR_ALWAYS, "------------------------------------------------------------" )
 
    ::aCommands := aCommands
 
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
index 64bab95009..3767aa2ee2 100644
--- a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
@@ -1810,8 +1810,6 @@ int HBQPlainTextEdit::hbLineNumberAreaWidth()
 
 void HBQPlainTextEdit::hbUpdateLineNumberAreaWidth( int )
 {
-   setTabStopWidth( spaces * fontMetrics().averageCharWidth() );
-
    if( numberBlock )
    {
       setViewportMargins( hbLineNumberAreaWidth(), HORZRULER_HEIGHT, 0, 0 );
@@ -1828,6 +1826,8 @@ void HBQPlainTextEdit::hbUpdateHorzRuler( const QRect & rect, int dy )
 {
    HB_SYMBOL_UNUSED( rect );
 
+   setTabStopWidth( spaces * fontMetrics().averageCharWidth() );
+
    if( dy == 0 )
       horzRuler->update();
 }