--- a/mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp	Sun Mar 28 16:36:08 2010 +0100
+++ b/mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp	Mon Mar 29 12:25:56 2010 +0100
@@ -243,7 +243,18 @@
         iSmsHeader->StoreL( aStore );
         }
     }
-
+// -----------------------------------------------------------------------------
+// ResetUniAddresselist
+// -----------------------------------------------------------------------------
+//
+void CUniSmsPlugin::ResetUniAddresselist()
+    {
+    const CMsvRecipientList& uniRecipients = iUniMtm.AddresseeList();       
+    while ( uniRecipients.Count() )
+        {
+        iUniMtm.RemoveAddressee( 0 );
+        }  
+    }
 // -----------------------------------------------------------------------------
 // ConvertFromL
 // -----------------------------------------------------------------------------
@@ -264,10 +275,11 @@
     SmsMtmL()->SwitchCurrentEntryL( aId );
     SmsMtmL()->LoadMessageL();
     iUniMtm.SwitchCurrentEntryL( aId );
-    iUniMtm.LoadMessageL();
+    iUniMtm.LoadMessageL(); 
+    ResetUniAddresselist();
+    TPtrC name;
+    TPtrC address;  
 
-    TPtrC name;
-    TPtrC address;
 
 	const CSmsEmailFields& emailFields = SmsMtmL( )->SmsHeader( ).EmailFields();
 
@@ -641,8 +653,7 @@
     CleanupStack::PopAndDestroy( sendOptions ); 
 
     SmsMtmL()->SaveMessageL(*store, tEntry);
-
-    store->CommitL();        
+    store->CommitL();           
     tEntry.iSize = store->SizeL();
     if( AttachmentsSizeL( *store ) > 0 )
         {