--- a/emailuis/nmailui/inc/nmsendserviceinterface.h	Wed Jun 23 18:00:21 2010 +0300
+++ b/emailuis/nmailui/inc/nmsendserviceinterface.h	Tue Jul 06 14:04:34 2010 +0300
@@ -23,11 +23,7 @@
 #include <QObject>
 #include <QVariant>
 
-#ifdef Q_OS_SYMBIAN
 #include <xqserviceprovider.h>
-#else
-#define NM_WINS_ENV
-#endif
 
 //  FORWARD DECLARATIONS
 class NmDataManager;
@@ -41,11 +37,7 @@
 
 
 class NmSendServiceInterface
-#ifndef NM_WINS_ENV
     : public XQServiceProvider
-#else
-    : public QObject
-#endif
 {
     Q_OBJECT
 
@@ -69,11 +61,11 @@
 
 private: // Data
 
-    NmApplication *mApplication; // Not owned
+    NmApplication *mApplication;    // Not owned
     NmUiEngine &mUiEngine;
     int mAsyncReqId;
-    NmUiStartParam *mStartParam;
-    NmMailboxSelectionDialog *mSelectionDialog;
+    NmUiStartParam *mStartParam;    // Owned
+    NmMailboxSelectionDialog *mSelectionDialog; // Owned
     HbView *mCurrentView;
 };