--- a/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp	Thu Jul 15 19:36:11 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp	Thu Aug 19 10:44:50 2010 +0300
@@ -170,6 +170,12 @@
             iDialog->TryCancelQueryL(ESecUiDeviceLocked);
             iSubscribedToEvent = EFalse;
         }
+        else if((autolockState == EAutolockOff)||(autolockState == EAutolockStatusUninitialized))
+            {
+            Dprint(_L("CSCPLockObserver::RunL() TryCancelQueryL Device UnLocked"));
+            iDialog->TryCancelQueryL(ESecUiNone);
+            iSubscribedToEvent = EFalse;
+            }
         break;
         case ESecUiCallStateObserver: {
             TInt callState;