diff -r c84cf270c54f -r 92ab7f8d0eab phoneengine/phonemodel/src/cpeparsersimcontrolhandler.cpp
--- a/phoneengine/phonemodel/src/cpeparsersimcontrolhandler.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneengine/phonemodel/src/cpeparsersimcontrolhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -22,8 +22,8 @@
 #include <mpecontacthandling.h>
 #include <mpedatastore.h>
 #include <pepanic.pan>
-#include <SecUi.h>
-#include <SecUiManualSecuritySettings.h>
+#include <secui.h>
+#include <secuimanualsecuritysettings.h>
 #include <talogger.h>
 
 
@@ -49,12 +49,12 @@
 CPEParserSimControlHandler::~CPEParserSimControlHandler()
     {
     if( iSecurityModel != NULL )
-	    {
-	    iSecurityModel->CancelChangePin();
-	    iSecurityModel->CancelUnblockPin();
-	    delete iSecurityModel;
-	    TSecUi::UnInitializeLib();	
-	    }
+        {
+        iSecurityModel->CancelChangePin();
+        iSecurityModel->CancelUnblockPin();
+        delete iSecurityModel;
+        TSecUi::UnInitializeLib();  
+        }
     TEFLOGSTRING( KTAOBJECT,
         "PE CPEParserSimControlHandler::~CPEParserSimControlHandler: complete");
     }
@@ -108,13 +108,13 @@
             break;
         }
         
-	if( iSecurityModel == NULL )
-		{
-		TSecUi::InitializeLibL();
- 		iSecurityModel = CManualSecuritySettings::NewL();
-    	TEFLOGSTRING( KTAOBJECT,
-        	"PE CPEParserSimControlHandler::ConstructL" );
-		}
+    if( iSecurityModel == NULL )
+        {
+        TSecUi::InitializeLibL();
+        iSecurityModel = CManualSecuritySettings::NewL();
+        TEFLOGSTRING( KTAOBJECT,
+            "PE CPEParserSimControlHandler::ConstructL" );
+        }
         
     if( iSecurityModel->ChangePinL( pin, aOldPin, aNewPin, aVerifyNew ) )
         {
@@ -157,14 +157,14 @@
             break;
         }
 
-	if( iSecurityModel == NULL )
-		{
-		TSecUi::InitializeLibL();
- 		iSecurityModel = CManualSecuritySettings::NewL();
-    	TEFLOGSTRING( KTAOBJECT,
-        	"PE CPEParserSimControlHandler::ConstructL" );
-		}
-		
+    if( iSecurityModel == NULL )
+        {
+        TSecUi::InitializeLibL();
+        iSecurityModel = CManualSecuritySettings::NewL();
+        TEFLOGSTRING( KTAOBJECT,
+            "PE CPEParserSimControlHandler::ConstructL" );
+        }
+        
     if( iSecurityModel->UnblockPinL( pin, aPuk, aNewPin, aVerifyNew ) )
         {
         iSupplementaryServicesCommandInfo.action = EPEPasswordOperation;