diff -r 64e38f08e49c -r 47d84de1c893 emailservices/nmclientapi/nmclientapi.pro
--- a/emailservices/nmclientapi/nmclientapi.pro	Fri Sep 17 08:27:21 2010 +0300
+++ b/emailservices/nmclientapi/nmclientapi.pro	Mon Oct 04 00:05:37 2010 +0300
@@ -31,7 +31,7 @@
                 
 DEPENDPATH +=  ../../email_plat/nmail_client_api \
                 ../../email_plat/nmail_settings_api \
-
+                $$APP_LAYER_SYSTEMINCLUDE 
 
 MOC_DIR = tmp
 
@@ -51,7 +51,12 @@
            nmapimessagetask.h \
            nmapimessagemanager.h \
            nmapisettingsmanager.h \
-           nmapimailboxsettings.h
+           nmapimailboxsettings.h \
+           nmapimessagesearch.h \
+           nmapimessage.h \
+           nmapimessagecontent.h \
+           nmapitextcontent.h \
+           nmapiattachment.h
 
 # private headers 
 HEADERS += inc/nmapidatapluginfactory.h \
@@ -68,12 +73,16 @@
            inc/nmapimessagebody_p.h \
            inc/nmapimessageenvelope_p.h \
            inc/nmapimessagemanager_p.h \
-	   inc/nmapisettingsmanager_p.h \
+	       inc/nmapisettingsmanager_p.h \
            inc/nmapipopimapsettingsmanager.h \
            inc/nmapiprivateclasses.h \
            inc/nmapitypesconverter.h \
-           inc/nmapiheaders.h 
-                        
+           inc/nmapiheaders.h \
+           inc/nmapimessagesearch_p.h \
+           inc/nmapimessage_p.h \
+           inc/nmapimessagecontent_p.h \
+           inc/nmapitextcontent_p.h \
+           inc/nmapiattachment_p.h
 SOURCES += src/nmapidatapluginfactory.cpp \
            src/nmapiemailaddress.cpp \
            src/nmapiemailservice.cpp \
@@ -96,11 +105,21 @@
            src/nmapimessagebody.cpp \
            src/nmapimessageenvelope.cpp \
            src/nmapipopimapsettingsmanager.cpp \
-	         src/nmapimessagemanager_p.cpp \
-			     src/nmapimessagemanager.cpp \
-	   src/nmapisettingsmanager_p.cpp \
-	   src/nmapisettingsmanager.cpp \
-           src/nmapitypesconverter.cpp 
+           src/nmapimessagemanager_p.cpp \
+           src/nmapimessagemanager.cpp \
+           src/nmapisettingsmanager_p.cpp \
+           src/nmapisettingsmanager.cpp \
+           src/nmapitypesconverter.cpp \
+           src/nmapimessagesearch.cpp \
+           src/nmapimessagesearch_p.cpp \
+           src/nmapimessage.cpp \
+           src/nmapimessage_p.cpp \
+           src/nmapimessagecontent.cpp \
+           src/nmapimessagecontent_p.cpp \
+           src/nmapitextcontent.cpp \
+           src/nmapitextcontent_p.cpp \
+           src/nmapiattachment.cpp \
+           src/nmapiattachment_p.cpp
 
 
 
@@ -108,27 +127,35 @@
 symbian*: { 
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL \
-        -TCB
+        -TCB 
+    TARGET.CAPABILITY += CAP_ECOM_PLUGIN
+
     TARGET.UID2 = 0x1000008D
     TARGET.UID3 = 0x2002C366
     
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
-	
-	 LIBS += -lnmailbase \
-	 -limcm \
-	 -lxqsettingsmanager \
-	 -lxqutils \
-	 -lnmailuiengine
-				   
+    MMP_RULES += "SYSTEMINCLUDE /epoc32/include/ecom" 
+
+     LIBS += -lnmailbase \
+     -limcm \
+     -lxqsettingsmanager \
+     -lxqutils \
+     -lnmailuiengine \
+     -lFSFWCommonLib \
+     -lECom \
+     -lxqserviceutil \
+     -lefsrv 
+
     defBlock = \      
       "$${LITERAL_HASH}if defined(MARM)" \
       "DEFFILE  eabi/nmailclientapi.def" \
-	  "$${LITERAL_HASH}else" \
+      "$${LITERAL_HASH}else" \
       "DEFFILE  bwins/nmailclientapi.def" \
       "$${LITERAL_HASH}endif"
 
     MMP_RULES += defBlock
+    MMP_RULES += SMPSAFE
     
      BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
     "rom/nmailclientapi.iby CORE_APP_LAYER_IBY_EXPORT_PATH(nmailclientapi.iby)"