diff -r 238255e8b033 -r 84d9eb65b26f messagingapp/msgui/msguiutils/msguiutils.pro
--- a/messagingapp/msgui/msguiutils/msguiutils.pro	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgui/msguiutils/msguiutils.pro	Mon May 03 12:29:07 2010 +0300
@@ -23,10 +23,11 @@
     src
 
 INCLUDEPATH += ../../../inc
-INCLUDEPATH += ../../msgutils/unieditorutils/inc
+INCLUDEPATH += ../../msgutils/unieditorutils/editorgenutils/inc
+INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-INCLUDEPATH += /ext/mw/qthighway/inc
 
+CONFIG += hb
 
 TARGET.UID3 = 0x2001FE69
 
@@ -44,23 +45,24 @@
 
 # Input
 HEADERS += msgsendutil.h \
-           msgimagefetcherutil.h \
-           msgaudiofetcherutil.h \
-           msgcontactsutil.h \
-           msguiutilsmanager.h \
-           matchphnumberutil.h
+           mmsconformancecheck.h \
+           msgmediautil.h
            
 SOURCES += msgsendutil.cpp \
-           msgimagefetcherutil.cpp \
-           msgaudiofetcherutil.cpp \
-           msgcontactsutil.cpp \
-           msguiutilsmanager.cpp \
-           matchphnumberutil.cpp
+           mmsconformancecheck.cpp \
+           msgmediautil.cpp
     
 # Libs
 LIBS += -lxqservice \
-    -lQtContacts \
     -lunieditorpluginloader \
-    -lunieditorutils \
+    -leditorgenutils \
     -lconvergedmessageutils \
-    -lcentralrepository
+    -lcentralrepository \
+    -ls60qconversions \
+    -lDRMHelper \
+    -lmsgmedia \
+    -lapmime \
+    -lunidatamodelloader \
+    -lxqutils
+
+