--- a/emailservices/emailclientapi/src/emailmessage.cpp	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmessage.cpp	Thu Sep 30 11:43:07 2010 +0300
@@ -249,17 +249,17 @@
 void CEmailMessage::SetRecipientsL( const MEmailAddress::TRole aRole,
         REmailAddressArray& aRecipients )
     {
+    User::LeaveIfNull( iPluginMessage );
+    
     TInt count( aRecipients.Count() );
 
     for( TInt i=0;i<count;i++ )
         {
         const MEmailAddress* address = aRecipients[i];
-        CFSMailAddress* fsAddress = CFSMailAddress::NewLC();
+        CFSMailAddress* fsAddress = CFSMailAddress::NewL();
         fsAddress->SetEmailAddress( address->Address() );
         fsAddress->SetDisplayName( address->DisplayName() );
         
-        User::LeaveIfNull( iPluginMessage );
-        
         if( aRole == MEmailAddress::ETo )
             {
             iPluginMessage->AppendToRecipient( fsAddress );
@@ -274,9 +274,9 @@
             }
         else
             {
+            delete fsAddress;
             User::Leave( KErrArgument );
-            }
-        CleanupStack::Pop( fsAddress );
+            }        
         }
     }