--- a/emailuis/nmailui/inc/nmapplication.h	Thu Sep 02 20:15:00 2010 +0300
+++ b/emailuis/nmailui/inc/nmapplication.h	Fri Sep 17 08:27:21 2010 +0300
@@ -20,6 +20,7 @@
 
 #include <QStack>
 #include <QObject>
+#include <hbapplication.h>
 
 #include "nmuiviewids.h"
 
@@ -39,12 +40,15 @@
 class NmSettingsViewLauncher;
 class NmUiEffects;
 class HbMessageBox;
+class QTimer;
 
-class NmApplication : public QObject
+class NmApplication : public HbApplication
 {
     Q_OBJECT
 public:
-    NmApplication(QObject *parent, quint64 accountId=0);
+    
+    NmApplication(int &argc, char *argv[],
+                   Hb::ApplicationFlags flags = Hb::DefaultApplicationFlags );
     ~NmApplication();
     void enterNmUiView(NmUiStartParam *startParam);
     HbMainWindow* mainWindow();
@@ -102,6 +106,8 @@
     bool mBackButtonPressed;
     NmId mCurrentMailboxId;
     bool mApplicationHidden;
+    QTimer* mErrorNoteTimer;                // Owned
+    NmId mLastErrorMailboxId;
 };
 
 #endif // NMAPPLICATION_H