--- a/convergedconnectionhandler/cchserver/src/cchuihandler.cpp	Fri Mar 12 15:42:09 2010 +0200
+++ b/convergedconnectionhandler/cchserver/src/cchuihandler.cpp	Mon Mar 15 12:39:55 2010 +0200
@@ -172,7 +172,6 @@
 void CCchUIHandler::MobileNetworkNoService(  )
     {
     CCHLOGSTRING( "CCchUIHandler::MobileNetworkNoService" );
-    TRAP_IGNORE( ShowEmergencyWarningNoteL( EFalse ) );
     }
 
 // ---------------------------------------------------------------------------
@@ -205,19 +204,10 @@
              KCCHVoIPEmergencyWarningShown, emergencyWarningShown );
         if( err == KErrNone )
             {
-            if ( !iVoIPEmergencyNoteState )
-                {
-                iVoIPEmergencyNoteState = 
-                    iCchEtelNetworkStatusNotifier->IsNetworkStatusNoService();    
-                }
             if( !emergencyWarningShown )
                 {
                 ShowEmergencyWarningNoteL( ETrue );
                 }
-            else if( iVoIPEmergencyNoteState )
-                {
-                ShowEmergencyWarningNoteL( EFalse );
-                }
             }
         }
     else if ( !aStatus && iVoIPSmallIndicatorShown )
@@ -302,20 +292,7 @@
                 SecondaryDisplay::ECmdShowVoipEmergencyCallReadinessQuery );
             iServer.SetVoIPEmergencyNoteShown( ETrue );
             }
-        else
-            {
-            TInt voIPEmergencyNoteDoNotShow( 0 );
-            iCchRepository->Get( 
-                KCCHVoIPShowEmergencyWarningOnOff, voIPEmergencyNoteDoNotShow );
-            if ( voIPEmergencyNoteDoNotShow && !iServer.VoIPEmergencyNoteShown() )
-                {
-                iServer.SetVoIPEmergencyNoteShown( ETrue );
-                iNoteHandler->LaunchGlobalNoteL(
-                    R_QTN_VOIP_EM_CALL_ERROR_NOTE_NO_CS, 
-                    R_AVKON_SOFTKEYS_OK_EMPTY,
-                    SecondaryDisplay::ECmdShowVoipEmergencyCallErrorNoteNoCsQuery );
-                }
-            }
+
         }
     }