--- a/messagingapp/msgui/unifiededitor/unifiededitor.pro	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgui/unifiededitor/unifiededitor.pro	Mon May 03 12:29:07 2010 +0300
@@ -24,8 +24,8 @@
 INCLUDEPATH += . inc
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../msguiutils/inc
-INCLUDEPATH += ../../msgutils/unieditorutils/inc
-INCLUDEPATH += ../../msgutils/unidatamodelloader/inc
+INCLUDEPATH += ../../msgutils/unieditorutils/editorgenutils/inc
+INCLUDEPATH += ../../msgutils/unidatautils/unidatamodelloader/inc
 INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
@@ -44,7 +44,6 @@
 
 # Input
 HEADERS += msgmonitor.h \
-    msgtypenotifier.h \
     msgunieditoraddress.h \
     msgunieditorattachment.h \
     msgunieditorbody.h \
@@ -52,13 +51,12 @@
     msgunieditorview.h \
     msgunifiededitorlineedit.h \
     msgattachmentcontainer.h \
-    mmsinsertcheckoperation.h \
     msgbaseview.h \
     msgunieditorimageprocessor.h \
-    msgunieditorprocessimageoperation.h 
+    msgunieditorprocessimageoperation.h
 
-SOURCES += msgmonitor.cpp \
-    msgtypenotifier.cpp \
+SOURCES += msgmonitor.inl \
+    msgmonitor.cpp \
     msgunieditoraddress.cpp \
     msgunieditorattachment.cpp \
     msgunieditorbody.cpp \
@@ -68,8 +66,7 @@
     msgattachmentcontainer.cpp \
     msgunieditorimageprocessor.inl \
     msgunieditorimageprocessor.cpp \
-    msgunieditorprocessimageoperation.cpp \
-    mmsinsertcheckoperation.cpp 
+    msgunieditorprocessimageoperation.cpp
 
 RESOURCES += unifiededitor.qrc
 
@@ -78,14 +75,22 @@
         -lconvergedmessageutils \
         -lmsguiutils \
         -lunieditorpluginloader \
-        -lunieditorutils \
+        -leditorgenutils \
         -lfbscli \
         -limageconversion \
         -lDRMHelper \
         -lbitmaptransforms \
+        -lQtVersit \
+        -lQtContacts \
+        -lxqutils \
+        -leuser \
         -lmsgmedia \
         -lapmime \
-        -lcentralrepository
+        -lcentralrepository \
+        -lxqservice \
+        -lgsmu \
+        -lsmcm \
+        -lxqserviceutil
 
 
         
\ No newline at end of file