--- loncom/interface/lonmsgdisplay.pm	2007/05/02 20:26:08	1.74
+++ loncom/interface/lonmsgdisplay.pm	2008/06/06 17:46:15	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.74 2007/05/02 20:26:08 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.87 2008/06/06 17:46:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -513,22 +513,34 @@ sub discourse {
     
     $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
 
-    $result .= &Apache::lonselstudent::render_student_list($current_members,
-							   "compemail",
-							   "current",
-							   \%defaultUsers,
-							   1,"selectedusers",1);
-
-    $result .= &Apache::lonselstudent::render_student_list($expired_members,
-							   "compemail",
-							   "expired",
-							   \%defaultUsers,
-							   1, "selectedusers",0);
-    $result .= &Apache::lonselstudent::render_student_list($future_members,
-							   "compemail",
-							   "future",
-							   \%defaultUsers,
-							   1, "selectedusers", 0);
+    my $tmptext;
+    if ($tmptext = &Apache::lonselstudent::render_student_list($current_members,
+                                                               "compemail",
+                                                               "current",
+                                                               \%defaultUsers,
+                                                               1,"selectedusers",1)
+       ) {
+       $result .= '<h2>'.&mt('Course members with current access').'</h2>';
+       $result .= $tmptext;
+    }
+    if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
+                                                               "compemail",
+                                                               "expired",
+                                                               \%defaultUsers,
+                                                               1, "selectedusers",0)
+       ) {
+       $result .= '<h2>'.&mt('Course members with expired access').'</h2>';
+       $result .= $tmptext;
+    }
+    if ($tmptext = &Apache::lonselstudent::render_student_list($future_members,
+                                                               "compemail",
+                                                               "future",
+                                                               \%defaultUsers,
+                                                               1, "selectedusers", 0)
+       ) {
+       $result .= '<h2>'.&mt('Course members with future access').'</h2>';
+       $result .= $tmptext;
+    }
     return $result;
 }
 
