diff -r c8caa15ef882 -r e6a66db4e9d0 XDMSettingsUI/src/XDMPlugin.cpp
--- a/XDMSettingsUI/src/XDMPlugin.cpp	Tue Feb 02 01:05:17 2010 +0200
+++ b/XDMSettingsUI/src/XDMPlugin.cpp	Fri Mar 19 09:37:41 2010 +0200
@@ -212,7 +212,7 @@
     iSettingListContainer->MakeVisible(EFalse);    
     iCurrentContainer = iMainListContainer;
     iAppUi->AddToViewStackL( *this, iCurrentContainer );
-    UpdateMskL();
+    UpdateMSK();
     }
 
 // ---------------------------------------------------------------------------
@@ -274,7 +274,7 @@
             break;
         case EGSXDMPluginCmdDelete:
             iMainListContainer->DeleteSetProcedureL();
-            UpdateMskL();
+            UpdateMSK();
             break;
         case EAknCmdHelp:
             HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), AppUi()->AppHelpContextL ());
@@ -342,7 +342,7 @@
     iAppUi->AddToViewStackL( *this, iCurrentContainer );
     iMainListContainer->MakeVisible(EFalse);
     iSettingListContainer->MakeVisible(ETrue);
-    UpdateMskL();
+    UpdateMSK();
     }
 
 // ---------------------------------------------------------------------------
@@ -362,7 +362,7 @@
     
     iSettingListContainer->MakeVisible(EFalse);  
     iMainListContainer->MakeVisible(ETrue);
-    UpdateMskL();
+    UpdateMSK();
     }
     
 // ---------------------------------------------------------------------------
@@ -444,16 +444,11 @@
     }
     
 // ---------------------------------------------------------------------------
-// CXDMPlugin::UpdateMskL()
+// CXDMPlugin::UpdateMSK()
 // ---------------------------------------------------------------------------
 //
-void CXDMPlugin::UpdateMskL()
+void CXDMPlugin::UpdateMSK()
     {
-    if ( !Cba() )
-        {
-        return;
-        }
-    
     CEikCba* cba = static_cast< CEikCba* >( Cba()->ButtonGroup() );
     if(iCurrentContainer==iMainListContainer)
         {