--- a/emailuis/nmailui/inc/nmuiviewids.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmailui/inc/nmuiviewids.h	Fri May 14 15:41:10 2010 +0300
@@ -26,11 +26,12 @@
 
 enum NmUiViewId
 {
-    NmUiViewNone = 0,       // Used to reset view stack
-    NmUiViewMailboxList,    // Mailbox list view
-    NmUiViewMessageList,    // Message list view of a folder
-    NmUiViewMessageViewer,  // Message view of an email message
-    NmUiViewMessageEditor   // Message editor
+    NmUiViewNone = 0,          // Used to reset view stack
+    NmUiViewMailboxList,       // Mailbox list view
+    NmUiViewMessageList,       // Message list view of a folder
+    NmUiViewMessageSearchList, // Message search list view
+    NmUiViewMessageViewer,     // Message view of an email message
+    NmUiViewMessageEditor      // Message editor
 };
 
 enum NmUiEditorStartMode
@@ -39,7 +40,8 @@
     NmUiEditorReply,
     NmUiEditorReplyAll,
     NmUiEditorForward,
-    NmUiEditorMailto
+    NmUiEditorMailto,
+    NmUiEditorFromDrafts
 };
 
 
@@ -179,6 +181,10 @@
         return *mBccAddressList;
     }
 
+    inline void setMailboxId(NmId mailboxId) 
+    {
+        mMailboxId = mailboxId;
+    }
 
 private: // Data