--- a/srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp	Tue Sep 14 21:21:09 2010 +0300
+++ b/srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp	Wed Oct 13 14:33:27 2010 +0300
@@ -1522,25 +1522,16 @@
             }
         }
         
-//    TRAPD( err, // trapping is a fix to make the function non-leaving
+    TRAPD( err, // trapping is a fix to make the function non-leaving
 
 	    // Add the tags to the to-be-deleted list.
 	    // (there are 1 or 2 tags in aTagList depending on
 	    //  whether nickname is also there or not)
-	    TRAPD(err,
-		for ( TInt k( 0 ); k < aTagList->Count(); k++ )
+	    for ( TInt k( 0 ); k < aTagList->Count(); k++ )
 	        {
 	        iDeleteTagListArray->AppendL( (*aTagList)[k] );
 	        }
-			);
-		if ( err != KErrNone )
-			{
-			// Destroy tag list
-	    	aTagList->Reset();
-	    	delete aTagList;
-	    	aTagList = 0;
-	        return;
-			}
+
 	    // We have processed this ID
 	    RUBY_DEBUG1( "CNssContactHandlerImplementation::DoRemoveNamesAfterGetTagList Before removal. iDelList.Count [%d]", iDelList.Count() );
 	    if( iDelList.Count() > 0 ) 
@@ -1580,11 +1571,11 @@
 	        RUBY_DEBUG0( "DoRemoveNamesAfterGetTagList Moving to the next phase" );
 	        DoRemoveNamesCallDeleteTag();
 	        }
-//        );  // TRAPD
-//        if( err != KErrNone ) 
-//        	{
-//        	RUBY_ERROR1( "CNssContactHandlerImplementation::DoRemoveNamesAfterGetTagList Leaves with [%d] inside", err );
-//        	}
+        );  // TRAPD
+        if( err != KErrNone ) 
+        	{
+        	RUBY_ERROR1( "CNssContactHandlerImplementation::DoRemoveNamesAfterGetTagList Leaves with [%d] inside", err );
+        	}
 		// Destroy tag list
 	    aTagList->Reset();
 	    delete aTagList;
@@ -1923,23 +1914,7 @@
                             CleanupStack::PushL( extIds );
 
                             extIds->AppendL( iContactQueue[k].iID ); 
-                            if ( iExtensionList[i].iCommand == EMessageCommand ||
-                                  iExtensionList[i].iCommand == EVideoCommand )
-                                {
-                                TInt id = iPbkHandler->FieldIdL();
-                                if ( id )
-                                    {
-                                    extIds->AppendL( id );
-                                    }
-                                else
-                                    {
-                                    extIds->AppendL( fieldId );
-                                    }
-                                }
-                            else
-                                {
-                                extIds->AppendL( fieldId );
-                                }
+                            extIds->AppendL( fieldId ); 
                             extIds->AppendL( action );
                             extIds->AppendL( iContactQueue[k].iType );
                             extIds->AppendL( iExtensionList[i].iCommand );