--- loncom/interface/lonmsg.pm	2002/04/23 21:06:07	1.31
+++ loncom/interface/lonmsg.pm	2002/06/26 20:41:55	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.31 2002/04/23 21:06:07 matthew Exp $
+# $Id: lonmsg.pm,v 1.34 2002/06/26 20:41:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -314,7 +314,8 @@ sub discrit {
         $content{'message'}=~s/\n/\<br\>/g;
         $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
             $content{'senderdomain'}.'</b> ('.$content{'time'}.
-            ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
+            ')<br>Subject: '.$content{'subject'}.
+            '<br><blockquote>'.$content{'message'}.'</blockquote>'.
             '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
             '<input type=submit name="reprec_'.$_.'" '.
                   'value="Confirm Receipt and Reply">';
@@ -396,7 +397,7 @@ ENDDISHEADER
                                         $ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
-       unless ($status eq 'deleted') {
+       unless (($status eq 'deleted') || ($sendtime=~/error/)) {
         if ($status eq 'new') {
 	    $r->print('<tr bgcolor="#FFBB77">');
         } elsif ($status eq 'read') {
@@ -521,21 +522,9 @@ sub handler {
   return OK if $r->header_only;
 
 # --------------------------- Get query string for limited number of parameters
-
-    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'display') || ($name eq 'replyto') || 
-           ($name eq 'forward') || ($name eq 'markread') ||
-           ($name eq 'markdel') || ($name eq 'markunread') ||
-           ($name eq 'sendreply') || ($name eq 'compose') ||
-           ($name eq 'sendmail') || ($name eq 'critical')) {
-           unless ($ENV{'form.'.$name}) {
-              $ENV{'form.'.$name}=$value;
-	   }
-       }
-    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+        ['display','replyto','forward','markread','markdel','markunread',
+         'sendreply','compose','sendmail','critical']);
 
 # --------------------------------------------------------------- Render Output