--- a/emailcontacts/remotecontactlookup/engine/src/cpbkxrclvcardsender.cpp	Mon Jan 18 20:08:26 2010 +0200
+++ b/emailcontacts/remotecontactlookup/engine/src/cpbkxrclvcardsender.cpp	Tue Jan 26 11:45:42 2010 +0200
@@ -132,33 +132,26 @@
         }
 
     CMessageData* messageData = CMessageData::NewLC();
-
-    if ( mtmUid == KSenduiMtmSmsUid )
-        {
-        // Sending through SMS
-      
-        // Copy the one and only attachment into a rich text object
-        CRichText* msgBody = CreateRichTextFromFileLC();
-
-        messageData->SetBodyTextL( msgBody );
-
-        // Send the message using Send Ui
-        iSendUi->CreateAndSendMessageL( mtmUid, messageData, KMsgBioUidVCard );
-        
-        CleanupStack::PopAndDestroy( msgBody );
-        }
-    else
-        {
-        // Not sending through SMS, just pass the attachments
-        //<cmail> hardcoded paths removed
-        messageData->AppendAttachmentL(iTempFileName);
-        //</cmail>
-        
-        // Send the message using Send Ui
-        iSendUi->CreateAndSendMessageL( mtmUid, messageData, KMsgBioUidVCard );
-        }
-
+       
+    //<cmail>
+    RFs fs;
+    RFile attachament;
+    
+    User::LeaveIfError( fs.Connect() );
+    CleanupClosePushL( fs );
+    User::LeaveIfError( attachament.Open( fs, iTempFileName, EFileShareAny ) );
+    CleanupClosePushL( attachament );
+    
+    messageData->AppendAttachmentHandleL( attachament );
+    
+    // Send the message using Send Ui
+    iSendUi->CreateAndSendMessageL( mtmUid, messageData, KMsgBioUidVCard );
+    
+    CleanupStack::PopAndDestroy( &attachament );
+    CleanupStack::PopAndDestroy( &fs );
     CleanupStack::PopAndDestroy( messageData );
+    
+    //</cmail>
 
     DestroyTempFileL();
     
@@ -223,11 +216,9 @@
     // Open the file for reading
     RFile file;
     //<cmail> take away double line break
-    User::LeaveIfError( 
-        file.Open(
-            iEikEnv->FsSession(), 
-            iTempFileName, //<cmail>
-            EFileRead | EFileStream | EFileShareReadersOnly ) );
+    User::LeaveIfError( file.Open( iEikEnv->FsSession(), 
+                            iTempFileName, //<cmail>
+                            EFileRead | EFileStream | EFileShareReadersOnly ) );
     //</cmail>
     CleanupClosePushL( file );