--- a/src/messaging/messaging.pro	Fri Sep 17 08:34:34 2010 +0300
+++ b/src/messaging/messaging.pro	Mon Oct 04 01:37:06 2010 +0300
@@ -146,6 +146,10 @@
 	contains(messaging_ncnlist_enabled, no) {
 	DEFINES += NCNLISTREMOVED
 	}
+	contains(messaging_qthighway_enabled, yes) {
+    CONFIG += QTHIGHWAY
+    DEFINES += QTHIGHWAYUSED
+    }
         HEADERS -= qmessagestore_p.h \
             qmessagecontentcontainer_p.h \
             qmessage_p.h
@@ -182,6 +186,10 @@
         contains(CONFIG, FREESTYLEMAIL) {
 	    SOURCES += qfsengine_symbian.cpp
 	}
+    contains(CONFIG, QTHIGHWAY) {
+        LIBS += -lxqservice \
+                -lxqserviceutil \
+    }
     LIBS += -lsendas2 \
             -lmsgs \
             -letext \
@@ -198,7 +206,7 @@
             -lcone \
             -lapgrfx \
             -lapmime \
-            -lecom
+            -lecom 
         TARGET.CAPABILITY = ALL \
             -TCB
         TARGET.UID3 = 0x2002AC82