diff -r a32b19fb291e -r 5b14749788d7 messagingapp/msgui/msguiutils/msguiutils.pro
--- a/messagingapp/msgui/msguiutils/msguiutils.pro	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgui/msguiutils/msguiutils.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -24,7 +24,6 @@
 
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../../msgutils/unieditorutils/editorgenutils/inc
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 CONFIG += hb
@@ -43,14 +42,26 @@
 BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
     "rom/msguiutils.iby CORE_APP_LAYER_IBY_EXPORT_PATH(msguiutils.iby)"
 
+
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/msguiutils.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/msguiutils.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
+
 # Input
 HEADERS += msgsendutil.h \
            mmsconformancecheck.h \
-           msgmediautil.h
+           msgmediautil.h \
+           msgcontactsutil.h
            
 SOURCES += msgsendutil.cpp \
            mmsconformancecheck.cpp \
-           msgmediautil.cpp
+           msgmediautil.cpp \
+           msgcontactsutil.cpp
     
 # Libs
 LIBS += -lxqservice \
@@ -58,11 +69,11 @@
     -leditorgenutils \
     -lconvergedmessageutils \
     -lcentralrepository \
-    -ls60qconversions \
     -lDRMHelper \
     -lmsgmedia \
     -lapmime \
     -lunidatamodelloader \
-    -lxqutils
+    -lxqutils \
+    -lefsrv
+    
 
-