--- a/phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp	Fri Feb 19 22:50:26 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007 - 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -31,11 +31,11 @@
 #include <phoneui.mbg>
 
 #include "cphonetoolbarcontroller.h"
-#include "PhoneUI.hrh"
-#include "PhoneRssBase.h"
-#include "TPhoneCmdParamInteger.h"
-#include "TPhoneCmdParamBoolean.h"
-#include "PhoneLogger.h"
+#include "phoneui.hrh"
+#include "phonerssbase.h"
+#include "tphonecmdparaminteger.h"
+#include "tphonecmdparamboolean.h"
+#include "phonelogger.h"
 
 
 _LIT ( KPhoneMifFileName, "phoneui.mif" );
@@ -303,6 +303,8 @@
         }
     return skinId;        
     }
+
+// ---------------------------------------------------------------------------
 // ShowToolbar
 //
 // ---------------------------------------------------------------------------
@@ -310,6 +312,7 @@
 void CPhoneToolbarController::ShowToolbar()
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneToolbarController::ShowToolbar()" );
+
     if ( iToolbar )
         {
         if ( iToolbar->IsToolbarDisabled() )
@@ -317,7 +320,6 @@
             TRAP_IGNORE(iToolbar->DisableToolbarL( EFalse ));
             }
         UpdateToolbar();
-        iToolbar->HideItemsAndDrawOnlyBackground( EFalse );
         iToolbar->SetToolbarVisibility( ETrue, EFalse );
         }
     }
@@ -332,17 +334,12 @@
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneToolbarController::HideToolbar()" );
     if ( iToolbar )
         {
-        if( iToolbar->IsShown() )
-            {
-            iToolbar->HideItemsAndDrawOnlyBackground( ETrue );
-            }
-        else if ( iToolbar->IsToolbarDisabled() )
+        if ( iToolbar->IsToolbarDisabled() )
             {
             TRAP_IGNORE(iToolbar->DisableToolbarL( EFalse ));
-            iToolbar->HideItemsAndDrawOnlyBackground( ETrue );
-            iToolbar->SetToolbarVisibility( ETrue, EFalse );
             }
-        }        
+        iToolbar->SetToolbarVisibility( EFalse, EFalse );
+        }
     }
 
 // ---------------------------------------------------------