diff -r aabf2c525e0f -r 9f56a4e1b8ab uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp	Fri Mar 12 15:43:43 2010 +0200
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp	Mon Mar 15 12:41:34 2010 +0200
@@ -33,7 +33,7 @@
 #include <aknnotecontrol.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
+#include <secondarydisplay/AknSecondaryDisplayDefs.h>
 #include <avkondomainpskeys.h> // KPSUidAvkonDomain, KAknKeyguardStatus, TAknKeyguardStatus
 #include <startupdomainpskeys.h> // KStartupSecurityCodeQueryStatus
 #include <coreapplicationuisdomainpskeys.h> // KCoreAppUIsAutolockStatus
@@ -1383,8 +1383,6 @@
     {
     if ( !iAutolockEnabled )
         {
-        iKeypadLockedNote->ShowNote( KKeyLockCustomShortTimeout,
-                                     CAknNoteDialog::ENoTone );
         }
     }
 
@@ -1397,8 +1395,6 @@
     {
     if ( !iAutolockEnabled )
         {
-        iKeypadUnlockedNote->ShowNote( KKeyLockCustomShortTimeout,
-                                       CAknNoteDialog::ENoTone );
         }
     }
 
@@ -1849,9 +1845,6 @@
     {
     if ( !iAutolockEnabled )
         {
-        iLockedNote->ShowNote( KKeyLockDisplayLockedTimeout,
-                               CAknNoteDialog::ENoTone );
-        iLockedNoteDisplayed = ETrue;
         }
     }