--- a/qtmobility/src/messaging/messaging.pro	Wed Jun 23 19:08:38 2010 +0300
+++ b/qtmobility/src/messaging/messaging.pro	Tue Jul 06 15:12:50 2010 +0300
@@ -138,11 +138,9 @@
     }
     symbian { 
         INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-	exists($${EPOCROOT}epoc32\include\platform\app\emailinterfacefactory.h) {
+	contains(messaging_freestyle_enabled, yes) {
    	CONFIG += FREESTYLEMAIL
 	DEFINES += FREESTYLEMAILUSED
-	}
-	exists($${EPOCROOT}epoc32\include\platform\app\mmailboxcontentobserver.h) {
 	DEFINES += FREESTYLEMAILBOXOBSERVERUSED
 	}
         HEADERS -= qmessagestore_p.h \