--- a/emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp	Thu Sep 30 11:43:07 2010 +0300
@@ -338,10 +338,14 @@
     RArray<TFSMailSortCriteria> sorting;
     CleanupClosePushL(sorting);
     sorting.Append(criteria);
+    
+    NM_TIMESTAMP("ListMessagesL in getMessagesFromFolderL start");   
 
     // Get the message list from the backend.
     MFSMailIterator* iterator(NULL);
     iterator = folder->ListMessagesL(details, sorting);
+    
+    NM_TIMESTAMP("ListMessagesL in getMessagesFromFolderL end");
 
     if (iterator) {
         CleanupStack::PushL(iterator);
@@ -356,8 +360,10 @@
         for (int i = blockSize;
              i < maxItemCount && moreMessagesToFollow;
              i += blockSize) {
+            NM_TIMESTAMP("  NextL in getMessagesFromFolderL begins");            
             moreMessagesToFollow =
                 iterator->NextL(messages[i-1]->GetMessageId(), blockSize, messages);
+            NM_TIMESTAMP("  NextL in getMessagesFromFolderL end");              
         }
 
         // Add all the found emails into the result list.
@@ -1314,7 +1320,10 @@
         // param2: TFSMailMsgId* aNewParentFolder
         // param3: TFSMailMsgId* aOldParentFolder
         case TFSEventMailMoved:
-            handleMailMoved(param1, param2, param3, mailbox);
+            if(param2 && param3)
+                {
+                handleMailMoved(param1, param2, param3, mailbox);
+                }            
             break;
 
         // Mails copied