diff -urp privatemsg/privatemsg.module privatemsg_thread/privatemsg.module
--- privatemsg/privatemsg.module	2008-08-26 17:09:16.000000000 +0100
+++ privatemsg_thread/privatemsg.module	2008-08-31 23:55:01.633800000 +0100
@@ -261,15 +261,12 @@ function privatemsg_list($uid = NULL) {
     foreach ($row as $index => $value) {
       $head[] = array('data' => t($index), 'field' => $index, 'sort'=> 'desc');
     }
-    $tablesort = tablesort_sql($head);
     if ( arg(1) == 'inbox') {
       $query = _privatemsg_assemble_query('privatemsg_list', $account);  
     }
     else if( arg(1) == 'sent') {
       $query = _privatemsg_assemble_query('privatemsg_list_sent', $account);
     }
-    $query .= $tablesort;
-//      drupal_set_message('<pre>'. print_r($query, 1) .'</pre>');
 
     $result = db_query($query);
 
@@ -360,19 +357,30 @@ function privatemsg_set_new_status($acco
 
 function privatemsg_view($pmid) {
   global $user;
+  $output = '';
   //loads the message object
-  $message = _privatemsg_load($pmid, $user->uid);
-  privatemsg_set_new_status($user, $pmid);
-  //loads the list of recipients
-  $query = _privatemsg_assemble_query('privatemsg_recipients', $message['thread_id']);
-  $result = db_query($query);
-  while ($row = db_fetch_object($result)) {
-    $message['recipients'][] = user_load($row->uid);
+  $conversation = db_query('SELECT DISTINCT(pmi.mid) FROM {pm_index} pmi, {pm_index} pmi1 WHERE pmi.thread_id = pmi1.thread_id AND pmi1.mid = %d ORDER BY pmi.mid ASC', $pmid);
+  $message_count = 0;
+  while ($result = db_fetch_array($conversation)) {
+    $pmid = $result['mid'];
+    $message = _privatemsg_load($pmid, $user->uid);
+    privatemsg_set_new_status($user, $pmid);
+    //loads the list of recipients
+    $query = _privatemsg_assemble_query('privatemsg_recipients', $message['thread_id']);
+    $result = db_query($query);
+    //while ($row = db_fetch_object($result)) {
+    //  $message['recipients'][] = user_load($row->uid); 
+    //}
+    if ($message_count == 0) {
+    $subject = $message['subject'];
+    drupal_set_title($subject);
+    }
+    
+    $message['author'] = user_load($message['author']);
+    $output .= theme('privatemsg_view', $message);
+    $message_count++;
   }
   
-  $message['author'] = user_load($message['author']);
-//  $message['recipient'] = user_load($message['recipient']);
-//  $output =  '<pre>'. print_r($message, 1) .'</pre>';
   $output = theme('privatemsg_to', $message);
   return $output . theme('privatemsg_view', $message);
 }
@@ -481,6 +489,10 @@ function pm_send_validate($form, &$form_
   $message['subject'] = $form_values['subject'];
   $message['author']  = $user;
   $message['timestamp'] = time();
+  if (isset($form_values['thread_id']) && $form_values['thread_id']) {
+    $message['thread_id'] = $form_values['thread_id'];
+  }
+
   
   
 //  drupal_set_message('<pre>'. print_r('one', 1) .' </pre>');  
@@ -582,7 +594,6 @@ function pm_send($form, &$form_state) {
   }
   
   drupal_set_message('A private message has been sent to '. $form_state['values']['recipient']);
-  $form_state['rebuild'] = true;      //rebuild this message for ease of use
 }
 
 function privatemsg_render_preview($message) {
@@ -625,12 +636,14 @@ function pm_preview($form, &$form_state)
 function privatemsg_privatemsg_list_sent_alter(&$fragments, $account) {
   $fragments['primary_table'] = '{pm_message} pm';
   
-  $fragments['select'][] = 'pm.mid as id';
+  $fragments['select'][] = 'MAX(pmi.mid) as id';
   $fragments['select'][] = 'pm.subject';
   $fragments['select'][] = 'pmi.author';
   
   $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
   $fragments['where'][] = 'pmi.author = %d';
+  $fragments['group_by'][]  = 'pmi.thread_id';
+  $fragments['order_by'][]  = 'MAX(pmi.mid) DESC';
   $fragments['query_args'][] = $account->uid;
 //  $fragments['group_by'][] = 'pmi.mid';
 }
@@ -640,12 +653,14 @@ function privatemsg_privatemsg_list_alte
   
   $fragments['primary_table'] = '{pm_message} pm';
   
-  $fragments['select'][] = 'pmi.mid as id';
+  $fragments['select'][] = 'MAX(pmi.mid) as id';
   $fragments['select'][] = 'pm.subject';
   $fragments['select'][] = 'pmi.author';
   $fragments['select'][] = 'pmi.*';
   $fragments['inner_join'][] = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
   $fragments['where'][]  = 'pmi.recipient = %d';
+  $fragments['group_by'][]  = 'pmi.thread_id';
+  $fragments['order_by'][]  = 'pmi.new DESC, MAX(pmi.mid) DESC';
   $fragments['query_args'][] = $account->uid;
 
   /*