--- a/emailuis/nmhswidget/inc/nmhswidget.h	Fri Sep 03 17:52:02 2010 +0300
+++ b/emailuis/nmhswidget/inc/nmhswidget.h	Wed Sep 15 12:09:55 2010 +0300
@@ -30,6 +30,11 @@
 class NmHsWidgetDateTimeObserver;
 class HbLabel;
 class HbDocumentLoader;
+class HbListView;
+class NmHsWidgetListModel;
+class NmHsWidgetListView;
+class QModelIndex;
+
 
 class NmHsWidget : public HbWidget
 {
@@ -48,6 +53,7 @@
 public slots:
     //from home screen fw
     void onInitialize();
+    void onUninitialize();
     void onShow();
     void onHide();
     //engine
@@ -62,6 +68,8 @@
     QString widgetStateProperty();
     //user actions
     void handleExpandCollapseEvent();
+    
+    void openMessage(const QModelIndex& index);
 
 signals: 
     void finished();
@@ -71,16 +79,14 @@
     void setupLocalization();
     void setupUi();
     bool loadDocML(HbDocumentLoader &loader);
-    void updateMailRowsVisibility(const int visibleCount);
     void addNoMailsLabelToLayout();
     void removeNoMailsLabelFromLayout();
     void addEmailRowsToLayout();
     void removeEmailRowsFromLayout();
     void updateLayout(const int visibleCount);
     void toggleExpansionState();  
-
+    void createMailRowsList();
 protected:
-    void createMailRowsList();
     
 private:
     //UI components
@@ -89,7 +95,6 @@
     HbWidget* mWidgetContainer;             //container including title row and mContentContainer
     NmHsWidgetTitleRow* mTitleRow;          //mailbox icon, name, unread count and expand button 
     HbWidget* mContentContainer;            //container for mail rows or mNoMailsLabel
-    QList<NmHsWidgetEmailRow*> mMailRows;   //list including mail row instances
     HbLabel* mNoMailsLabel;                 //label shown in mContentContainer when no mails in inbox
     QGraphicsLinearLayout* mContentLayout;  //layout used in mContentContainer    
     HbFrameDrawer* mBackgroundFrameDrawer;  //drawer for widget background shown in mWidgetContainer
@@ -100,6 +105,8 @@
     QString mAccountIconName;               //name of mailbox icon shown in titlerow
     NmHsWidgetDateTimeObserver* mDateObserver;  //observer for time/locale changes    
     bool mIsExpanded;                       //true when widget expanded, false when collapsed  
+    HbListView* mListView;                  //list view for messages 
+    NmHsWidgetListModel* mListModel;        //list model for mListView
     
 public:    
     friend class TestNmHsWidget;