--- a/emailuis/nmhswidget/inc/nmhswidget.h	Fri Jun 11 16:42:02 2010 +0300
+++ b/emailuis/nmhswidget/inc/nmhswidget.h	Thu Jun 24 14:32:18 2010 +0300
@@ -28,6 +28,7 @@
 class QTranslator;
 class HbFrameDrawer;
 class NmHsWidgetDateTimeObserver;
+class HbLabel;
 
 class NmHsWidget : public HbWidget
 {
@@ -40,13 +41,14 @@
 public:
     NmHsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
     ~NmHsWidget();
+
+    QPainterPath shape() const;
     
 public slots:
     //from home screen fw
     void onInitialize();
     void onShow();
     void onHide();
-    void onUninitialize();
     //engine
     void updateMailData();
     void onEngineException(const int& exc);
@@ -65,13 +67,18 @@
     void setPreferences(const QStringList &names);
     void error();
 private:
-    bool setupLocalization();
+    void setupLocalization();
     void setupUi();
     void updateMailRowsVisibility(const int visibleCount);
+    void addNoMailsLabelToLayout();
+    void removeNoMailsLabelFromLayout();
+    void addEmailRowsToLayout();
+    void removeEmailRowsFromLayout();
+    void updateLayout(const int visibleCount);
     void toggleExpansionState();  
 
 protected:
-    void updateMailRowsList(const int mailCount);
+    void createMailRowsList();
     
 private:
     NmHsWidgetEmailEngine* mEngine;
@@ -83,8 +90,8 @@
     QTranslator *mTranslator;
     HbFrameDrawer* mBackgroundFrameDrawer;
     bool mIsExpanded;
-    bool mStaticWidget;
     NmHsWidgetDateTimeObserver* mDateObserver;
+    HbLabel *mNoMailsLabel; 
     
 public:    
     friend class TestNmHsWidget;