--- a/emailuis/nmailui/nmailui.pro	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmailui/nmailui.pro	Fri May 14 15:41:10 2010 +0300
@@ -20,8 +20,7 @@
 INCLUDEPATH += . \
     ./inc \
     ../../inc \
-    ../nmailuiwidgets/inc \
-    /epoc32/include/app
+    
 DEFINES += UI_EXTENSION_INTERFACE
 QT += webkit
 QT += network
@@ -29,16 +28,15 @@
 
 LIBS += -leuser
 LIBS += -llibc
+LIBS += -lnmailbase
+LIBS += -lnmailuiengine
+LIBS += -lnmailuiwidgets
+LIBS += -lnmsettingui
+LIBS += -lnmutilities
 
 symbian*: {
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     
-    INCLUDEPATH += /epoc32/include \
-    /epoc32/include/app \
-    /epoc32/include/mw \
-    /sf/mw/qtextensions/qthighway/inc \
-    /sf/mw/qtextensions/qtmobileextensions/include 
-    
     TARGET.UID2 = 0x100039CE
     TARGET.UID3 = 0x200255BA
     TARGET.CAPABILITY = CAP_APPLICATION
@@ -46,29 +44,12 @@
     # TARGET.EPOCSTACKSIZE = 0x6000
     TARGET.EPOCHEAPSIZE = 0x20000 \
         0x1000000
-    LIBS += -lnmailbase \
-        -lnmailuiengine \
-        -lnmailuiwidgets \
-        -lxqservice \
+    LIBS += -lxqservice \
         -lxqserviceutil \
         -lqtcontacts \
         -lmobcntmodel
-
-    # Remove following system includes, when qmake is able to generate those
-    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/mw/hb/hbtools"
-    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/mw/hb/hbfeedback"
 }
 
-win32 {
-    INCLUDEPATH += . \
-        ../../emailservices/nmailbase \
-        ../nmailuiengine
-    DESTDIR = ../../bin
-    LIBS += -L../../bin \
-        -lnmailbase \
-        -lnmailuiengine \
-        -lnmailuiwidgets \
-}
 HEADERS += inc/nmeditorcontent.h \
     inc/nmeditorheader.h \
     inc/nmuiheaders.h \
@@ -80,6 +61,7 @@
     inc/nmviewerviewnetmanager.h \
     inc/nmviewerviewnetreply.h \
     inc/nmmessagelistview.h \
+    inc/nmmessagesearchlistview.h \
     inc/nmbaseview.h \
     inc/nmapplication.h \
     inc/nmmailboxlistviewitem.h \
@@ -101,7 +83,10 @@
     inc/nmutilities.h \
     inc/nmattachmentlist.h \
     inc/nmeditortextdocument.h \
-    inc/nmattachmentpicker.h
+    inc/nmattachmentmanager.h \
+    inc/nmattachmentpicker.h \
+    inc/nmattachmentfetchobserver.h \
+    inc/nmuieffects.h
 
 SOURCES += src/nmeditorcontent.cpp \
     src/nmeditorheader.cpp \
@@ -111,6 +96,7 @@
     src/nmviewerviewnetmanager.cpp \
     src/nmviewerviewnetreply.cpp \
     src/nmmessagelistview.cpp \
+    src/nmmessagesearchlistview.cpp \
     src/nmmailboxlistview.cpp \
     src/nmeditorview.cpp \
     src/nmbaseview.cpp \
@@ -128,7 +114,9 @@
     src/nmutilities.cpp \
     src/nmattachmentlist.cpp \
     src/nmeditortextdocument.cpp \
-    src/nmattachmentpicker.cpp    
+    src/nmattachmentmanager.cpp \
+    src/nmattachmentpicker.cpp \
+    src/nmuieffects.cpp    
 
 RESOURCES += nmailui.qrc
 RESOURCES += nmmessagelistviewitem.qrc