--- a/emailuis/nmailui/src/nmviewerviewnetreply.cpp	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerviewnetreply.cpp	Tue Jun 29 17:12:28 2010 +0300
@@ -123,11 +123,8 @@
     NM_FUNCTION;
     
     Q_UNUSED(result);
-    NmMessage *message(NULL);
-    message = mUiEngine.message(
-            mMailboxId,
-            mFolderId,
-            mMessageId);
+    NmMessage *message = mUiEngine.message(
+                        mMailboxId, mFolderId, mMessageId);
     if (message) {
         QList<NmMessagePart*> partList;
         message->attachmentList(partList);
@@ -135,6 +132,7 @@
         for (int i = 0; !part && i < partList.count(); i++) {
             if (partList[i]->partId() == mMessagePartId) {
                 part = partList[i];
+                break;
             }
         }
         if (part) {