diff -r 238255e8b033 -r 84d9eb65b26f messagingapp/msgsettings/settingsview/settingsview.pro
--- a/messagingapp/msgsettings/settingsview/settingsview.pro	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgsettings/settingsview/settingsview.pro	Mon May 03 12:29:07 2010 +0300
@@ -8,9 +8,9 @@
 
 DEPENDPATH += .
 INCLUDEPATH += .
-INCLUDEPATH += ../msgsettingsmw/inc
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../../msgui/inc
+INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 CONFIG += hb
@@ -19,27 +19,25 @@
 SYMBIAN_PLATFORMS = WINSCW \
                     ARMV5
     
-LIBS += -lmsgsettingsmw
-
 # Input
-SOURCES += 	src/msgadvancedsettingsform.cpp \
-					 	src/msgadvancedsettingsview.cpp \
-						src/msgsettingsdataformcustomitem.cpp \
-						src/msgsettingsform.cpp \
-						src/msgsettingsviewmanager.cpp \
-						src/msgsettingsview.cpp \
-						src/msgsmscentersettingsform.cpp \
-						src/msgsmscenterview.cpp
+SOURCES +=  src/msgsettingengine.cpp \
+            src/smssettingsprivate.cpp \
+            src/mmssettingsprivate.cpp \
+            src/msgsettingsdataformcustomitem.cpp \
+            src/msgsettingsform.cpp \
+	    src/msgsettingsview.cpp \
+	    src/msgsmscentersettingsform.cpp \
+	    src/msgsmscenterview.cpp
 			
-HEADERS += 	inc/msgadvancedsettingsform.h \
-					  inc/msgadvancedsettingsview.h\
-					  inc/msgsettingsdataformcustomitem.h\
-					  inc/msgsettingsform.h \
-					  inc/msgsettingsviewmanager.h \
-					  inc/msgsettingsview.h \
-						inc/msgsmscentersettingsform.h \
-						inc/msgsmscenterview.h \
-						../../msgui/inc/msgbaseview.h
+HEADERS +=  inc/msgsettingengine.h \
+            inc/smssettingsprivate.h \
+            inc/mmssettingprivate.h \
+            inc/msgsettingsdataformcustomitem.h\
+            inc/msgsettingsform.h \
+	    inc/msgsettingsview.h \
+	    inc/msgsmscentersettingsform.h \
+	    inc/msgsmscenterview.h \
+	    ../../msgui/inc/msgbaseview.h
 		   
 symbian: { 
     TARGET.EPOCALLOWDLLDATA = 1
@@ -52,3 +50,11 @@
     "stub_sis/settingsview_stub.sis   /epoc32/data/z/system/install/settingsview_stub.sis"
      
 TARGET.CAPABILITY = All -TCB
+
+LIBS += -lSmcm \
+    -lmsgs \	
+    -ls60qconversions \
+    -lcommdb \
+    -lmmsserversettings \
+    -lmmsgenericsettings
+    
\ No newline at end of file