--- a/symbian3/mw/messagingmw/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/messagingmw/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,28 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
+        <collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
+          <component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+          </component>
+        </collection>
+        <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">
+            <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">
+            <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">
+            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+          </component>
+          <component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+          </component>
+          <component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+          </component>
+        </collection>
         <collection name="msgbranched" long-name="Messaging Branched" level="fw">
           <!-- collection is really a component. Need to move down a directory -->
           <component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build">
@@ -138,12 +160,6 @@
           </component>
         </collection>
         <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-          <component name="msgfw_plat" filter="s60" long-name="Messaging Middleware Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/group"/>
-          </component>
-          <component name="msgfw_pub" filter="s60" long-name="Messaging Middleware Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_pub/group"/>
-          </component>
           <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
           </component>