--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Wed Sep 01 12:24:48 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Tue Sep 14 21:35:53 2010 +0300
@@ -762,16 +762,14 @@
             	TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): Reading value of KStartupSecurityCodeQueryStatus - State Value: %d"),securityQueryState));
             	TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
 				//Disable keylock if Alarm is active or if a Security code query is active on the display
-				if ( alarmState == ECoreAppUIsDisableKeyguard || securityQueryState == ESecurityQueryActive )
+				if ( alarmState == ECoreAppUIsDisableKeyguard || securityQueryState == ESecurityQueryActive 
+					  || callState == EPSCTsyCallStateRinging || iDeviceLockEnabled)
                  	{
 					KeyLock().DisableWithoutNote();               	
                  	}
 			    else
          		 	{
-                    if( callState != EPSCTsyCallStateConnected && !iDeviceLockEnabled)
-                        {
-                        KeyLock().EnableWithoutNote();
-                        }
+                    KeyLock().EnableWithoutNote();
          			}
                 }
             else