--- a/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp	Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp	Wed Oct 13 14:31:22 2010 +0300
@@ -43,7 +43,8 @@
         MPhoneStateMachine& aStateMachine ) 
         : iManagerUtility ( aManagerUtility ),
           iStateMachine ( aStateMachine ),
-          iCallHeaderType ( CBubbleManager::ENormal )
+          iCallHeaderType ( CBubbleManager::ENormal ),
+          iSetDivertIndication ( EFalse )
     {
     }
 
@@ -487,8 +488,7 @@
     TPhoneCmdParamCallHeaderData* aCallHeaderData )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndicatorToCallHeader( ) ");
-    TBool forwarded = iStateMachine.PhoneEngineInfo()->CallForwarded( aCallId );
-    if ( forwarded )
+    if( iSetDivertIndication )
         {
         aCallHeaderData->AddCallFlag( CBubbleManager::EDiverted );
         }
@@ -502,6 +502,19 @@
     }
 
 // ---------------------------------------------------------------------------
+// TPhoneCallHeaderParam::SetDivertIndication
+// ---------------------------------------------------------------------------
+//
+void TPhoneCallHeaderParam::SetDivertIndication( const TBool aDivertIndication )
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndication( ) ");
+    iSetDivertIndication = aDivertIndication;           
+    __PHONELOG1( EBasic, EPhoneControl, 
+                "TPhoneCallHeaderParam::SetDivertIndication() - iSetDivertIndication: %d ", 
+                iSetDivertIndication )
+    }
+
+// ---------------------------------------------------------------------------
 //  TPhoneCallHeaderParam::SetIncomingCallHeaderParamsL
 // ---------------------------------------------------------------------------
 //
@@ -597,15 +610,7 @@
         else
             {
             aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->
-                RemotePhoneNumber( aCallId ), CBubbleManager::ELeft );
-
-            // No contact name, use phonenumber when available.
-            if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() 
-                    && !ContactInfoAvailable( aCallId ) )
-                {
-                aCallHeaderData->SetParticipantListCLI(
-                        TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
-                }
+                RemotePhoneNumber( aCallId ), CBubbleManager::ELeft );       
             }
         }
     else
@@ -645,9 +650,6 @@
     SetCallerImage( 
             aCallId, 
             aCallHeaderData ); 
-    
-    // Update divert indication
-    SetDivertIndicatorToCallHeader( aCallId, aCallHeaderData );
     }
 
 // ---------------------------------------------------------------------------