--- mail_archive.module.New	2006-01-24 11:13:03.000000000 -0500
+++ mail_archive.module.New2	2006-01-25 12:25:05.000000000 -0500
@@ -171,11 +171,11 @@
 }
 
 function theme_mail_archive_message_header($message) {
-  $output = '<div class="message-header">';
-  $headers = t('<b>From: %from</b><br />', array('%from' => l(htmlspecialchars(theme('mail_archive_antispam_address', $message->mailfrom_short)), "mailarchive/$message->lid/search/author/". htmlspecialchars($message->mailfrom_short))));
-  $headers .= t('To: %to<br />', array('%to' => theme('mail_archive_antispam_address', $message->mailto)));
-  $headers .= t('Subject: %subject<br />', array('%subject' => l(htmlspecialchars($message->subject), "mailarchive/$message->lid/search/subject/". htmlspecialchars(mail_archive_strip_subject($message->subject_short)))));
-  $headers .= 'Date: '. format_date($message->received, 'short') .'<br />';
+  $output = '<ul class="message-header" style="list-style-type: none;">';
+  $headers = '<li>' . t('From: %from', array('%from' => l(htmlspecialchars(theme('mail_archive_antispam_address', $message->mailfrom_short)), "mailarchive/$message->lid/search/author/". htmlspecialchars($message->mailfrom_short)))) . '</li>';
+  $headers .= '<li>' . t('To: %to', array('%to' => theme('mail_archive_antispam_address', $message->mailto))) . '</li>';
+  $headers .= '<li>' . t('Subject: %subject', array('%subject' => l(htmlspecialchars($message->subject), "mailarchive/$message->lid/search/subject/". htmlspecialchars(mail_archive_strip_subject($message->subject_short))))) . '</li>';
+  $headers .= '<li>Date: '. format_date($message->received, 'short') .'</li>';
   // run through filter prior to calling 'headers' hook
   $headers = check_output($headers, mail_archive_load_filter($message->lid));
 
@@ -184,9 +184,8 @@
       ${$key} = $value;
     }
   }
-
   $output .= $headers;
-  $output .= '</div>';
+  $output .= '</ul>';
   return $output;
 }