--- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp	Wed Jun 09 09:41:11 2010 +0300
+++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp	Mon Jun 21 15:39:45 2010 +0300
@@ -228,13 +228,6 @@
         {
         switch( menuItemArray[ i ] )
             {
-            case EPhoneDialerCallSettings:
-                if ( iSecurityMode )
-                    {
-                    menuPane->DeleteMenuItem( menuItemArray[ i ] );
-                    }
-                break;
-
             case EPhoneInCallCmdAnswer:
                 if ( iConferenceAndWaitingVideoFlag )
                     {
@@ -299,15 +292,6 @@
                     }
                 break;    
                 
-            case EPhoneInCallCmdSendToCallerMenu:
-            	{
-            	if ( iSecurityMode )
-            		{
-            		menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
-            		}
-            	}
-            break;
-                                
             case EPhoneNumberAcqCmdSendCommand:
                 if ( !iServiceCodeFlag || iNumberEntryEmpty || iInvalidCsPhoneNumber )
                     {
@@ -520,7 +504,7 @@
                 break;
             case EPhoneCmdDtmfOk:
                 {
-                if ( onScreenDialer && iNumberEntryEmpty )
+                if ( ( onScreenDialer && iNumberEntryEmpty ) || iSecurityMode )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[i] );                     
                     }
@@ -561,18 +545,19 @@
                     }
                 }
                 break;
-			
+
+            case EPhoneDialerCallSettings: // Fall through
+            case EPhoneInCallCmdSendToCallerMenu: // Fall through
+            case EAknCmdEditItemPlaceHolder: // Fall through
             case EPhoneDialerCmdHelp: // Fall through 
             case EPhoneDialerCmdHelpDtmf: // Fall through
             case EPhoneInCallCmdHelp:
-                {
                 if ( iSecurityMode )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[i] );
                     }
-                }
-			break;
-			
+                break;
+
             default:
                 break;