467c467
<     $result = pager_query('SELECT id, subject, p.timestamp, u.uid, u.name, newmsg FROM {privatemsg} p, {users} u WHERE p.author = u.uid AND p.recipient = %d AND folder = %d AND p.recipient_del = 0 ORDER BY p.timestamp DESC', variable_get('privatemsg_per_page', 10), 0, NULL, $user->uid, $current_folder);
---
>     $result = pager_query('SELECT id, subject, p.timestamp, u.uid, u.name, newmsg, replied FROM {privatemsg} p, {users} u WHERE p.author = u.uid AND p.recipient = %d AND folder = %d AND p.recipient_del = 0 ORDER BY p.timestamp DESC', variable_get('privatemsg_per_page', 10), 0, NULL, $user->uid, $current_folder);
478c478
<     $result = pager_query('SELECT id, subject, p.timestamp, u.uid, u.name, newmsg FROM {privatemsg} p, {users} u WHERE p.recipient = u.uid AND p.author = %d AND p.author_del = 0 ORDER BY p.timestamp DESC', variable_get('privatemsg_per_page', 10), 0, NULL, $user->uid);
---
>     $result = pager_query('SELECT id, subject, p.timestamp, u.uid, u.name, newmsg, replied FROM {privatemsg} p, {users} u WHERE p.recipient = u.uid AND p.author = %d AND p.author_del = 0 ORDER BY p.timestamp DESC', variable_get('privatemsg_per_page', 10), 0, NULL, $user->uid);
568c568,573
<     $message = db_fetch_object(db_query('SELECT subject, message, u.name AS recipient FROM {privatemsg} p, {users} u WHERE u.uid = p.author AND id = %d AND recipient = %d', $message, $user->uid));
---
>     $message = db_fetch_object(db_query('SELECT subject, message, u.name AS recipient, id FROM {privatemsg} p, {users} u WHERE u.uid = p.author AND id = %d AND recipient = %d', $message, $user->uid));
> 
>     // update the db to show that the message has been replied-to
>     if ($message->id > 0) {
>     	$result = db_query('UPDATE {privatemsg} SET replied = 1 WHERE id = %d', $message->id);
>     }
889a895,903
> // toggle the message status
>     if ($message->replied > 0) {
> 	$status = t('Replied');
>     } elseif ($new) {
> 	$status = theme('mark');
>     } else {
> 	$status = "";
>     }
> 
893a908,911
>     $form['messages'][$message->id]['replied'] = array(
>         '#type' => 'value',
>         '#value' => $status
>         );
901a920
> 
904c923,924
<         '#value' => l($message->subject, 'privatemsg/view/'. $message->id) . ($new ? (' '. theme('mark')) : '')
---
>         //'#value' => l($message->subject, 'privatemsg/view/'. $message->id) . ($new ? (' '. theme('mark')) : '')
>         '#value' => l($message->subject, 'privatemsg/view/'. $message->id)
968a989
>       $row[] = $form[$key]['replied']['#value'];
981a1003
>       t('Status'),