--- loncom/interface/lonmsg.pm	2004/01/15 03:53:12	1.78
+++ loncom/interface/lonmsg.pm	2004/01/31 02:42:44	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.78 2004/01/15 03:53:12 www Exp $
+# $Id: lonmsg.pm,v 1.84 2004/01/31 02:42:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -396,7 +396,7 @@ sub user_crit_received {
     my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
-                     &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+                     &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
                      &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
                      ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'"'."\n".&mt('dated').' '.
@@ -599,7 +599,9 @@ $content{'sendername'}.'@'.
             '<br>'.&mt('Subject').': '.$content{'subject'}.
             '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</blockquote>'.
+            '</blockquote><small>'.
+&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
+            '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
             '<input type=submit name="reprec_'.$_.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'">';
@@ -1084,7 +1086,7 @@ $content{'sendername'},$content{'senderd
            '"><b>'.&mt('Next').'</b></a></td>');
        }
        $r->print('</tr></table><p><pre>'.
-             &Apache::lontexconvert::msgtexconverted($content{'message'}).
+             &Apache::lontexconvert::msgtexconverted($content{'message'},1).
              '</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});
@@ -1213,6 +1215,7 @@ $content{'sendername'},$content{'senderd
 	  }
       }
       if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	  $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
 	  if ($ENV{'form.displayedcrit'}) {
 	      &discrit($r);
 	  } else {