--- a/phoneengine/callhandling/src/cpecallhandling.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneengine/callhandling/src/cpecallhandling.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -446,11 +446,11 @@
             CPESingleCall* call;
             call = static_cast<CPESingleCall*>( iCallArrayOwner->CallByCallId( aCallId ) );
                                  
+            MCCECall& connectedCall = call->Call();
+            CCPCall::TCallType callType = connectedCall.Parameters().CallType();
+ 
             if ( EPEStateConnected == call->GetCallState() )
-                {
-                MCCECall& connectedCall = call->Call();
-                CCPCall::TCallType callType = connectedCall.Parameters().CallType();
-                
+                {                
                 if ( callType == CCPCall::ECallTypePS ) 
                     {
                     TEFLOGSTRING( KTAMESINT, 
@@ -472,11 +472,11 @@
                         iModel.SendMessage( MEngineMonitor::EPEMessageColpNumberAvailable, aCallId );
                         }
                     }
-                
-                iModel.DataStore()->SetRemotePartyName( connectedCall.RemotePartyName(), aCallId );                
-                iModel.DataStore()->SetRemotePhoneNumber( connectedCall.RemoteParty().Left( KPEPhoneNumberMaxLength ), aCallId );
-                iModel.DataStore()->SetCallIndex(connectedCall.CallIndex(), aCallId );
                 }
+            // CNAP informations must be in incoming call
+            iModel.DataStore()->SetRemotePartyName( connectedCall.RemotePartyName(), aCallId );                
+            iModel.DataStore()->SetRemotePhoneNumber( connectedCall.RemoteParty().Left( KPEPhoneNumberMaxLength ), aCallId );
+            iModel.DataStore()->SetCallIndex( connectedCall.CallIndex(), aCallId );            
             break;
             }