--- a/phoneapp/phoneui/src/cphoneappui.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneui/src/cphoneappui.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -602,16 +602,20 @@
                     return;     
                     }
                            
-                if ( iQwertyHandler->IsQwertyInput() )
+                // Check if key press is simulated by FEP or by touch dialer
+                TBool fepSimulated = keyEvent->iModifiers & EModifierSpecial;               
+                TInt modifierMask = ( EModifierNumLock | EModifierKeypad );
+                TBool dialerSimulated = ( ( keyEvent->iModifiers & modifierMask ) == modifierMask );
+                        
+                if ( !fepSimulated && !dialerSimulated && iQwertyHandler->IsQwertyInput() )
                     {
-                    TInt code = iQwertyHandler->NumericKeyCode( *keyEvent );
-                    TBool fepSimulated = keyEvent->iModifiers & EModifierSpecial; 
-                    if ( !fepSimulated && 
-                         ( ( code != EKeyNull && code != keyEvent->iCode ) ||
-                         ( code == EKeyNull && CPhoneKeys::IsNumericKey( 
-                                                             *keyEvent, 
-                                                             ( TEventCode ) aEvent.Type() ) ) )
-                         ) 
+                    TInt code = iQwertyHandler->NumericKeyCode( *keyEvent );                    
+                    if ( code == EKeyNull && CPhoneKeys::IsNumericKey( *keyEvent, ( TEventCode ) aEvent.Type() ) )
+                        {
+                        code = keyEvent->iCode;
+                        }
+                    
+                    if ( code != EKeyNull ) 
                         {
                         // Modify event according to keyboard layout
                         TWsEvent newWsEvent = aEvent;    
@@ -824,15 +828,6 @@
     {
     __LOGMETHODSTARTEND( EPhonePhoneapp, "CPhoneAppUI::HandleApplicationSpecificEventL" );
     
-    if( aType == EEikKeyLockEnabled )
-        {
-        iPhoneUIController->HandleKeyLockEnabled( ETrue );
-        }
-    else if( aType == EEikKeyLockDisabled )
-        {
-        iPhoneUIController->HandleKeyLockEnabled( EFalse );
-        }
-    
     CAknAppUi::HandleApplicationSpecificEventL( aType, aEvent );
     }