--- loncom/interface/lonmsgdisplay.pm	2006/04/23 03:00:34	1.6
+++ loncom/interface/lonmsgdisplay.pm	2006/04/23 04:04:38	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.6 2006/04/23 03:00:34 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.8 2006/04/23 04:04:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -478,7 +478,7 @@ sub disnew {
                     push @newmsgs, { 
                         msgid    => $msgid,
                         sendtime => $sendtime,
-                        shortsub => &Apache::lonnet::unescape($shortsubj),
+                        shortsub => $shortsubj,
                         from     => $fromname,
                         fromdom  => $fromdom,
                         course   => $description 
@@ -653,7 +653,7 @@ ENDDISHEADER
 		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
 		      $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
-		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
+		      $shortsubj.'</td><td>'.
                       $description.'</td><td>'.$status.'</td></tr>'."\n");
 	} elsif ($status eq 'deleted') {
 # purge
@@ -1676,7 +1676,8 @@ sub sendoffmail {
         my $savemsg;
         my $msgtype;
         my %sentmessage;
-        my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'});
+        my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'},
+							 undef,1);
         if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
             (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	     || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.