--- a/emailuis/nmailui/inc/nmmessagesearchlistview.h	Thu Sep 02 20:15:00 2010 +0300
+++ b/emailuis/nmailui/inc/nmmessagesearchlistview.h	Fri Sep 17 08:27:21 2010 +0300
@@ -18,9 +18,10 @@
 #ifndef NMMESSAGESEARCHLISTVIEW_H_
 #define NMMESSAGESEARCHLISTVIEW_H_
 
-#include "nmbaseview.h"
+#include <QModelIndex>
 #include <nmactionobserver.h>
-#include <QModelIndex>
+#include "nmbaseview.h"
+
 
 class HbAbstractViewItem;
 class HbDocumentLoader;
@@ -30,6 +31,9 @@
 class HbMenu;
 class HbPushButton;
 class HbTreeView;
+class HbSearchPanel;
+class HbIcon;
+class HbShrinkingVkbHost;
 
 class NmActionResponse;
 class NmApplication;
@@ -57,9 +61,9 @@
 public: // From NmBaseView
 
     NmUiViewId nmailViewId() const;
+    void aboutToExitView();
     void viewReady();
 
-
 public: // From NmActionObserver
 
     void handleActionCommand(NmActionResponse &menuResponse);
@@ -69,21 +73,18 @@
 
     enum NmSearchInputMode {
         NmNormalMode = 0,
-        NmHighlightedMode,
         NmDimmedMode
     };
 
-
 private:
 
     void loadViewLayout();
     void initTreeView();
     void setViewTitle();
     void noMessagesLabelVisibility(bool visible);
-    void updateSearchResultCountInfo();
+    void updateResultView();
     void setSearchInputMode(NmSearchInputMode mode);
 
-
 public slots:
 
     void reloadViewContents(NmUiStartParam *startParam);
@@ -91,7 +92,6 @@
 
 private slots:
 
-    void criteriaChanged(QString text);
     void showItemContextMenu(HbAbstractViewItem *index, const QPointF &coords);
     void itemActivated(const QModelIndex &index);
     void handleSelection();
@@ -100,25 +100,35 @@
     void refreshList();
     void toggleSearch();
     void handleSearchComplete();
-
+    void textChanged(const QString &text);
+    void exitClicked();
+    void orientationAboutToChange();
+    void orientationChanged();
+    void sendSoftwareInputPanelRequest(QEvent::Type eventType = QEvent::RequestSoftwareInputPanel);
+    void vkbOpened();
+    void vkbClosed();
 
 private: // Data
 
     NmApplication &mApplication;
     NmUiEngine &mUiEngine;
     NmMessageListModel &mMsgListModel;
-    HbDocumentLoader *mDocumentLoader; // Owned
+    HbDocumentLoader *mDocumentLoader;          // Owned
     QObjectList mWidgetList;
-    HbMenu *mItemContextMenu; // Owned
-    HbTreeView *mMessageListWidget; // Not owned
-    HbGroupBox *mInfoLabel; // Not owned
-    HbLabel *mNoMessagesLabel; // Not owned
-    HbLineEdit *mLineEdit; // Not owned
-    HbPushButton *mPushButton; // Not owned
-    NmMessageListModelItem *mLongPressedItem; // Not owned
+    HbMenu *mItemContextMenu;                   // Owned
+    HbTreeView *mMessageList;                   // Not owned
+    HbLabel *mNoMessagesLabel;                  // Not owned
+    HbSearchPanel *mSearchPanel;                // Not owned
+    NmMessageListModelItem *mLongPressedItem;   // Not owned
+    HbPushButton *mProgressButton;              // Not owned
+    HbLineEdit *mLineEdit;                      // Not owned
 	QModelIndex mActivatedIndex;
     bool mViewReady;
     bool mSearchInProgress;
+    HbIcon *mSpinnerIcon;                       // Owned
+    bool mAnimationAddedToManger;
+    bool mSelectTextAfterOrientationChange;
+    HbShrinkingVkbHost *mVkbHost;               // Owned
 };