--- a/messagingapp/msgui/conversationview/conversationview.pro	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgui/conversationview/conversationview.pro	Fri Jun 25 15:47:40 2010 +0530
@@ -21,21 +21,21 @@
               inc \
               ../inc \ 
               src
-    					
+
 INCLUDEPATH += .
 INCLUDEPATH += ../../../inc
+INCLUDEPATH += ../msgaudiofetcher/inc
 INCLUDEPATH += ../msguiutils/inc
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += ../../msgutils/unieditorutils/editorgenutils/inc
 INCLUDEPATH += ../appengine/inc
 INCLUDEPATH += ../../smartmessaging/ringbc/inc
+INCLUDEPATH += ../../msgsettings/settingsview/inc
+INCLUDEPATH += ../../msgutils/unidatamodel/univcaldataplugin/inc
 
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-INCLUDEPATH += /ext/mw/qthighway/inc
-INCLUDEPATH += /ext/mw/qtextensions/qtmobileextensions/include
-INCLUDEPATH += ../../msgutils/unidatamodel/univcaldataplugin/inc
 
 CONFIG += hb
+HB += hbfeedback
 QT += sql
 
 TARGET.UID3 = 0x20024322
@@ -54,8 +54,6 @@
 HEADERS += inc/msgconversationview.h \
     inc/msgconversationviewitem.h \
     inc/msgconversationwidget.h \
-    inc/msgcharcounter_p.h \
-    inc/msgcharcounter.h \
     inc/msgviewutils.h \
     ../../../inc/msgconversationviewdefines.h \
     inc/msgcontactcardwidget.h \
@@ -67,8 +65,6 @@
 SOURCES += src/msgconversationview.cpp \
     src/msgconversationviewitem.cpp \
     src/msgconversationwidget.cpp \
-    src/msgcharcounter_p.cpp \
-    src/msgcharcounter.cpp \
     src/msgviewutils.cpp \
     src/msgcontactcardwidget.cpp \
     src/msgeditorwidget.cpp \
@@ -76,10 +72,17 @@
     
 RESOURCES += conversationview.qrc
 
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/conversationview.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/conversationview.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
 
 # Libs
 LIBS += -lappengine \
-    -ls60qconversions \
     -lconvergedmessageutils \
     -lapgrfx \
     -lefsrv \
@@ -97,5 +100,9 @@
     -lunieditorpluginloader \
     -lgsmu \
     -lsmcm \
-    -leditorgenutils
+    -leditorgenutils \
+    -lthumbnailmanagerqt \    
+    -lxqsettingsmanager \
+    -lxqutils \
+    -lmsgaudiofetcher