Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.70.2.30.2.91.2.64.2.44
diff -u -p -r1.70.2.30.2.91.2.64.2.44 privatemsg.module
--- privatemsg.module	7 Jan 2010 21:16:00 -0000	1.70.2.30.2.91.2.64.2.44
+++ privatemsg.module	18 Jan 2010 23:49:17 -0000
@@ -187,7 +187,15 @@ function privatemsg_menu() {
     'access arguments' => array('write privatemsg'),
     'type'             => MENU_CALLBACK,
   );
-  $items['admin/config/people/messages'] = array(
+  $items['admin/config/messaging'] = array(
+    'title' => 'Messaging',
+    'description' => 'Messaging systems.',
+    'page callback' => 'system_admin_menu_block_page',
+    'access arguments' => array('access administration pages'),
+    'file' => 'system.admin.inc',
+    'file path' => drupal_get_path('module', 'system'),
+  );
+  $items['admin/config/messaging/privatemsg'] = array(
     'title'            => 'Private messages',
     'description'      => 'Configure private messaging settings.',
     'page callback'    => 'drupal_get_form',
@@ -196,7 +204,7 @@ function privatemsg_menu() {
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_NORMAL_ITEM,
   );
-  $items['admin/config/people/messages/default'] = array(
+  $items['admin/config/messaging/privatemsg/default'] = array(
     'title'            => 'Private messages',
     'description'      => 'Configure private messaging settings.',
     'page callback'    => 'drupal_get_form',
Index: pm_block_user/pm_block_user.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/pm_block_user/pm_block_user.module,v
retrieving revision 1.1.2.8.2.9
diff -u -p -r1.1.2.8.2.9 pm_block_user.module
--- pm_block_user/pm_block_user.module	6 Jan 2010 19:29:22 -0000	1.1.2.8.2.9
+++ pm_block_user/pm_block_user.module	18 Jan 2010 23:49:17 -0000
@@ -41,7 +41,7 @@ function pm_block_user_menu() {
     'weight'           => -10,
   );
 
-  $items['admin/config/people/messages/block'] = array(
+  $items['admin/config/messaging/privatemsg/block'] = array(
     'title'            => 'User blocking rules',
     'description'      => 'Configure rules for which users may block each other.',
     'page callback'    => 'drupal_get_form',
Index: pm_email_notify/pm_email_notify.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/pm_email_notify/pm_email_notify.module,v
retrieving revision 1.1.2.3.2.7
diff -u -p -r1.1.2.3.2.7 pm_email_notify.module
--- pm_email_notify/pm_email_notify.module	6 Jan 2010 19:29:22 -0000	1.1.2.3.2.7
+++ pm_email_notify/pm_email_notify.module	18 Jan 2010 23:49:18 -0000
@@ -10,7 +10,7 @@
  * Implementation of hook_menu().
  */
 function pm_email_notify_menu() {
-  $items['admin/config/people/messages/notify'] = array(
+  $items['admin/config/messaging/privatemsg/notify'] = array(
     'title'            => 'E-mail notify',
     'description'      => 'E-mail notification settings',
     'page callback'    => 'drupal_get_form',
Index: privatemsg_filter/privatemsg_filter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg_filter/privatemsg_filter.module,v
retrieving revision 1.1.2.17.2.13
diff -u -p -r1.1.2.17.2.13 privatemsg_filter.module
--- privatemsg_filter/privatemsg_filter.module	6 Jan 2010 19:29:22 -0000	1.1.2.17.2.13
+++ privatemsg_filter/privatemsg_filter.module	18 Jan 2010 23:49:20 -0000
@@ -30,7 +30,7 @@ function privatemsg_filter_permission() 
  * Implementation of hook_menu().
  */
 function privatemsg_filter_menu() {
-  $items['admin/config/people/messages/filter'] = array(
+  $items['admin/config/messaging/privatemsg/filter'] = array(
     'title'            => 'Filter',
     'description'      => 'Configure filter settings.',
     'page callback'    => 'drupal_get_form',
@@ -39,7 +39,7 @@ function privatemsg_filter_menu() {
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
   );
-  $items['admin/config/people/messages/tags'] = array(
+  $items['admin/config/messaging/privatemsg/tags'] = array(
     'title'            => 'Tags',
     'description'      => 'Configure tags.',
     'page callback'    => 'privatemsg_tags_admin',
@@ -47,7 +47,7 @@ function privatemsg_filter_menu() {
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
   );
-  $items['admin/config/people/messages/tags/list'] = array(
+  $items['admin/config/messaging/privatemsg/tags/list'] = array(
     'title'            => 'List',
     'description'      => 'Configure tags.',
     'page callback'    => 'privatemsg_tags_admin',
@@ -56,7 +56,7 @@ function privatemsg_filter_menu() {
     'type'             => MENU_DEFAULT_LOCAL_TASK,
     'weight'           => -10,
   );
-  $items['admin/config/people/messages/tags/add'] = array(
+  $items['admin/config/messaging/privatemsg/tags/add'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -65,7 +65,7 @@ function privatemsg_filter_menu() {
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
   );
-  $items['admin/config/people/messages/tags/edit/%'] = array(
+  $items['admin/config/messaging/privatemsg/tags/edit/%'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -74,7 +74,7 @@ function privatemsg_filter_menu() {
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_CALLBACK,
   );
-  $items['admin/config/people/messages/tags/delete/%'] = array(
+  $items['admin/config/messaging/privatemsg/tags/delete/%'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',