--- a/emailuis/nmailuiengine/src/nmmessagelistmodel.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmmessagelistmodel.cpp	Fri May 14 15:41:10 2010 +0300
@@ -192,7 +192,6 @@
         } else {
             for (int a(0); a < messageIds.count(); a++) {
                 removeMessageFromModel(messageIds[a]);
-                emit removeMessage(messageIds[a]);
             }
         }
     }
@@ -413,7 +412,7 @@
         QModelIndex index = items[i]->index();
         NmMessageListModelItem *item = static_cast<NmMessageListModelItem*>(itemFromIndex(index));
         if (NmMessageListModelItem::NmMessageItemMessage == item->itemType()
-                && msgId == item->envelope().id()) {
+                && msgId == item->envelope().messageId()) {
             found = true;
             // dividers are not active, just remove message
             if (!mDividersActive) {
@@ -475,7 +474,7 @@
         NmMessageListModelItem *item =
             static_cast<NmMessageListModelItem*>(itemFromIndex(items[i]->index()));
         if (NmMessageListModelItem::NmMessageItemMessage == item->itemType()
-            && messageId == item->envelope().id()) {
+            && messageId == item->envelope().messageId()) {
             found = true;
             ret = item;
         }