diff -r f28a2588e622 -r 0d49d14a3f5e 3k/app/messaging/package_definition.xml
--- a/3k/app/messaging/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/messaging/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -27,12 +27,12 @@
      </component>
      <component name="smsui" long-name="SMS UI" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/group"/>
-      <!-- <unit bldFile="app/messaging/mobilemessaging/smsui/viewer"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/viewer"/> -->
      </component>
      <!--Component manually removed as already declared in OS-->
      <!--<component name="smsmtm">
-       <unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/group"/>
-       -  <unit bldFile="app/messaging/mobilemessaging/smsmtm/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/multimode/group"/>
+       -  <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/test/testrom"/>  -
      </component>-->
     <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
@@ -40,44 +40,44 @@
     </collection>
     <collection name="mmsengine" long-name="MMS Engine" level="eng">
      <component name="mmsconninit" long-name="MMS Connection Init" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsconninit/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsconninit/bld"/> -->
      </component>
      <component name="genutils" long-name="General Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/genutils/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/genutils/bld"/> -->
      </component>
      <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsserversettings/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsserversettings/bld"/> -->
      </component>
      <component name="mmsmessage" long-name="MMS Message" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsmessage/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsmessage/bld"/> -->
      </component>
      <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmshttptransport/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmshttptransport/bld"/> -->
      </component>
      <component name="mmscodec" long-name="MMS Codec" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmscodec/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmscodec/bld"/> -->
      </component>
      <component name="mmsserver" long-name="MMS Server" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsserver/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsserver/bld"/> -->
      </component>
      <component name="clientmtm" long-name="Client MTM" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/clientmtm/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/clientmtm/bld"/> -->
      </component>
      <component name="mmswatcher" long-name="MMS Watcher" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmswatcher/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmswatcher/bld"/> -->
      </component>
      <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmspushhandler/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmspushhandler/bld"/> -->
      </component>
      <component name="applicationadapter" long-name="Application Adapter" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/applicationadapter/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/applicationadapter/bld"/> -->
      </component>
      <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmscodecclient/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmscodecclient/bld"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="mmssettings">
-       <unit bldFile="app/messaging/mmsengine/mmssettings/test/group"/>
+       <unit bldFile="/sf/app/messaging/mmsengine/mmssettings/test/group"/>
      </component>-->
      <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mmsengine/group"/>
@@ -112,10 +112,10 @@
       <unit bldFile="/sf/app/messaging/messagingappbase/schemeplugin/group"/>
      </component>
      <component name="sendui" long-name="Send UI" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
       <unit bldFile="/sf/app/messaging/messagingappbase/sendui/group"/>
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
      </component>
      <component name="smilengine" long-name="SMIL Engine" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/smilengine/group"/>
@@ -131,25 +131,25 @@
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="smilparser">
-       <unit bldFile="app/messaging/messagingappbase/smilparser/rom"/>
-       <unit bldFile="app/messaging/messagingappbase/smilparser/smildtd/group"/>
-       <unit bldFile="app/messaging/messagingappbase/smilparser/xmldom/group"/>
-       <unit bldFile="app/messaging/messagingappbase/smilparser/xmlparser/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/rom"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/smildtd/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/xmldom/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/xmlparser/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="obexmtms">
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/rom"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
-       -  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/>  -
-       -  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/>  -
-       -  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/>  -
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/rom"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
+       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/>  -
+       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/>  -
+       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/>  -
      </component>-->
     <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
@@ -166,37 +166,37 @@
       <unit bldFile="/sf/app/messaging/email/emailnotificationhandler/group"/>
      </component>
      <component name="imum" long-name="IMUM" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/email/imum/domainapi/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/email/imum/domainapi/group"/> -->
       <unit bldFile="/sf/app/messaging/email/imum/group"/>
-      <!-- <unit bldFile="app/messaging/email/imum/mtms/group"/> -->
-      <!-- <unit bldFile="app/messaging/email/imum/utils/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/email/imum/mtms/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/email/imum/utils/group"/> -->
      </component>
      <component name="mail" long-name="Mail" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/email/mail/group"/>
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="pop3andsmtpmtm">
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/autosend/group"/>
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/>  -
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/>  -
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/>  -
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/autosend/group"/>
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/>  -
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="imap4mtm">
-       <unit bldFile="app/messaging/email/imap4mtm/imapmailstore/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapservermtm/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapsession/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapsettings/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapsyncmanager/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imaptransporthandler/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imaputils/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapmailstore/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapservermtm/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsession/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsettings/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsyncmanager/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imaptransporthandler/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imaputils/group"/>
      </component>-->
     <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
@@ -207,10 +207,10 @@
     </collection>
     <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
      <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="msg_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_plat/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
@@ -219,15 +219,15 @@
       <unit bldFile="/sf/app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
-      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="msg_pub" class="api" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/msg_pub/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="foundation">