--- a/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp	Tue May 25 12:58:19 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp	Wed Jun 09 09:58:37 2010 +0300
@@ -1325,13 +1325,14 @@
                     }
                 }
             }   // PenEnabled()
+        }
 
-        if (aNotifySysApp)
-            {
-            SendMessageToSysAp( EEikKeyLockDisabled );
-            }
-        }
-    if ( iNotif )
+	if (aNotifySysApp)
+		{
+		SendMessageToSysAp( EEikKeyLockDisabled );
+		}
+
+	if ( iNotif )
         {
         iNotif->NotifyStatusChange( EKeyLockDisabled );
         }
@@ -2385,7 +2386,6 @@
     {
     if ( IsKeyLockEnabled() )
         {
-        iKeyLockControl->AutolockEnabled( EFalse );
         iKeyLockControl->DisableKeylock();
         }
     }