--- a/harvester/monitorplugins/messageplugin/src/messagemonitorplugin.cpp	Tue Feb 02 00:24:33 2010 +0200
+++ b/harvester/monitorplugins/messageplugin/src/messagemonitorplugin.cpp	Fri Feb 19 23:14:48 2010 +0200
@@ -334,28 +334,27 @@
 #ifdef __WINSCW__
 		else if (!err && KMsvDraftEntryId == aFolderId2 && KMsvGlobalOutBoxIndexEntryId == aFolderId1 )
 			{
-			CClientMtmRegistry* clientMtmReg;
-			clientMtmReg = CClientMtmRegistry::NewL(*iMsvSession);
-			CleanupStack::PushL(clientMtmReg);
-			
-			
-			CSmsClientMtm* smsMtm = static_cast<CSmsClientMtm*>(clientMtmReg->NewMtmL(KUidMsgTypeSMS));	
-			CleanupStack::PushL(smsMtm);
-			smsMtm->SwitchCurrentEntryL( msgId );
-			
-			TMsvSelectionOrdering selection;
-			selection.SetShowInvisibleEntries(ETrue);
-			
-			CMsvEntry* parentEntry = CMsvEntry::NewL( smsMtm->Session(),
-                smsMtm->Entry().Entry().Parent(), selection );
+		    if( entry.iMtm.iUid != KUidMsgTypeMultimedia.iUid )
+		        {
+                CClientMtmRegistry* clientMtmReg;
+                clientMtmReg = CClientMtmRegistry::NewL(*iMsvSession);
+                CleanupStack::PushL(clientMtmReg);
+            
+                CSmsClientMtm* smsMtm = static_cast<CSmsClientMtm*>(clientMtmReg->NewMtmL(KUidMsgTypeSMS)); 
+                CleanupStack::PushL(smsMtm);
+                smsMtm->SwitchCurrentEntryL( msgId );
+            
+                TMsvSelectionOrdering selection;
+                selection.SetShowInvisibleEntries(ETrue);
+            
+                CMsvEntry* parentEntry = CMsvEntry::NewL( smsMtm->Session(),
+                    smsMtm->Entry().Entry().Parent(), selection );
              
-             CleanupStack::PushL(parentEntry);
-        	// Move the message
-        	TRAP_IGNORE( parentEntry->MoveL( msgId, KMsvSentEntryId ) );
-        	CleanupStack::PopAndDestroy(3,clientMtmReg); // parentEntry
-        				
-
-			
+                CleanupStack::PushL(parentEntry);
+                // Move the message
+                TRAP_IGNORE( parentEntry->MoveL( msgId, KMsvSentEntryId ) );
+                CleanupStack::PopAndDestroy(3,clientMtmReg); // parentEntry
+		        }
 			}
 #endif