--- loncom/interface/lonmsg.pm	2001/08/03 14:00:07	1.12
+++ loncom/interface/lonmsg.pm	2001/08/03 14:54:52	1.13
@@ -202,7 +202,7 @@ sub statuschange {
 	&Apache::lonnet::put('email_status',{$msgid => $newstatus});
     }
 }
-# ===================================================================== Handler
+# ==================================================== Display Critical Message
 
 sub discrit {
     my $r=shift;
@@ -216,11 +216,43 @@ sub discrit {
 	  $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.
                     $content{'senderdomain'}.'</b> ('.$content{'time'}.
                     ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
-  '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">');
+  '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
+ '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
       } sort keys %what;
       $r->print('</form>');
 }
 
+# =============================================================== Compose reply
+
+sub comprep {
+    my ($r,$msgid)=@_;
+      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+      my %content=&unpackagemsg($message{$msgid});
+      my $quotemsg='> '.$content{'message'};
+      $quotemsg=~s/\r/\n/g;
+      $quotemsg=~s/\f/\n/g;
+      $quotemsg=~s/\n+/\n\> /g;
+      my $subject='Re: '.$content{'subject'};
+      my $dispcrit='';
+      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+         $dispcrit=
+	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+      }
+      $r->print(<<"ENDREPLY");
+<form action="/adm/email" method=post>
+<input type=hidden name=sendreply value="$msgid">
+Subject: <input type=text size=50 name=subject value="$subject"><p>
+<textarea name=message cols=60 rows=10>
+$quotemsg
+</textarea><p>
+$dispcrit
+<input type=submit value="Send Reply">
+</form>
+ENDREPLY
+}
+
+# ===================================================================== Handler
+
 sub handler {
     my $r=shift;
 
@@ -266,30 +298,7 @@ sub handler {
              '"><b>Reply</b></a><hr><pre>'.
              $content{'message'}.'</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
-      my $msgid=$ENV{'form.replyto'};
-      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
-      my $quotemsg='> '.$content{'message'};
-      $quotemsg=~s/\r/\n/g;
-      $quotemsg=~s/\f/\n/g;
-      $quotemsg=~s/\n+/\n\> /g;
-      my $subject='Re: '.$content{'subject'};
-      my $dispcrit='';
-      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-         $dispcrit=
-	     '<input type=checkbox name=critmsg> Send as critical message<p>';
-      }
-      $r->print(<<"ENDREPLY");
-<form action="/adm/email" method=post>
-<input type=hidden name=sendreply value="$msgid">
-Subject: <input type=text size=50 name=subject value="$subject"><p>
-<textarea name=message cols=60 rows=10>
-$quotemsg
-</textarea><p>
-$dispcrit
-<input type=submit value="Send Reply">
-</form>
-ENDREPLY
+      &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {
       my $msgid=$ENV{'form.sendreply'};
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
@@ -314,6 +323,12 @@ ENDREPLY
 	      $r->print('<b>Confirming Receipt:</b> '.
                         &user_crit_received($1).'<br>');
           }
+          if ($_=~/^form\.reprec\_(.*)$/) {
+              my $msgid=$1;
+	      $r->print('<b>Confirming Receipt:</b> '.
+                        &user_crit_received($msgid).'<br>');
+              &comprep($r,$msgid);
+          }
       } keys %ENV;
       &discrit($r);
   } elsif ($ENV{'form.critical'}) {