--- loncom/xml/lonxml.pm	2002/09/11 13:36:50	1.195
+++ loncom/xml/lonxml.pm	2002/09/13 20:46:09	1.196
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.195 2002/09/11 13:36:50 www Exp $
+# $Id: lonxml.pm,v 1.196 2002/09/13 20:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -186,17 +186,24 @@ sub xmlend {
                   if ($hidden) {
 		      $message='<font color="#888888">'.$message.'</font>';
                   }
+                  my $screenname=&Apache::loncommon::screenname(
+                               $contrib{$idx.':sendername'},
+			       $contrib{$idx.':senderdomain'});
+                  my $plainname=&Apache::loncommon::nickname(
+                               $contrib{$idx.':sendername'},
+			       $contrib{$idx.':senderdomain'});
+
                   my $sender='Anonymous';
                   if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
                       $sender=&Apache::loncommon::aboutmewrapper(
-                               $contrib{$idx.':plainname'},
+                               $plainname,
                                $contrib{$idx.':sendername'},
                                $contrib{$idx.':senderdomain'}).' ('.
                               $contrib{$idx.':sendername'}.' at '.
 		      $contrib{$idx.':senderdomain'}.')';
                       if ($contrib{$idx.':anonymous'}) {
 			  $sender.=' [anonymous] '.
-                                     $contrib{$idx.':screenname'};
+                                     $screenname;
                       }
                       if ($seeid) {
 			  if ($hidden) {
@@ -208,8 +215,8 @@ sub xmlend {
 			  }
                       }                   
                   } else {
-                      if ($contrib{$idx.':screenname'}) {
-			  $sender='<i>'.$contrib{$idx.':screenname'}.'</i>';
+                      if ($screenname) {
+			  $sender='<i>'.$screenname.'</i>';
                       }
                   }
 		  $discussion.='<p><b>'.$sender.'</b> ('.