--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -182,6 +182,10 @@
                     }
                  }
             break;
+            
+        case MEngineMonitor::EPEMessageColpNumberAvailable:
+            //Don't show COLP note during emergency call.
+            break; 
 
         default:
             CPhoneGsmInCall::HandlePhoneEngineMessageL(
@@ -709,7 +713,7 @@
         case ECCPErrorCCNoChannelAvailable:
         case ECCPErrorNetworkBusy:
         case ECCPEmergencyFailed:
-            SendGlobalErrorNoteL( EPhoneNoteNoNetworkCallEmergency );
+            SendGlobalErrorNoteL( EPhoneNoteNoNetworkCallEmergency, ETrue );
             break;
 
        default: