--- loncom/interface/lonmsg.pm	2000/10/20 14:40:26	1.3
+++ loncom/interface/lonmsg.pm	2000/10/20 18:06:08	1.4
@@ -100,17 +100,20 @@ sub user_crit_msg {
     if ($homeserver ne 'no_host') {
        my $msgid;
        ($msgid,$message)=&packagemsg($subject,$message);
-       $status=&Apache::lonnet::cput('critical',$msgid => $message);
+       $status=&Apache::lonnet::critical(
+           'put:'.$domain.':'.$user.':critical:'.
+           &Apache::lonnet::escape($msgid).'='.
+           &Apache::lonnet::escape($message),$homeserver);
     } else {
        $status='no_host';
     }
     &Apache::lonnet::logthis(
-      '<font color=yellow>INFO: Sending critical email '.$msgid.
+      'Sending critical email '.$msgid.
       ', log status: '.
       &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
                          $ENV{'user.home'},
       'Sending critical '.$msgid.' to '.$user.' at '.$domain.' with status: '
-      .$status).'</font>');
+      .$status));
     return $status;
 }
 
@@ -118,7 +121,16 @@ sub user_crit_msg {
 
 sub user_crit_received {
     my $message=shift;
-
+    my %contents=&unpackagemsg($message);
+    &Apache::lonnet::log('Received critical message '.$contents{'msgid'});
+    &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
+                     'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+                     'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+                     ' acknowledged receipt of message "'.
+                     $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"
+                     .'Message ID: '.$contents{'msgid'});
+    &Apache::lonnet::put('nohist_email',$contents{'msgid'} => $message);
+    &Apache::lonnet::del('critical',$contents{'msgid'});
 }
 
 # ======================================================== Normal communication
@@ -133,7 +145,10 @@ sub user_normal_msg {
     if ($homeserver ne 'no_host') {
        my $msgid;
        ($msgid,$message)=&packagemsg($subject,$message);
-       $status=&Apache::lonnet::cput('nohist_email',$msgid => $message);
+       $status=&Apache::lonnet::critical(
+           'put:'.$domain.':'.$user.':nohist_email:'.
+           &Apache::lonnet::escape($msgid).'='.
+           &Apache::lonnet::escape($message),$homeserver);
     } else {
        $status='no_host';
     }