--- privatemsg.module Tue Jun 10 02:20:45 2008
+++ privatemsg.module Wed Jul 02 16:54:22 2008
@@ -456,23 +456,23 @@
   $args[] = $message['author']->uid;
   $args[] = $message['subject'];
   $args[] = $message['body'];
-  $query = "INSERT INTO {pm_message} (message_id, author, subject, body) VALUES (null, %d, '%s', '%s')";
+  $query = "INSERT INTO {pm_message} (mid, author, subject, body) VALUES (null, %d, '%s', '%s')";
   $resuld = db_query($query, $args);
-  $message_id = db_last_insert_id('pm_message', 'message_id');
-  $message['message_id'] = $message_id;
+  $mid = db_last_insert_id('pm_message', 'mid');
+  $message['mid'] = $mid;

-  //thread ID is the same as the message_id if its the first message in the thread
+  //thread ID is the same as the mid if its the first message in the thread
   if (!isset($message['thread_id'])) {
-    $message['thread_id'] = $message_id;
+    $message['thread_id'] = $mid;
   }
   //2) save message to recipients
   //each repicient gets a recods in the pm_index table
-  $query = "INSERT INTO {pm_index} (message_id, thread_id, recipient, timestamp) VALUES (%d, %d, %d, %d)";
+  $query = "INSERT INTO {pm_index} (mid, thread_id, recipient, timestamp) VALUES (%d, %d, %d, %d)";
   foreach ($message['recipients'] as $recipient) {
-    $message_id = $message['message_id'];
+    $mid = $message['mid'];
     $thread_id  = $message['thread_id'];
     $timestamp = $message['timestamp'];
-    db_query($query, $message_id, $thread_id, $recipient->uid, $timestamp);
+    db_query($query, $mid, $thread_id, $recipient->uid, $timestamp);
   }

   drupal_set_message('Private message has been sent to '. $form_state['values']['recipient']);
@@ -557,11 +557,11 @@

   $fragments['primary_table'] = '{pm_message} pm';

-  $fragments['select'][] = 'pmi.message_id as id';
+  $fragments['select'][] = 'pmi.mid as id';
   $fragments['select'][] = 'pm.subject';
   $fragments['select'][] = 'pm.author';
   $fragments['select'][] = 'pmi.*';
-  $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON pm.message_id = pmi.message_id';
+  $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
   $fragments['where'][]  = 'pmi.recipient = %d';
   $fragments['query_args'][] = $account->uid;

@@ -602,8 +602,8 @@
   $fragments['select'][] = "pm.*";                    //fets all data from primary table
   $fragments['select'][] = "pmi.*";

-  $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON pm.message_id = pmi.message_id';
-  $fragments['where'][]  = 'pmi.message_id = %d';
+  $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
+  $fragments['where'][]  = 'pmi.mid = %d';
   $fragments['query_args'][]  = $pmid;
   $fragments['where'][]  = 'pmi.recipient = %d';
   $fragments['query_args'][]  = $uid;