--- a/symbian4/mw/messagingmw/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/messagingmw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,45 +50,45 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
+   <block name="messagingmw" level="specific" levels="stack support fw api" long-name="Messaging Middleware">
 <collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
+<component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
 </component>
-<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
+<component name="always_online_client_api" long-name="Always Online Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
 </component>
-<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
+<component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
 </component>
-<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
+<component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
 </component>
 </collection>
 <collection name="messagingfw" long-name="Messaging Framework" level="fw">
 <!-- should break this collection up into smaller related collections -->
-<component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
+<component name="send_ui_api" long-name="Send UI API" deprecated="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
 </component>
-<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
+<component name="send_ui_plugin_api" long-name="Send UI Plug-in API" deprecated="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
 </component>
-<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
+<component name="send_ui_datautils_api" long-name="Send UI Data Utils API" deprecated="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
 </component>
-<component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
+<component name="alwaysonline" long-name="Always Online Server" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/group"/>
 </component>
-<component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
+<component name="msgcommonutils" long-name="Messaging Common Utils" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/msgcommonutils/group"/>
 </component>
-<component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
+<component name="senduiservices" long-name="Send UI Services" introduced="^2" deprecated="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
 </component>
-<component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
+<component name="muiuutils" long-name="Messaging Center UI Utilities" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/messagingmw/messagingfw/muiuutils/group"/>
 </component>
 <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">