--- loncom/interface/lonmsgdisplay.pm	2006/04/22 17:10:07	1.4
+++ loncom/interface/lonmsgdisplay.pm	2006/04/23 03:00:34	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.4 2006/04/22 17:10:07 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.6 2006/04/23 03:00:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -313,7 +313,7 @@ ENDDISHEADER
 
 sub discrit {
     my $r=shift;
-    my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.
+    my $header = '<h1><font color="red">'.&mt('Critical Messages').'</font></h1>'.
         '<form action="/adm/email" method="POST">'.
         '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
@@ -624,6 +624,8 @@ ENDDISHEADER
      	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
+
+    my $suffix = &Apache::lonmsg::foldersuffix($folder);
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
@@ -636,12 +638,21 @@ ENDDISHEADER
 	    } else {
 		$r->print('<tr class="LC_mail_other">');
 	    }
+	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
+	    if ($folder eq 'sent') {
+		my $msg_id = &Apache::lonnet::unescape($origID);
+		my %message=&Apache::lonnet::get('nohist_email'.$suffix,
+						 [$msg_id]);
+		my %content=&Apache::lonmsg::unpackagemsg($message{$msg_id});
+		$dis_name   = join('<br />',@{$content{'recuser'}});
+		$dis_domain = join('<br />',@{$content{'recdomain'}});
+	    }
 	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
 		      '">'.&mt('Open').'</a></td><td>'.
 		      ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
 		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
-		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
+		      $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $description.'</td><td>'.$status.'</td></tr>'."\n");
 	} elsif ($status eq 'deleted') {
@@ -1767,17 +1778,15 @@ sub sendoffmail {
 	&printheader($r,'','No messages sent.'); 
     }
     if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	$r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
+	$r->print('<br /><span class="LC_success">'.&mt('Completed.').'</span>');
 	if ($env{'form.displayedcrit'}) {
 	    &discrit($r);
 	} else {
 	    &Apache::loncommunicate::menu($r);
 	}
     } else {
-	$r->print(
-		  '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
-		  &mt('Please use the browser "Back" button and correct the recipient addresses')
-		  );
+	$r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+		  &mt('Please use the browser "Back" button and correct the recipient addresses').'</p>');
     }
 }