--- a/htiui/HtiServicePlugins/HtiPIMServicePlugin/src/HtiPIMServicePlugin.cpp	Tue Apr 27 16:38:40 2010 +0300
+++ b/htiui/HtiServicePlugins/HtiPIMServicePlugin/src/HtiPIMServicePlugin.cpp	Tue May 11 16:14:15 2010 +0300
@@ -20,13 +20,12 @@
 #include "HtiPIMServicePlugin.h"
 #include "PIMHandler.h"
 #include "HtiBookmarkHandler.h"
-#include "HtiSimDirHandlerVPbk.h"
-
+#include "HtiSimDirHandler.h"
 #include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
 
 // CONSTANTS
-_LIT8( KErrorMissingCommand, "Command was not given - message was empty" );
+_LIT8( KErrorMissingCommand, "Missing command" );
 
 // ----------------------------------------------------------------------------
 // Create instance of concrete ECOM interface implementation
@@ -87,7 +86,7 @@
         {
         if ( iSimDirHandler == NULL )
             {
-            iSimDirHandler = CHtiSimDirHandlerVPbk::NewL();
+            iSimDirHandler = CHtiSimDirHandler::NewL();
             iSimDirHandler->SetDispatcher( iDispatcher );
             }
         iSimDirHandler->ProcessMessageL( aMessage, aPriority );
@@ -111,18 +110,17 @@
     {
     if ( iPimHandler )
         {
-        if ( iPimHandler->IsBusy() )
-            return ETrue;
+        return iPimHandler->IsBusy();
         }
-    if ( iSimDirHandler )
-        {
-        if ( iSimDirHandler->IsBusy() )
-            return ETrue;
-        }
+
     if ( iBookmarkHandler )
         {
-        if ( iBookmarkHandler->IsBusy() )
-            return ETrue;
+        return iBookmarkHandler->IsBusy();
+        }
+    
+    if( iSimDirHandler)
+        {
+        return iSimDirHandler->IsBusy();
         }
     return EFalse;
     }