--- a/messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp	Wed Aug 18 00:46:12 2010 +0530
+++ b/messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp	Tue Aug 31 18:53:38 2010 +0530
@@ -205,7 +205,7 @@
     return mAddressEdit->addresses().count();
 }
 
-void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist)
+void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist,bool aSkipCheck)
 {
     // avoid processing if no info available
     if(addrlist.count() == 0)
@@ -243,7 +243,15 @@
     for(int i = 0; i < count; i++ )
         {
         bool isValid = false;
-        isValid = checkValidAddress(addrlist.at(i)->address());
+        if(!aSkipCheck)
+        {
+            isValid = checkValidAddress(addrlist.at(i)->address());
+        }
+        else
+        {
+            // no need to validate, assume correct
+            isValid = true;
+        }
         if(!isValid)
            {
             invalidCount ++;
@@ -253,7 +261,10 @@
                 {
                 invalidContacts.append(COMMA_SEPERATOR);
                 }
-            invalidContacts.append(addrlist.at(i)->alias());
+            if(addrlist[i]->alias().isEmpty())
+                invalidContacts.append(addrlist.at(i)->address());
+            else
+                invalidContacts.append(addrlist.at(i)->alias());
            }
        else
            {
@@ -271,12 +282,10 @@
     if(invalidCount)
         {
         QString invalidStr;
-        (invalidCount == 1)?(invalidStr = QString(LOC_INVALID_RECIPIENT_NOT_ADDED)) :(invalidStr = QString(LOC_INVALID_RECIPIENTS_NOT_ADDED));
-        // append line seperator
-         invalidStr.append("<br>");
-         invalidStr.append(invalidContacts);
-         HbMessageBox::information(invalidStr, 0, 0, HbMessageBox::Ok);
-        }
+        (invalidCount == 1)?(invalidStr = QString(LOC_INVALID_RECIPIENT_NOT_ADDED.arg(invalidContacts))) :(invalidStr = QString(LOC_INVALID_RECIPIENTS_NOT_ADDED.arg(invalidContacts)));
+		HbMessageBox::information(invalidStr, 0, 0, HbMessageBox::Ok);
+    }
+    
 
     // addition operation complete, reset flags
     mAboutToExceedMaxSmsRecipients = false;