--- a/emailuis/nmailuiengine/src/nmmessagelistmodel.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmmessagelistmodel.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -659,11 +659,12 @@
         if (changed(*item->envelopePtr(), *newEnvelope)) {
             // function takes envelope ownership 
             item->setEnvelope(newEnvelope);
-        } else {
-            delete newEnvelope;
-            newEnvelope = NULL;
-        }
+            return;
+        }   
     }
+    
+    delete newEnvelope;
+    newEnvelope = NULL;
 }
 
 /*!