diff -r 868cceedabd3 -r 92a061761a7b pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h
--- a/pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h	Thu Dec 17 08:47:18 2009 +0200
+++ b/pushmtm/Plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h	Thu Jan 07 12:48:02 2010 +0200
@@ -24,14 +24,14 @@
 //
 #include "PushMtmDef.hrh"
 #include "PushContentHandlerDef.hrh"
-#include <CContentHandlerBase.h>
+#include <push/CContentHandlerBase.h>
 #include <E32Base.h>
 #include <msvstd.h>
 #include <msvapi.h>
 
 // Constants
 //
-const TUid KUidPushMultiPartRelAndAltContentHandler	= { 
+const TUid KUidPushMultiPartRelAndAltContentHandler	= {
            EUidPushMultiPartRelAndAltContentHandler };
 
 // Forward class declarations
@@ -40,15 +40,15 @@
 class CMultipartIteratorBase;
 
 /**
-* The MultiPart/Alternative & Multipart/Alternative Content Handler 
+* The MultiPart/Alternative & Multipart/Alternative Content Handler
 *
 * Saves the whole message in the Message Server, each part getting saved as a child
 * entry to the main part.
-* 
-* All multipart/rel+alt messages are dropped if __TEST_MULTIPART_REL_SUPP 
+*
+* All multipart/rel+alt messages are dropped if __TEST_MULTIPART_REL_SUPP
 * is not defined.
 */
-class CMultiPartRelAndAltContentHandler : public CContentHandlerBase, 
+class CMultiPartRelAndAltContentHandler : public CContentHandlerBase,
                                           public MMsvSessionObserver
 	{
     public:	// Methods
@@ -68,7 +68,7 @@
 #ifdef __TEST_MULTIPART_REL_SUPP
 
         void LoadMultiPartMsgL();
-	    
+
 	    void HandlePartL();
 
 	    void NextPartL();
@@ -82,7 +82,7 @@
 #endif // __TEST_MULTIPART_REL_SUPP
 
     private:	// Methods from CPushHandlerBase
-	    
+
 	    void HandleMessageL(CPushMessage* aPushMsg, TRequestStatus& aStatus);
 
 	    void HandleMessageL(CPushMessage* aPushMsg);
@@ -103,7 +103,7 @@
 
     private: // from MMsvSessionObserver
 
-        void HandleSessionEventL( TMsvSessionEvent aEvent, 
+        void HandleSessionEventL( TMsvSessionEvent aEvent,
                                   TAny* aArg1, TAny* aArg2, TAny* aArg3);
 
     private:	// Attributes
@@ -111,8 +111,8 @@
 	    enum TState
             {
             ELoadMsgData,
-            EHandlePart, 
-            EDone, 
+            EHandlePart,
+            EDone,
             ENextPart
             };