--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue Apr 27 16:37:10 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue May 11 16:13:03 2010 +0300
@@ -185,10 +185,7 @@
             break;
             
         case MEngineMonitor::EPEMessageColpNumberAvailable:
-            {
             //Don't show COLP note during emergency call.
-            return;                    
-            }
             break; 
 
         default:
@@ -240,6 +237,8 @@
                 // Continue displaying current app but set up the
                 // idle screen in the background
                 SetupIdleScreenInBackgroundL();
+                // Update toolbar
+                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
                 }
 
             else if ( iOnScreenDialer && IsNumberEntryContentStored() )
@@ -257,6 +256,8 @@
                 {
                 // Show the number entry if it exists
                 SetNumberEntryVisibilityL(ETrue);
+                // Update toolbar
+                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
                 }
 
             else
@@ -380,6 +381,8 @@
 
         SetTouchPaneButtons( EPhoneEmergencyCallButtons );
 
+        SetToolbarDimming( ETrue );
+
         ShowNoteL( EPhoneEmergencyConnectWaitNote );
 
         UpdateSetupCbaL();
@@ -454,9 +457,6 @@
 
     EndUiUpdate();
 
-    //Make sure that toolbar is not shown
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
-
     UpdateInCallCbaL();
     }
 
@@ -479,6 +479,7 @@
         &emergencyHeaderParam );
 
     EndUiUpdate();
+    SetToolbarDimming( ETrue );
     UpdateInCallCbaL();
     }