--- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp	Wed Sep 01 12:30:10 2010 +0100
@@ -102,15 +102,20 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageConnected:
+            {
             HandleConnectedL( aCallId );
             break;
-            
+            }
         case MEngineMonitor::EPEMessageIdle:
+            {
             HandleIdleL( aCallId );
+            }
             break;
-            
+           
         default:
+            {
             CPhoneAlerting::HandlePhoneEngineMessageL( aMessage, aCallId );
+            }
             break;
         }
     }
@@ -138,7 +143,7 @@
                 {
                 // Show not allowed note
                 CPhoneState::SendGlobalErrorNoteL( 
-                    EPhoneNoteTextNotAllowed, ETrue );
+                    EPhoneNoteTextNotAllowed );
                 }
             break;
 
@@ -187,12 +192,9 @@
         EPhoneViewGetCallIdByState, &callStateData );
         
     if( callStateData.CallId() == aCallId )
-        {    
-        // Keep Phone in the foreground
-        TPhoneCmdParamBoolean booleanParam;
-        booleanParam.SetBoolean( EFalse );
-        iViewCommandHandle->ExecuteCommandL( 
-            EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
+        {        
+        // Close menu bar, if it is displayed
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 
         CPhoneState::BeginUiUpdateLC();
             
@@ -202,8 +204,8 @@
         iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
             &callHeaderParam );
 
-        CPhoneState::SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-        CPhoneState::EndUiUpdate();
+        SetTouchPaneButtons( EPhoneTwoSinglesButtons );
+        EndUiUpdate();
               
         // Set Hold flag to view
         TPhoneCmdParamBoolean holdFlag;
@@ -212,7 +214,7 @@
         
         
         // Set Two singles softkeys
-        UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
+	    UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
         
         // Go to two singles state
         iStateMachine->ChangeState( EPhoneStateTwoSingles );
@@ -244,6 +246,9 @@
     // Remove call 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
+    // Close menu bar, if it is displayed
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+
     if ( !TopAppIsDisplayedL() )
         {
         // Continue displaying current app but set up the 
@@ -277,13 +282,40 @@
     }
 
 // -----------------------------------------------------------
+// CPhoneSingleAndAlerting::OpenMenuBarL
+// -----------------------------------------------------------
+//
+void CPhoneSingleAndAlerting::OpenMenuBarL()
+    {
+    __LOGMETHODSTARTEND( EPhoneUIStates, 
+        "CPhoneSingleAndAlerting::OpenMenuBarL()");
+    TInt resourceId;
+
+    if ( IsNumberEntryVisibleL() )
+        {
+        resourceId = EPhoneAlertingAndHeldCallMenuBarWithNumberEntry;
+        }
+    else
+        {
+        resourceId = EPhoneAlertingAndHeldCallMenuBar;
+        }
+
+    TPhoneCmdParamInteger integerParam;
+    integerParam.SetInteger( 
+        CPhoneMainResourceResolver::Instance()->
+        ResolveResourceID( resourceId ) );
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, 
+        &integerParam );
+    }
+
+// -----------------------------------------------------------
 // CPhoneSingleAndAlerting::UpdateInCallCbaL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndAlerting::UpdateInCallCbaL()
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneSingleAndAlerting::UpdateInCallCbaL() ");
-    UpdateCbaL( EPhoneCallHandlingInCallCBA );
+ 	UpdateCbaL( EPhoneCallHandlingInCallCBA );
     }