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.46
diff -u -p -r1.70.2.30.2.91.2.64.2.46 privatemsg.module
--- privatemsg.module	20 Jan 2010 09:53:19 -0000	1.70.2.30.2.91.2.64.2.46
+++ privatemsg.module	20 Jan 2010 16:33:47 -0000
@@ -175,7 +175,7 @@ function privatemsg_menu() {
     'file'             => 'privatemsg.pages.inc',
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('write privatemsg'),
-    'type'             => MENU_LOCAL_TASK,
+    'type'             => MENU_LOCAL_ACTION,
     'weight'           => -3,
     'menu_name'        => 'user-menu',
   );
Index: privatemsg_filter/privatemsg_filter.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg_filter/privatemsg_filter.admin.inc,v
retrieving revision 1.1.4.3
diff -u -p -r1.1.4.3 privatemsg_filter.admin.inc
--- privatemsg_filter/privatemsg_filter.admin.inc	6 Jan 2010 19:29:22 -0000	1.1.4.3
+++ privatemsg_filter/privatemsg_filter.admin.inc	20 Jan 2010 16:33:55 -0000
@@ -45,8 +45,8 @@ function privatemsg_tags_admin() {
     $row['tag'] = check_plain($tag->tag);
     $row['count'] = $tag->count;
     $row['public'] = $tag->public ? t('Yes') : '-';
-    $row['operations'] = l(t('edit'), 'admin/config/people/messages/tags/edit/' . $tag->tag_id);
-    $row['operations'] .= ' ' . l(t('delete'), 'admin/config/people/messages/tags/delete/' . $tag->tag_id);
+    $row['operations'] = l(t('edit'), 'admin/config/messaging/privatemsg/tags/edit/' . $tag->tag_id);
+    $row['operations'] .= ' ' . l(t('delete'), 'admin/config/messaging/privatemsg/tags/delete/' . $tag->tag_id);
 
     $rows[] = $row;
   }
@@ -137,7 +137,6 @@ function privatemsg_tags_form_submit($fo
       ->condition('tag_id', $form_state['values']['tag_id'])
       ->execute();
     drupal_set_message(t('Tag updated.'));
-    $form_state['redirect'] = 'admin/config/people/messages/tags';
   }
   else {
     // Tag does not yet exist, create a new one.
@@ -149,6 +148,7 @@ function privatemsg_tags_form_submit($fo
       ->execute();
     drupal_set_message(t('Tag created.'));
   }
+  $form_state['redirect'] = 'admin/config/messaging/privatemsg/tags';
 }
 
 /**
@@ -163,7 +163,7 @@ function privatemsg_filter_tags_delete($
   );
   return confirm_form($form,
     t('Are you sure you want to delete?'),
-    isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/people/messages/tags',
+    isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/messaging/privatemsg/tags',
     t('This action cannot be undone.'),
     t('Delete'),
     t('Cancel')
@@ -184,7 +184,7 @@ function privatemsg_filter_tags_delete_s
 
     drupal_set_message(t('Tag has been deleted'));
   }
-  $form_state['redirect'] = 'admin/config/people/messages/tags';
+  $form_state['redirect'] = 'admin/config/messaging/privatemsg/tags';
 }
 
 function privatemsg_filter_admin() {
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.14
diff -u -p -r1.1.2.17.2.14 privatemsg_filter.module
--- privatemsg_filter/privatemsg_filter.module	20 Jan 2010 09:53:19 -0000	1.1.2.17.2.14
+++ privatemsg_filter/privatemsg_filter.module	20 Jan 2010 16:33:57 -0000
@@ -47,26 +47,17 @@ function privatemsg_filter_menu() {
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
   );
-  $items['admin/config/messaging/privatemsg/tags/list'] = array(
-    'title'            => 'List',
-    'description'      => 'Configure tags.',
-    'page callback'    => 'privatemsg_tags_admin',
-    'file'             => 'privatemsg_filter.admin.inc',
-    'access arguments' => array('administer privatemsg settings'),
-    'type'             => MENU_DEFAULT_LOCAL_TASK,
-    'weight'           => -10,
-  );
   $items['admin/config/messaging/privatemsg/tags/add'] = array(
-    'title'            => 'Add',
+    'title'            => 'Add tag',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_tags_form'),
     'file'             => 'privatemsg_filter.admin.inc',
     'access arguments' => array('administer privatemsg settings'),
-    'type'             => MENU_LOCAL_TASK,
+    'type'             => MENU_LOCAL_ACTION,
   );
   $items['admin/config/messaging/privatemsg/tags/edit/%'] = array(
-    'title'            => 'Add',
+    'title'            => 'Edit tag',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_tags_form', 6),
@@ -75,7 +66,7 @@ function privatemsg_filter_menu() {
     'type'             => MENU_CALLBACK,
   );
   $items['admin/config/messaging/privatemsg/tags/delete/%'] = array(
-    'title'            => 'Add',
+    'title'            => 'Delete tag',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_filter_tags_delete', 6),
Index: privatemsg_filter/privatemsg_filter.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg_filter/privatemsg_filter.test,v
retrieving revision 1.1.4.6
diff -u -p -r1.1.4.6 privatemsg_filter.test
--- privatemsg_filter/privatemsg_filter.test	26 Nov 2009 21:04:53 -0000	1.1.4.6
+++ privatemsg_filter/privatemsg_filter.test	20 Jan 2010 16:33:59 -0000
@@ -175,21 +175,21 @@ class PrivatemsgTagsTestCase extends Dru
     $this->drupalLogin($admin);
 
     // Check that the empty message is displayed.
-    $this->drupalGet('admin/config/people/messages/tags/list');
+    $this->drupalGet('admin/config/messaging/privatemsg/tags/list');
     $this->assertText(t('No tags available.'), t('No tags exist yet.'));
 
     // Create tags.
-    $this->drupalPost('admin/config/people/messages/tags/add', $private, t('Create tag'));
+    $this->drupalPost('admin/config/messaging/privatemsg/tags/add', $private, t('Create tag'));
     $this->assertText(t('Tag created.'));
-    $this->drupalPost('admin/config/people/messages/tags/add', $public, t('Create tag'));
+    $this->drupalPost('admin/config/messaging/privatemsg/tags/add', $public, t('Create tag'));
     $this->assertText(t('Tag created.'));
-    $this->drupalPost('admin/config/people/messages/tags/add', $to_edit, t('Create tag'));
+    $this->drupalPost('admin/config/messaging/privatemsg/tags/add', $to_edit, t('Create tag'));
     $this->assertText(t('Tag created.'));
-    $this->drupalPost('admin/config/people/messages/tags/add', $duplicate, t('Create tag'));
+    $this->drupalPost('admin/config/messaging/privatemsg/tags/add', $duplicate, t('Create tag'));
     $this->assertText(t('Tag already exists, choose a different name.'));
 
     // Verify that all tags are displayed.
-    $this->drupalGet('admin/config/people/messages/tags/list');
+    $this->drupalGet('admin/config/messaging/privatemsg/tags/list');
     foreach (array($private, $public, $to_edit) as $tag) {
       $this->assertText($tag['tag'], t('Tag %tag displayed', array('%tag' => $tag['tag'])));
     }