--- a/messagingapp/msgui/unifiededitor/unifiededitor.pro	Fri Jun 11 13:35:48 2010 +0300
+++ b/messagingapp/msgui/unifiededitor/unifiededitor.pro	Wed Jun 23 18:09:17 2010 +0300
@@ -26,7 +26,6 @@
 INCLUDEPATH += ../msguiutils/inc
 INCLUDEPATH += ../../msgutils/unieditorutils/editorgenutils/inc
 INCLUDEPATH += ../../msgutils/unidatautils/unidatamodelloader/inc
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += ../../msgsettings/settingsview/inc
 
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
@@ -45,6 +44,15 @@
 BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
     "rom/unifiededitor.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unifiededitor.iby)"
 
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/unifiededitor.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/unifiededitor.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
+
 # Input
 HEADERS += msgunieditormonitor.h \
     msgunieditoraddress.h \
@@ -81,8 +89,7 @@
 RESOURCES += unifiededitor.qrc
 
 # Libs
-LIBS += -ls60qconversions \
-        -lconvergedmessageutils \
+LIBS += -lconvergedmessageutils \
         -lmsguiutils \
         -lunieditorpluginloader \
         -leditorgenutils \
@@ -101,7 +108,7 @@
         -lgsmu \
         -lsmcm \
         -lxqserviceutil \
-        -lcommonengine
-
+        -lcommonengine \
+        -lefsrv
 
         
\ No newline at end of file