--- a/emailuis/nmailui/inc/nmapplication.h	Fri Jun 11 16:42:02 2010 +0300
+++ b/emailuis/nmailui/inc/nmapplication.h	Thu Jun 24 14:32:18 2010 +0300
@@ -44,7 +44,7 @@
 {
     Q_OBJECT
 public:
-    NmApplication(QObject *parent);
+    NmApplication(QObject *parent, quint32 accountId=0);
     ~NmApplication();
     void enterNmUiView(NmUiStartParam *startParam);
     HbMainWindow* mainWindow();
@@ -61,7 +61,7 @@
     void delayedExitApplication();
     void handleOperationCompleted(const NmOperationCompletionEvent &event);
     void viewReady();
-    void launchSettings(HbAction* action);
+    void launchSettings(HbAction *action);
     
 private:
     void createMainWindow();
@@ -69,10 +69,10 @@
     void resetViewStack();
 
 private:
-    HbMainWindow *mMainWindow;              // Not owned
+    HbMainWindow *mMainWindow;              // Owned
     QStack<NmBaseView*> *mViewStack;        // Owned
     NmUiViewId mActiveViewId;
-    NmUiEngine *mUiEngine;                  // Owned
+    NmUiEngine *mUiEngine;                  // Not owned, singleton instance
     HbAction *mBackAction;                  // Owned
     NmUiExtensionManager *mExtensionManager;// Owned
     NmSendServiceInterface *mSendServiceInterface;       // Owned
@@ -90,6 +90,7 @@
     bool mViewReady;
     NmId mLastOperationMailbox;
     HbMessageBox *mQueryDialog;             // Owned
+    bool mBackButtonPressed;
 };
 
 #endif // NMAPPLICATION_H