--- a/emailuis/uicomponents/src/fscontrolbutton.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/uicomponents/src/fscontrolbutton.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -206,11 +206,8 @@
     TFsControlButtonElem aWhich )
     {
     FUNC_LOG;
-    if ( iModel->Icon( aWhich ) != &aIcon ) // don't set the same icon twice
-        {
-        iModel->SetIconL( aIcon, aWhich );
-        iVisualiser->UpdateElementL( aWhich );
-        }
+    iModel->SetIconL( aIcon, aWhich );
+    iVisualiser->UpdateElementL( aWhich );
     }
 
 
@@ -632,9 +629,7 @@
                     iParent.HandleButtonEvent(
                         MFsControlButtonObserver::EEventButton,
                         iModel->Id() );
-                    
-                    // EStdKeyDevice3 (EKeyOK) cannot be consumed here.
-                    result = EFalse;
+                    result = ETrue;
 
                     if ( iTriggeredComponent )
                         {