--- a/email/pop3andsmtpmtm/clientmtms/inc/MIUTMSG.H	Tue Oct 05 13:58:47 2010 +0530
+++ b/email/pop3andsmtpmtm/clientmtms/inc/MIUTMSG.H	Tue Oct 19 11:30:16 2010 +0530
@@ -19,7 +19,6 @@
 
 #include <msvstd.h>
 #include <msvapi.h>			// TMsvEntry, CMsvOperation etc
-#include <mentact.h>		// CMsgActive
 #include <miuthdr.h>		// CImHeader, CImMimeHeader
 #include <txtrich.h>		// CRichText etc
 #include <miutdef.h>		// CImHeader, CImMimeHeader
@@ -31,10 +30,6 @@
 #include <barsc.h>		// RResourceFile
 #include <conarc.h>
 #include <conlist.h>
-
-#include <txtmrtsr.h>
-
-//#include <mmsvattachmentmanager.h>
 #include <s32mem.h>
 
 //Content-Transfer-Encoding: types
@@ -90,7 +85,7 @@
 #endif
 
 class CImHtmlConverter;
-
+class CMsgActive;
 class CImAttachmentManager;
 class CMsvMimeHeaders;
 class CImPlainBodyText;