--- a/idlefw/plugins/devicestatus/src/ainetworkinfolistener.cpp	Tue May 25 13:01:39 2010 +0300
+++ b/idlefw/plugins/devicestatus/src/ainetworkinfolistener.cpp	Wed Jun 09 10:01:25 2010 +0300
@@ -155,8 +155,8 @@
 
 void CAiNetworkInfoListener::HandleNetworkMessage( const TNWMessages aMessage )
     {
-    __PRINTS("XAI: Handle NW message");
-	//Insert message into the message cache. Only one messsage of one type.
+    __PRINT(__DBG_FORMAT("XAI: Handle NW message %d"), aMessage );
+    //Insert message into the message cache. Only one messsage of one type.
     TRAPD( err, iMessageCache->InsertIsqL( aMessage, iKeyProperties ) );
     if( err == KErrAlreadyExists )
         {
@@ -249,8 +249,8 @@
     // Registration status and network information must have been received.
     // Operator name information must have been received.
     // Device must be camped to a network.
+    // CS registration should be completed (only valid in AT&T NW)
 
-    TBool csAlphaFlag( EFalse );
 	switch ( aMessage )
     	{
         case MNWMessageObserver::ENWMessageNetworkInfoChange:
@@ -296,7 +296,13 @@
                     if ( !( RPacketService::KCapsRxCSCall & 
                             iInfo.iDynamicCapsFlags ) )
                         {
-                        csAlphaFlag = ETrue;
+                        __PRINTS("XAI: CS registration failed");
+                        iReceivedMessageFlags |= ECSRegistrationNotOk;
+                        }
+                    else
+                        {
+                        __PRINTS("XAI: CS registration ok");
+                        iReceivedMessageFlags &= ~ECSRegistrationNotOk;
                         }
                     }
                 FeatureManager::UnInitializeLib();
@@ -316,6 +322,7 @@
     	( ENetworkInfoChangeReceived  & iReceivedMessageFlags ) && 
         ( ERegistrationStatusReceived & iReceivedMessageFlags ) &&
         ( iInfo.iStatus == ENWStatusCurrent ) );  
+    TBool csAlphaFlag( ECSRegistrationNotOk & iReceivedMessageFlags );
       
   	return
         !serviceProviderNameFetched ||