diff -urp privatemsg/privatemsg.module privatemsg1/privatemsg.module
--- privatemsg/privatemsg.module	2008-07-03 17:40:03.000000000 +0100
+++ privatemsg1/privatemsg.module	2008-07-21 21:09:14.533519700 +0100
@@ -21,14 +21,14 @@ function privatemsg_perm() {
  */
 function privatemsg_menu() {
   //later should be a user admin screen for his private messages
-  $items['messages/private'] = array(
+  $items['messages'] = array(
     'title' => t('Private messages'),
     'page callback' => 'privatemsg_hello',
     'access arguments' => array('read privatemsg'),
     'type' => MENU_NORMAL_ITEM,
   );
   //list all messages this user received
-  $items['messages/private/inbox'] = array(
+  $items['messages/inbox'] = array(
     'title' => t('Inbox'),
     'page callback' => 'privatemsg_list_inbox',
     'access arguments' => array('read privatemsg'),
@@ -36,7 +36,7 @@ function privatemsg_menu() {
     'weight'  => -10,
   );
   //list messages that this user is an author of
-  $items['messages/private/sent'] = array(
+  $items['messages/sent'] = array(
     'title' => t('Sent'),
     'page callback' => 'privatemsg_list',
     'access arguments' => array('read privatemsg'),
@@ -44,16 +44,16 @@ function privatemsg_menu() {
     'weight'  => -8,
   );
   //view a single message
-  $items['messages/private/view/%'] = array(
+  $items['messages/view/%'] = array(
     'title' => t('Read Private Message'),
     'page callback' => 'privatemsg_view',
-    'page arguments' => array(3),
+    'page arguments' => array(2),
     'access arguments' => array('read privatemsg'),
     'type' => MENU_CALLBACK,
     'weight' => -10,
   );
   //create a new message
-  $items['messages/private/new'] = array(
+  $items['messages/new'] = array(
     'title' => t('Write New'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('privatemsg_new'),
@@ -62,14 +62,14 @@ function privatemsg_menu() {
     'weight' => -10,
   );
   //auto completes available user names & removes duplicates
-  $items['messages/private/user-name-autocomplete'] = array(
+  $items['messages/user-name-autocomplete'] = array(
     'page callback' => 'privatemsg_user_name_autocomplete',
     'access arguments' => array('write privatemsg'),
     'type' => MENU_CALLBACK,
     'weight' => -10,
   );  
   //Admin pages
-  $items['admin/settings/messages/private'] = array(
+  $items['admin/settings/messages'] = array(
     'title'               => t('Private Messages'),
     'page callback'       => 'drupal_get_form',
     'page arguments'      => array('private_message_settings'),
@@ -197,7 +197,7 @@ function privatemsg_list_inbox() {
   
    $messages = array();
   while($row = db_fetch_array($result)) {
-    $row['subject'] = l($row['subject'], 'messages/private/view/'. $row['mid']);
+    $row['subject'] = l($row['subject'], 'messages/view/'. $row['mid']);
     $messages[] = $row;
   }
   
@@ -209,10 +209,10 @@ function privatemsg_list_inbox() {
       $head[] = array('data' => t($index), 'field' => $index, 'sort'=> 'desc');
     }
     $tablesort = tablesort_sql($head);
-    if ( arg(2) == 'inbox') {
+    if ( arg(1) == 'inbox') {
       $query = _privatemsg_assemble_query('privatemsg_list', $account);  
     }
-    else if( arg(2) == 'sent') {
+    else if( arg(1) == 'sent') {
       $query = _privatemsg_assemble_query('privatemsg_list_sent', $account);
     }
     $query .= $tablesort;
@@ -222,7 +222,7 @@ function privatemsg_list_inbox() {
 
     $messages = array();
     while($row = db_fetch_array($result)) {
-      $row['subject'] = l($row['subject'], 'messages/private/view/'. $row['id']);
+      $row['subject'] = l($row['subject'], 'messages/view/'. $row['id']);
       $row['author'] = theme('username', user_load($row['author']));
       $messages[] = $row;
     }
@@ -270,10 +270,10 @@ function privatemsg_list($uid = NULL) {
    */
   
 //  drupal_set_message('<pre>'. print_r($uid, 1) .'</pre>');
-  if ( arg(2) == 'inbox') {
+  if ( arg(1) == 'inbox') {
     $query = _privatemsg_assemble_query('privatemsg_list', $account);
   }
-  else if( arg(2) == 'sent') {
+  else if( arg(1) == 'sent') {
     $query = _privatemsg_assemble_query('privatemsg_list_sent', $account);
   }
   $result = db_query($query);
@@ -283,7 +283,7 @@ function privatemsg_list($uid = NULL) {
   
    $messages = array();
   while($row = db_fetch_array($result)) {
-    $row['subject'] = l($row['subject'], 'messages/private/view/'. $row['id']);
+    $row['subject'] = l($row['subject'], 'messages/view/'. $row['id']);
     $messages[] = $row;
   }
   
@@ -295,10 +295,10 @@ function privatemsg_list($uid = NULL) {
       $head[] = array('data' => t($index), 'field' => $index, 'sort'=> 'desc');
     }
     $tablesort = tablesort_sql($head);
-    if ( arg(2) == 'inbox') {
+    if ( arg(1) == 'inbox') {
       $query = _privatemsg_assemble_query('privatemsg_list', $account);  
     }
-    else if( arg(2) == 'sent') {
+    else if( arg(1) == 'sent') {
       $query = _privatemsg_assemble_query('privatemsg_list_sent', $account);
     }
     $query .= $tablesort;
@@ -308,7 +308,7 @@ function privatemsg_list($uid = NULL) {
 
     $messages = array();
     while($row = db_fetch_array($result)) {
-      $row['subject'] = l($row['subject'], 'messages/private/view/'. $row['id']);
+      $row['subject'] = l($row['subject'], 'messages/view/'. $row['id']);
       $row['author'] = theme('username', user_load($row['author']));
       $messages[] = $row;
     }
@@ -373,7 +373,7 @@ function privatemsg_new(&$form_state) {
     '#description'        => t('Separate multiple names with commas.'),
     '#default_value'      => $recipient,//populate this later
     '#size'               => 50,
-    '#autocomplete_path'  => 'messages/private/user-name-autocomplete',
+    '#autocomplete_path'  => 'messages/user-name-autocomplete',
     //do not hardcode #maxlength, make it configurable by number of recipients, not their name length
   );
   $form['header']['subject']    = array(
@@ -417,7 +417,7 @@ function privatemsg_new(&$form_state) {
   return $form;
 }
 function pm_cancel($form, &$form_state) {
-  $form_state['redirect'] = 'messages/private/new';
+  $form_state['redirect'] = 'messages/new';
 }
 
 function pm_send_validate($form, &$form_state) {
@@ -710,7 +710,7 @@ function privatemsg_user_name_autocomple
 }
 
 /**
- * Placeholder function for the messages/private menu space
+ * Placeholder function for the messages menu space
  */
 function privatemsg_hello() {
   $output = '';