--- a/emailuis/uicomponents/src/fscontrolbuttonvisualiser.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/uicomponents/src/fscontrolbuttonvisualiser.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -221,8 +221,7 @@
     if( iUseDefaultBackground )
         {
         ClearBackgroundImage();
-        iDefaultBgBrush = CAlfFrameBrush::NewL( iParent->Env(), KAknsIIDQsnFrButtonTb );
-        iLastUpdatedButtonModelSize.SetSize(0,0); // prevent code skip in ClearBackgroundImage
+        iDefaultBgBrush = CAlfFrameBrush::NewL( iParent->Env(), KAknsIIDQsnFrButtonTb );  
         iBgBrush = iDefaultBgBrush;
         iButtonLayout->Brushes()->AppendL( iBgBrush, EAlfDoesNotHaveOwnership );
         UpdateBarLayout();
@@ -679,16 +678,14 @@
             }
         }
 
-    TSize size =  iButtonModel->Size();
-    
     // New size for the button background.
-    iButtonLayout->SetSize( size );
+    iButtonLayout->SetSize( iButtonModel->Size() );
     // Same size for the content
-    iButtonContentLayout->SetSize( size );
+    iButtonContentLayout->SetSize( iButtonModel->Size() );
 
-    if ( iDefaultBgBrush && size != iLastUpdatedButtonModelSize )
+    if( iDefaultBgBrush )
         {
-        iLastUpdatedButtonModelSize = size;
+        TSize size =  iButtonModel->Size();
         TRect fullRect = TRect( size );
         TRect innerRect = fullRect;
         innerRect.Shrink( KButtonBorderSize,KButtonBorderSize );