@@ -555,7 +567,7 @@ sub disgroup {
                       'recipients to select.');
         return $result;
     } else {
-        $result = &mt('Select message recipients from the group members listed below.<br />');  
+        $result = &mt('Select message recipients from the group members listed below.').'<br />';  
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -737,12 +749,27 @@ $content{'sendername'}.':'.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
             '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</pre><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_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.
-            '<input type="submit" name="reprec_'.$key.'" '.
-                  'value="'.&mt('Confirm Receipt and Reply').'" />';
+            '</pre><div class="LC_error">';
+        my ($rec_button,$reprec_button);
+        $rec_button = &mt('Move to Inbox');
+        if (!$content{'noreplies'}) {
+            $reprec_button = &mt('Move to Inbox/Compose reply');
+        }
+        if ($content{'sendback'}) {
+            $rec_button = &mt('Confirm Receipt');
+            if (!$content{'noreplies'}) {
+                $reprec_button = &mt('Confirm Receipt and Reply');
+            }
+            $result .= &mt('You have to confirm that you have received this message before you can view other pages. After confirmation, this message will be moved to your regular inbox');
+        } else {
+            $result .= &mt('Access to other pages will be prevented until you have moved the message to your inbox.'); 
+        }
+        $result .= '</div><br />'.
+            '<input type="submit" name="rec_'.$key.'" value="'.$rec_button.'" />';
+        if (!$content{'noreplies'}) {
+            $result .= '<input type="submit" name="reprec_'.$key.'" '.
+                  'value="'.$reprec_button.'" />';
+        }
     }
     # Check to see if there were any messages.
     if ($result eq '') {
@@ -877,8 +904,7 @@ sub get_course_desc {
 
 sub disall {
     my ($r,$folder,$msgstatus)=@_;
-    my %saveable = ('folder'    => 'scalar',
-		    'msgstatus' => 'scalar',
+    my %saveable = ('msgstatus' => 'scalar',
 		    'sortedby'  => 'scalar',
 		    'interdis'  => 'scalar',
 		    );
@@ -915,16 +941,6 @@ sub disfolder {
 <script type="text/javascript">
     $jscript
 
-    function checkfoldermove() {
-        if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
-            if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
-                alert("$lt{'sede'}");
-                return;
-            }
-        }
-        return; 
-    }
-
     function validate_checkedaction() {
         document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
@@ -1096,7 +1112,7 @@ ENDDISHEADER
   '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".
   '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
-  '  <select name="checkedaction" onchange="javascript:checkfoldermove()">'."\n");
+  '  <select name="checkedaction">'."\n");
 
     if ($folder ne 'trash') {
         $r->print('    <option value="markeddel">'.&mt('Delete').'</option>'."\n");
@@ -1190,8 +1206,9 @@ sub compout {
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
-            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked
-will be forwarded to the recipient(s) you select below.',$multiforward).'<br />');
+            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
+                         .' will be forwarded to the recipient(s) you select below.',$multiforward)
+                    .'<br />');
         } else {
             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
         }
@@ -1205,10 +1222,13 @@ will be forwarded to the recipient(s) yo
     my $dissub='';
     my $dismsg='';
     my $disbase='';
+    my $attachrow;
     my $func=&mt('Send New');
     my %lt=&Apache::lonlocal::texthash('us'  => 'Username',
 				       'do'  => 'Domain',
 				       'ad'  => 'Additional Recipients',
+                                       'rt'  => 'Reply to',
+                                       'ar'  => 'Allow replies',
 				       'sb'  => 'Subject',
 				       'ca'  => 'Cancel',
 				       'ma'  => 'Mail',
@@ -1217,7 +1237,15 @@ will be forwarded to the recipient(s) yo
                                        'gmt' => 'General message text',
                                        'tff' => 'The file format for the uploaded portion of the message is',
                                        'uas' => 'Upload and Send',
+                                       'atta' => 'Attachment',
                                       );
+    my %attachmax = (
+                     text => '(128 KB max size)',
+                     num  => 131072,
+                    );
+    if (!$forwarding && !$multiforward) {
+        $attachrow = '<br />'.$lt{'atta'}.' '.$attachmax{'text'}.': <input type="file" name="attachment" />';
+    }
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 				    '/'.$env{'request.course.sec'})) {
@@ -1319,14 +1347,36 @@ ENDREPSCRIPT
     } 
     if (($broadcast ne 'group') && ($broadcast ne 'upload')) {
 	if ($replying) {
-	    $r->print('<tr><td colspan="2">'.&mt('Replying to').' '.
-		      &Apache::loncommon::aboutmewrapper(
+            if ($content{'noreplies'}) {
+                $r->print('<tr><td>'.&mt('This message was designated by the sender not to allow replies.').'</td></tr></table></form>');
+                return;
+            }
+            $r->print('<tr><td colspan="2">'.&mt('Replying to').' ');
+            if ($content{'replytoaddr'}) {
+                my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+                if ($replytoname ne '' && $replytodom ne '') {
+                    $r->print(&Apache::loncommon::plainname($replytoname,
+                                 $replytodom).' ('.$replytoname.':'.
+                                 $replytodom.')');
+                    $r->print('<input type="hidden" name="recuname" value="'.
+                          $replytoname.'" />'.
+                          '<input type="hidden" name="recdomain" value="'.
+                          $replytodom.'" /></td></tr>');
+
+                } else {
+                    $r->print(&mt('The sender did not designate a reply to address for this message.').'</td></tr></table>');
+                    return;
+                }
+            } else {
+	        $r->print(&Apache::loncommon::aboutmewrapper(
 							 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
 		      $content{'sendername'}.':'.
-		      $content{'senderdomain'}.')'.
-		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
-		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
-		      '</td></tr>');
+		      $content{'senderdomain'}.')');
+                $r->print('<input type="hidden" name="recuname" value="'.
+		          $content{'sendername'}.'" />'.
+		          '<input type="hidden" name="recdomain" value="'.
+                          $content{'senderdomain'}.'" /></td></tr>');
+            }
             if ($content{'recipid'}) {
                 my @ccs = &retrieve_cc_recips('replying',%content);
                 if (@ccs > 0) {
@@ -1379,12 +1429,20 @@ $latexHelp.
     } elsif ($broadcast ne 'upload') {
         $subj_size = '50';
         $r->print(&additional_rec_row(\%lt));
+        if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+            || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+                                        '/'.$env{'request.course.sec'})) {
+            $r->print(&reply_to_row(\%lt));
+        }
         $r->print(&msg_subject_row($dissub,\%lt,$subj_size));
         $r->print(<<"ENDCOMP");
 </table>
 $latexHelp
 <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
-</textarea></p><br />
+</textarea>
+$attachrow
+</p>
+<br />
 $dispcrit
 $disbase
 ENDCOMP
@@ -1453,22 +1511,31 @@ sub recipient_input_row {
       &Apache::loncommon::selectstudent_link('compemail','recuname',
                                              'recdomain');
     my $output = <<"ENDREC";
-<tr><td>$lt{'us'}:</td><td><input type="text" size="12" name="recuname" value="$env{'form.recname'}" /></td><td rowspan="2">$selectlink</td></tr>
-<tr><td>$lt{'do'}:</td>
-<td>$domform</td></tr>
+<tr><td colspan="2"><span class="LC_nobreak">$lt{'us'}:&nbsp;<input type="text" size="12" name="recuname" value="$env{'form.recname'}" />&nbsp;$lt{'do'}:&nbsp;$domform&nbsp;&nbsp;$selectlink</span></td></tr>
 ENDREC
     return $output;
 }
 
+sub reply_to_row {
+    my ($lt) = @_;
+    my $radioyes = &mt('Yes');
+    my $radiono = &mt('No');
+    my $output = <<"ENDREP";
+<tr><td colspan="2"><span class="LC_nobreak">$lt->{'ar'}:<label><input type="radio" name="can_reply" value="Y" checked="checked" />$radioyes</label>&nbsp;&nbsp;<label><input type="radio" name="can_reply" value="N" />$radiono</label></span>&nbsp;&nbsp;&nbsp;&nbsp;<span class="LC_nobreak">$lt->{'rt'}:&nbsp;<input type="text" size="25" name="reply_to_addr" value="$env{'user.name'}:$env{'user.domain'}" /></span></td></tr>
+ENDREP
+    return $output;
+}
+
 sub additional_rec_row {
     my ($lt) = @_;
     my $cc = &mt('Cc:');
-    my $bcc = &mt('Bcc:'); 
+    my $bcc = &mt('Bcc:');
+    my $exmpl = &mt('username:domain,username:domain,...'); 
     my $output = <<"ENDADD";
-<tr><td>$lt->{'ad'} :<br /><tt>username:domain,username:domain, ...
-</tt></td><td>&nbsp;<span class="span.LC_nobreak">$cc 
-<input type="text" size="50" name="additionalrec_cc" /></nospan><br />
-<span class="span.LC_nobreak">$bcc <input type="text" size="50" name="additionalrec_bcc" /></nospan></td></tr>
+<tr><td>$lt->{'ad'} :<br /><tt>($exmpl)
+</tt></td><td>&nbsp;<span class="LC_nobreak">$cc 
+<input type="text" size="50" name="additionalrec_cc" /></span><br />
+<span class="LC_nobreak">$bcc <input type="text" size="50" name="additionalrec_bcc" /></span></td></tr>
 ENDADD
     return $output;
 }
@@ -1486,7 +1553,7 @@ sub submit_button_row {
 
 sub msg_subject_row {
     my ($dissub,$lt,$subj_size,$extra) = @_;
-    my $output = '<tr><td>'.$lt->{'sb'}.':</td><td><input type="text" size="'.
+    my $output = '<tr><td colspan="2">'.$lt->{'sb'}.':&nbsp;<input type="text" size="'.
                  $subj_size.'" name="subject" value="'.$dissub.'" />'.$extra.
                  '</td></tr>';
     return $output;
@@ -2022,15 +2089,33 @@ sub displaymessage {
 	$counter++;
     }
     $r->print('</pre>');
+
+    my $see_anonymous;
+    my $from_student = 0;
+    if ($env{'request.course.id'} eq $content{'courseid'}) {
+	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+	my $username = $content{'sendername'}.':'.$content{'senderdomain'};
+	my %classlist_entry =
+	    &Apache::lonnet::get('classlist',[$username],$cdom,$cnum);
+	if (exists($classlist_entry{$username})) {
+	    $from_student = 1;
+	    $see_anonymous = &Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+	}
+    }
+
+
     my $number_of_messages = scalar(@messages); #subtract 1 for last index
 # start output
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
     my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
 # Functions
-    $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
-	      '<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Reply').'</b></a></td>'.
-	      '<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
+    $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>');
+    if (!$content{'noreplies'}) {
+        $r->print('<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
+	          '"><b>'.&mt('Reply').'</b></a></td>');
+    }
+    $r->print('<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
 	      '"><b>'.&mt('Forward').'</b></a></td>'.
 	      '<td><a href="/adm/email?markunread='.&escape($msgid).$sqs.
 	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
@@ -2054,6 +2139,7 @@ sub displaymessage {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }
     if ($env{'user.adv'}) {
+	my $adv_actions;
 	$r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
 		$r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
@@ -2074,7 +2160,7 @@ sub displaymessage {
                &Apache::loncommon::plainname($content{'recuser'}[$i],
                                       $content{'recdomain'}[$i]),
                   $content{'recuser'}[$i],$content{'recdomain'}[$i]).
-           ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
+           ' ('.$content{'recuser'}[$i].' '.&mt('at').' '.$content{'recdomain'}[$i].') ';
         }
     }
     $tolist = join(', ',@recipients);
@@ -2093,20 +2179,42 @@ sub displaymessage {
     if (defined($content{'baseurl'})) {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }
-    $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
+    if ($from_student && $see_anonymous ) {
+	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
+    }
+
     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'});
     if ($folder eq 'sent') {
         $r->print('<br /><b>'.&mt('To').':</b> '.$tolist);
+        if ($content{'replytoaddr'}) {
+            my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+            if ($replytoname ne '' && $replytodom ne '') {
+                $r->print('<br /><b>'.&mt('Reply To').':</b> '.
+                          $replytoname.' '.&mt('at').' '.$replytodom);
+            }
+        }
     } else {
         $r->print('<br /><b>'.&mt('From').':</b> '.
 	      &Apache::loncommon::aboutmewrapper(
 						 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
-						 $content{'sendername'},$content{'senderdomain'}).' ('.
-	      $content{'sendername'}.' at '.
-	      $content{'senderdomain'}.') ');
-        if ($cclist) {
-            $r->print('<br /><b>'.&mt('Cc').':</b> '.$cclist);
-        }
+						 $content{'sendername'},$content{'senderdomain'}));
+        if ($content{'noreplies'}) {
+            $r->print(' ('.&mt('No replies to sender').')'); 
+        } else {
+            if ($content{'replytoaddr'}) {
+                my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+                if ($replytoname ne '' && $replytodom ne '') {
+                    $r->print('<br /><b>'.&mt('Reply To').':</b> '.
+                              $replytoname.' '.&mt('at').' '.$replytodom);
+                }
+            } else {
+                $r->print(' ('.$content{'sendername'}.' '.&mt('at').' '.
+                          $content{'senderdomain'}.') ');
+            }
+            if ($cclist) {
+                $r->print('<br /><b>'.&mt('Cc').':</b> '.$cclist);
+            }
+        } 
     }
     if ($content{'courseid'}) {
         $r->print('<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'});
@@ -2308,6 +2416,8 @@ sub sendoffmail {
     my %msg_status;
     my $numsent = 0;
     my $nosentstore = 1;
+    my $attachmenturl;
+    my $now = time;
     my ($cdom,$cnum,$group);
     if (exists($env{'form.group'})) {
         $group = $env{'form.group'};
@@ -2330,10 +2440,13 @@ sub sendoffmail {
 	if ($env{'form.forwid'}) {
 	    my $msgid=$env{'form.forwid'};
 	    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
-	    %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1);
+	    %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1,1);
 	    &statuschange($msgid,'forwarded',$folder);
-	    $env{'form.message'}.="\n\n-- Forwarded message --\n\n".
-		$content{'message'};
+            if ($content{'attachmenturl'} ne '') {
+                $attachmenturl = $content{'attachmenturl'};
+            }
+	    $env{'form.message'} .= "\n\n-- Forwarded message --\n\n".
+		                    $content{'message'};
 	}
 	if ($env{'form.replyid'}) {
 	    my $msgid=$env{'form.replyid'};
@@ -2432,7 +2545,18 @@ sub sendoffmail {
                                        $env{'user.domain'},\%reciphash);
         if ($recipstatus ne 'ok') {
             &Apache::lonnet::logthis('Failed to store Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});
-        }  
+        }
+        if ($env{'form.attachment'}) {
+            if (length($env{'form.attachment'})<131072) {
+                $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now);
+            } else {
+                $r->print('<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>');
+            }
+        } elsif ($env{'form.multiforward'}) {
+            if ($env{'form.attachmenturl'} ne '') {
+                $attachmenturl = $env{'form.attachmenturl'};
+            }
+        }
         my @recusers;
         my @recudoms;
 	foreach my $address (sort(keys(%toaddr))) {
@@ -2458,7 +2582,7 @@ sub sendoffmail {
 		    &Apache::lonmsg::user_normal_msg($recuname,$recdomain,
 						     $msgsubj,$msgtxt,
 						     $content{'citation'},
-						     undef,undef,
+						     undef,$attachmenturl,
 						     $env{'form.permanent'},
 						     \$sentmessage{$address},
                                                      undef,undef,undef,
@@ -2491,7 +2615,7 @@ sub sendoffmail {
                 $specialresult = 
                     &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
                         $subj_prefix.' '.$course_str,$savemsg,undef,undef,
-                        undef,undef,undef,\$specialmsgid,undef,undef,undef,
+                        $attachmenturl,undef,undef,\$specialmsgid,undef,undef,undef,
                         undef,undef,1);
                 $specialmsgid = &unescape($specialmsgid);
                 if ($specialresult eq 'ok') {
@@ -2508,7 +2632,7 @@ sub sendoffmail {
 							    $pid);
                             &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
                                 $subj_prefix.' ['.$recipient.']',$msgsubj,
-                                undef,undef,undef,undef,$usermsgid,undef,
+                                undef,undef,$attachmenturl,undef,$usermsgid,undef,
                                 undef,$specialmsgid,undef,undef,undef,1);
                         }
                     }
@@ -2516,10 +2640,10 @@ sub sendoffmail {
                         &Apache::lonmsg::process_sent_mail($msgsubj,
                            $subj_prefix,$numsent,$stamp,$msgname,$msgdom,
                            $msgcount,$context,$pid,$savemsg,\@recusers,
-                           \@recudoms);
+                           \@recudoms,undef,$attachmenturl);
                     }
                 } else {
-                    &Apache::lonnet::logthis('Failed to create record of critical, broadcast or archived message in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
+                    &Apache::lonnet::logthis('Failed to create record of critical, broadcast or archived message in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' '&mt('at').' '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
                 }
             } else {
                 my $stamp = time;
@@ -2528,7 +2652,7 @@ sub sendoffmail {
                 &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix,
                        $numsent,$stamp,$env{'user.name'},
                        $env{'user.domain'},$msgcount,$context,
-                       $$,$savemsg,\@recusers,\@recudoms);
+                       $$,$savemsg,\@recusers,\@recudoms,undef,$attachmenturl);
             }
         }
         if (!$env{'form.multiforward'}) { 
@@ -2545,7 +2669,7 @@ sub sendoffmail {
 	        }
             } else {
 	        $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
-		          &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
+		          &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
             }
         }
     }
@@ -2636,16 +2760,19 @@ sub handler {
 	&printheader($r,'','Confirmed Receipt');
 	my $replying = 0;
 	foreach my $envkey (keys(%env)) {
-	    if ($envkey=~/^form\.rec\_(.*)$/) {
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &Apache::lonmsg::user_crit_received($1).'<br>');
-	    }
-	    if ($envkey=~/^form\.reprec\_(.*)$/) {
-		my $msgid=$1;
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &Apache::lonmsg::user_crit_received($msgid).'<br>');
-		&compout($r,'','','',$msgid);
-		$replying = 1;
+	    if ($envkey=~/^form\.(rep)?rec\_(.*)$/) {
+                my $repchk = $1;
+       		my $msgid = $2;
+		$r->print('<b>'.&mt('Confirming Receipt').':</b> ');
+		my $result = &Apache::lonmsg::user_crit_received($msgid);
+                if ($result =~ /trans:\s+ok/) {
+                    &statuschange($msgid,'read');
+                }
+                $r->print($result.'<br />');
+                if ($repchk eq 'rep') {
+		    &compout($r,'','','',$msgid);
+		    $replying = 1;
+                }
 	    }
 	}
 	if (!$replying) {
@@ -2777,7 +2904,7 @@ sub handler {
             foreach my $item (@to_forward) {
                 my $msgid=&unescape($item);
                 my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
-                my %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1);
+                my %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1,1);
                 if ($env{'form.showorigsubj'}) {
                     $env{'form.subject'} = $fixed_subj.$content{'subject'};
                 } else {
@@ -2791,8 +2918,10 @@ sub handler {
                         &Apache::loncommon::plainname($uname,$udom).' ('.
                                            $uname.':'.$udom.')';
                 }
-                $env{'form.message'} .= "\n\n-- Forwarded message --\n\n".
-                                        $content{'message'};
+                $env{'form.message'}.="\n\n-- Forwarded message --\n\n".
+                                      $content{'message'};
+                $env{'form.attachmenturl'} = $content{'attachmenturl'};
+                $env{'form.multiforwid'} = $item;
                 $fwdcount ++;
                 $r->print($fwdcount.': '); 
                 $sendresult{$msgid} = &sendoffmail($r,$folder);