--- a/phoneengine/contacthandling/src/cpecontactmatch.cpp	Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneengine/contacthandling/src/cpecontactmatch.cpp	Wed Oct 13 14:31:22 2010 +0300
@@ -691,10 +691,8 @@
     RBuf parsedAddress;
     CleanupClosePushL( parsedAddress );
     TInt digitsformatching( 0 );
-    TBool allowUserNameMatch( EFalse );
-    User::LeaveIfError( plugin.GetAddressForMatching( 
-            parsedAddress, digitsformatching, allowUserNameMatch ) );
-			
+    User::LeaveIfError( plugin.GetAddressForMatching( parsedAddress, digitsformatching ) );
+
     CDesCArray* array = new ( ELeave ) CDesC16ArrayFlat( 1 );
     CleanupStack::PushL( array );
     User::LeaveIfError( plugin.GetContactStoreUris( *array ) );
@@ -706,20 +704,17 @@
     
     // Digits for matching. Supported range is between 4-20.
     // If not valid value use whole address length for matching.
-    if ( digitsformatching != 0 && 
-         ( digitsformatching < KMinValueOfMeaningfulDigits ||
-           digitsformatching > KMaxValueOfMeaningfulDigits ) )
-        {
-        digitsformatching = parsedAddress.Length();
-        }
-		
+    digitsformatching = ( digitsformatching < KMinValueOfMeaningfulDigits || 
+                          digitsformatching > KMaxValueOfMeaningfulDigits ) ? 
+                          parsedAddress.Length() : digitsformatching;
+    
     // Use service specific parameters for matching.
     TEFLOGSTRING3( KTAINT, "CNT MatchWithVoipAddressUsingExtensionL >\
         CPhCntMatcher::MatchVoipNumber, NUMBER: %S, CALL ID: %d",
         &remoteNumber, aCallId )
     iContactMatcher->MatchVoipNumber( aMatch, 
         parsedAddress.Left( Min( parsedAddress.Length(), KPEPhoneNumberMaxLength ) ), 
-        allowUserNameMatch, array, digitsformatching );                                       
+        ETrue, array, digitsformatching );                                       
     
     CleanupStack::PopAndDestroy( array );
     CleanupStack::PopAndDestroy( &parsedAddress );