Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.70.2.30.2.91.2.35
diff -u -p -r1.70.2.30.2.91.2.35 privatemsg.module
--- privatemsg.module	17 Apr 2009 18:12:54 -0000	1.70.2.30.2.91.2.35
+++ privatemsg.module	20 Apr 2009 20:37:01 -0000
@@ -312,7 +312,7 @@ function private_message_settings() {
     '#options' => array(
       'participants'    => t('Participants'),
       'thread_started'  => t('Started'),
-      'count'           => t('Answers'),
+      'count'           => t('Messages'),
     ),
     '#default_value' => variable_get('privatemsg_display_fields', array('participants')),
   );
@@ -750,7 +750,7 @@ function privatemsg_sql_list(&$fragments
   $fragments['select'][]      = 'pmi.thread_id';
   $fragments['select'][]      = 'MIN(pm.subject) as subject';
   $fragments['select'][]      = 'MAX(pm.timestamp) as last_updated';
-  $fragments['select'][]      = 'MAX(pmi.is_new) as is_new';
+  $fragments['select'][]      = 'SUM(pmi.is_new) as is_new';
 
   if (in_array('count', $fields)) {
     $fragments['select'][]      = 'COUNT(pmi.thread_id) as count';
Index: privatemsg.theme.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/Attic/privatemsg.theme.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 privatemsg.theme.inc
--- privatemsg.theme.inc	16 Apr 2009 20:13:22 -0000	1.1.2.3
+++ privatemsg.theme.inc	20 Apr 2009 20:37:02 -0000
@@ -22,14 +22,26 @@ function phptemplate_privatemsg_list_fie
 
 function phptemplate_privatemsg_list_field__subject($thread) {
   $field = array();
-  $field['data'] =l($thread['subject'], 'messages/view/'. $thread['thread_id']);
+  $field['data'] = l($thread['subject'], 'messages/view/'. $thread['thread_id']);
+  if (!empty($thread['is_new'])) {
+    if ($thread['is_new'] >= $thread['count']) {
+      $field['data'] .= theme_mark(MARK_NEW);
+    } else {
+      $field['data'] .= theme_mark(MARK_UPDATED);
+    }
+  }
   $field['class'] = 'privatemsg-list-subject';
   return $field;
 }
 
 function phptemplate_privatemsg_list_field__count($thread) {
   $field = array();
-  $field['data'] =$thread['count'] -1;
+  $field['data'] = $thread['count'];
+  $options = array();
+  if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
+    $options['fragment'] = 'new';
+    $field['data'] .= '<br />'. l((format_plural($thread['is_new'], '(1 new)', '(@count new)')),'messages/view/'. $thread['thread_id'], $options);
+  }
   $field['class'] = 'privatemsg-list-count';
   return $field;
 }
@@ -64,7 +76,7 @@ function phptemplate_privatemsg_list_hea
 
 function phptemplate_privatemsg_list_header__count() {
   return array(
-    'data'    => t('Answers'),
+    'data'    => t('Messages'),
     'key'     => 'count',
     'class'   => 'privatemsg-header-count',
     '#weight' => -25,
@@ -107,8 +119,6 @@ function phptemplate_privatemsg_list_hea
 function theme_privatemsg_list($form) {
   $has_posts = !empty($form['#rows']);
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
-
   // sort the headers array based on the #weight property.
   $headers = $form['#headers'];
   usort($headers, 'element_sort');