--- loncom/interface/lonmsgdisplay.pm	2006/12/23 07:21:00	1.57
+++ loncom/interface/lonmsgdisplay.pm	2009/09/10 12:08:42	1.124.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.57 2006/12/23 07:21:00 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.3 2009/09/10 12:08:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,12 +33,13 @@ package Apache::lonmsgdisplay;
 
 =head1 NAME
 
-Apache::lonmsg: supports internal messaging
+Apache::lonmsgdisplay: supports internal messaging
 
 =head1 SYNOPSIS
 
-lonmsg provides routines for sending messages, receiving messages, and
-a handler to allow users to read, send, and delete messages.
+lonmsgdisplay provides a handler to allow users to read, send, 
+and delete messages, and to create and delete message folders,
+and to move messages between folders.
 
 =head1 OVERVIEW
 
@@ -93,25 +94,6 @@ addresses on their B<PREF> screen, but g
 are much more useful than traditional email can be made to be, even
 with HTML support.
 
-Right now, this document will cover just how to send a message, since
-it is likely you will not need to programmatically read messages,
-since lonmsg already implements that functionality.
-
-The routines used to package messages and unpackage messages are not
-only used by lonmsg when creating/extracting messages for LON-CAPA's
-internal messaging system, but also by lonnotify.pm which is available
-for use by Domain Coordinators to broadcast standard e-mail to specified
-users in their domain.  The XML packaging used in the two cases is very
-similar.  The differences are the use of <recuser>$uname</recuser> and 
-<recdomain>$udom</recdomain> in stored internal messages, compared 
-with <recipient username="$uname:$udom">$email</recipient> in stored
-Domain Coordinator e-mail for the storage of information about 
-recipients of the message/e-mail.
-
-=head1 FUNCTIONS
-
-=over 4
-
 =cut
 
 use strict;
@@ -119,6 +101,7 @@ use Apache::lonnet;
 use HTML::TokeParser();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
+use Apache::lonhtmlcommon();
 use Apache::lontexconvert();
 use HTML::Entities();
 use Apache::lonlocal;
@@ -153,6 +136,9 @@ sub folderlist {
 
     );
 
+	# set se lastvisit for the new mail check in the toplevel menu
+	&Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
+
     my %actions = &Apache::lonlocal::texthash(
                                 view => 'View Folder',
                                 rename => 'Rename Folder',
@@ -187,6 +173,7 @@ sub folderlist {
 
     $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
     my $output = qq|<script type="text/javascript">
+// <![CDATA[
 function folder_choice(targetform,caller) {
     var permfolders_keys = new Array('$permlistkeys');
     var permfolders_vals = new Array('$permlistvals');
@@ -228,6 +215,7 @@ function folder_choice(targetform,caller
         }
     }
 }
+// ]]>
 </script>|;
     my %show = ('select_form_order' => [10,20,50,100,200],
 		map {$_=>$_} (10,20,50,100,200));
@@ -253,16 +241,16 @@ function folder_choice(targetform,caller
      <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
          &Apache::loncommon::select_form('view','folderaction',%actions).'
      </td><td><br />'.
-    '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
+    '<input type="button" value="'.$lt{'go'}.'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
      </td>
     </tr>
    </table>
   </td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
   <td align="right">
    <table><tr><td><br />
-    <input type="button" value="'.&mt('Make New Folder').
-    '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
-    '<td align="center"><b>'.&mt('New Folder').'</b><br />'.
+    <input type="button" value="'.&mt('New Folder').
+    '" onclick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+    '<td align="center"><b>'.&mt('Name').'</b><br />'.
     '<input type="text" size="15" name="newfolder" value="" />
     </td></tr></table>
   </td>
@@ -309,11 +297,11 @@ sub scrollbuttons {
     }
     return
    '<b>'.&mt('Page').'</b>: '. 
-   '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
-   '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
-   '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
-   '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
+   '<input type="submit" name="firstview" value="|&lt;" />'.
+   '<input type="submit" name="prevview" value="&lt;" />'.
+   '<input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> of '.$maxdis.
+   '<input type="submit" name="nextview" value="&gt;" />'.
+   '<input type="submit" name="lastview" value="&gt;|" /><br />'.
    &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
 }
 # =============================================================== Status Change
@@ -370,7 +358,7 @@ sub makefolder {
         }
     } else {
         $outcome = 
-	    &mt('Error - could not obtain lock on email folders record.');
+	    &mt('Error - could not obtain lock on message folders record.');
     }
     return ($outcome,$warning);
 }
@@ -407,6 +395,9 @@ sub renamefolder {
     if ($env{'form.renamed'} eq '') {
         return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is an invalid name.',$folder,$newname);
     }
+    if (defined($permfolders{$folder})) {
+        return &mt('The folder "[_1]" may not be renamed as it is a folder provided by the system.',$folder);
+    }
     if (defined($permfolders{$newname})) {
         return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is reserved for folders provided automatically by the system.',$folder,$newname);
     }
@@ -516,7 +507,8 @@ sub movemsg {
 # ======================================================= Display a course list
 
 sub discourse {
-    my $result;
+    my ($statushash) = @_;
+    my ($result,$active,$previous,$future);
     my ($course_personnel,
 	$current_members,
 	$expired_members,
@@ -525,51 +517,80 @@ sub discourse {
     unshift @$current_members, (@$course_personnel);
     my %defaultUsers;
     
-    $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
+    my $tmptext;
+    if ($tmptext = &Apache::lonselstudent::render_student_list($current_members,
+                                                               "activeusers",
+                                                               "current",
+                                                               \%defaultUsers,
+                                                               1,"selectedusers",1,'email')
+       ) {
+       $result .= '<fieldset id="LC_activeusers"><legend><b>'.&mt('Bcc: course members with current access').'</b></legend><form name="activeusers">';
+       $result .= $tmptext.'</form></fieldset><br />';
+       if (ref($statushash) eq 'HASH') {
+           $statushash->{'active'} = 1;
+       }
+    }
+    if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
+                                                               "previoususers",
+                                                               "expired",
+                                                               \%defaultUsers,
+                                                               1, "selectedusers",0,'email')
+       ) {
+       $result .= '<fieldset id="LC_previoususers"><legend><b>'.&mt('Bcc: course members with expired access').'</b></legend><form name="futureusers">';
+       $result .= $tmptext.'</form></fieldset><br />';
+       if (ref($statushash) eq 'HASH') {
+           $statushash->{'previous'} = 1;
+       }
 
-    $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);
+    }
+    if ($tmptext = &Apache::lonselstudent::render_student_list($future_members,
+                                                               "futureusers",
+                                                               "future",
+                                                               \%defaultUsers,
+                                                               1, "selectedusers",0,'email')
+       ) {
+       $result .= '<fieldset id="LC_futureusers"><legend><b>'.&mt('Bcc: course members with future access').'</b></legend><form name="previoususers">';
+       $result .= $tmptext.'</form></fieldset>';
+       if (ref($statushash) eq 'HASH') {
+           $statushash->{'future'} = 1;
+       }
+
+    }
     return $result;
 }
 
 sub disgroup {
-    my ($cdom,$cnum,$group,$viewgrps,$editgrps) = @_;
-    my $result;
+    my ($r,$cdom,$cnum,$group,$access_status) = @_;
+    my $hasfloat;
     #  Needs to be in a course
     if (!($env{'request.course.fn'})) {
-        $result = &mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.');
-        return $result;
+        $r->print('<span class="LC_error">'.&mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.').'</span>');
+        return;
     }
     if ($cdom eq '' || $cnum eq '') {
-        $result = &mt('Error: could not determine domain or number of course');
-        return $result;
+        $r->print('<span class="LC_error">'.&mt('Error: could not determine domain or number of course').'</span>');
+        return;
     }
     my ($memberinfo,$numitems) =
                  &Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]);
     my @statustypes = ('active');
+    my $viewgrps = &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.
+                   ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+    my $editgrps = &Apache::lonnet::allowed('mdg',$env{'request.course.id'}.
+                   ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
     if ($viewgrps || $editgrps) {
         push(@statustypes,('future','previous'));
     }
     if (keys(%{$memberinfo}) == 0) {
-        $result = &mt('As this group has no members, there are no '.
-                      'recipients to select.');
-        return $result;
+        $r->print('<span class="LC_warning">'.
+                  &mt('As this group has no members, there are no recipients to select').
+                  '</span>');
+        return;
     } else {
-        $result = &mt('Select message recipients from the group members listed below.<br />');  
+        $hasfloat = 1;
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('<div class="LC_left_float">');
+        }
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -579,9 +600,9 @@ sub disgroup {
                                      'name'     => 'Name',
                                      'usnm'     => 'Username',
                                      'doma'     => 'Domain',
-                                     'active'   => 'Active Members',
-                                     'previous' => 'Former Members',
-                                     'future'   => 'Future Members',
+                                     'active'   => 'Broadcast to Active Members',
+                                     'previous' => 'Broadcast (Bcc) to Former Members',
+                                     'future'   => 'Broadcast (Bcc) to Future Members',
                                     );
         foreach my $user (sort(keys(%{$memberinfo}))) {
             my $status = $$memberinfo{$user}{status};
@@ -595,75 +616,81 @@ sub disgroup {
                 push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user);
             }
         }
-        $result .= &group_check_uncheck();
-        $result .= '<table border="0" cellspacing="8" cellpadding="2">'.
-                   '<tr>';
+        $r->print(&group_check_uncheck());
         foreach my $status (@statustypes)  {
             if (ref($numitems) eq 'HASH') {
                 if ((defined($$numitems{$status})) && ($$numitems{$status})) {
-                    $result.='<td valign="top">'.
-                             '<fieldset><legend><b>'.$lt{$status}.
-                             '</b></legend><nobr>'.
-                             '<input type="button" value="'.&mt('Check All').'" '.
-                             'onclick="javascript:toggleAll('."'".$status."','check'".')" />'.
-                             '&nbsp;&nbsp;'.
-                             '<input type="button" value="'.&mt('Uncheck All').'" '.
-                             'onclick="javascript:toggleAll('."'".$status."','uncheck'".')" />'.
-                             '</nobr></fieldset><br />'.
-                             &Apache::loncommon::start_data_table().
-                             &Apache::loncommon::start_data_table_header_row();
-                    $result .= "<th>$lt{'name'}</a></th>".
-                               "<th>$lt{'usnm'}</a></th>".
-                               "<th>$lt{'doma'}</a></th>".
-                    &Apache::loncommon::end_data_table_header_row();
+                    my $formname = $status.'users';
+                    if (ref($access_status) eq 'HASH') {
+                        $access_status->{$status} = $$numitems{$status};
+                    }
+                    $r->print('<fieldset><legend><b>'.$lt{$status}.
+                              '</b></legend><form name="'.$formname.'">'.
+                              '<span class="LC_nobreak">'.
+                              '<input type="button" value="'.&mt('Check All').'" '.
+                              'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
+                              '&nbsp;&nbsp;'.
+                              '<input type="button" value="'.&mt('Uncheck All').'" '.
+                              'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
+                              '</span>');
+                    if ($status eq 'active') {
+                        $r->print(('&nbsp;'x3).'<select name="groupmail">'.
+                                 '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
+                                 '<option value="cc">'.&mt('Cc').'</option>'.
+                               '</select>');
+                    }
+                    $r->print('<br />'.&Apache::loncommon::start_data_table().
+                               &Apache::loncommon::start_data_table_header_row().
+                               "<th>$lt{'name'}</th>".
+                               "<th>$lt{'usnm'}</th>".
+                               "<th>$lt{'doma'}</th>".
+                               &Apache::loncommon::end_data_table_header_row());
                     foreach my $key (sort(keys(%{$Sortby{$status}}))) {
                         foreach my $user (@{$Sortby{$status}{$key}}) {
-                            $result .=
-                                &Apache::loncommon::start_data_table_row().
-                                '<td><input type="checkbox" '.
+                            $r->print(&Apache::loncommon::start_data_table_row().
+                                '<td><span class="LC_nobreak"><input type="checkbox" '.
                                 'name="selectedusers_forminput" value="'.
                                 $user.':'.$status.'" />'.
-                                $$memberinfo{$user}{'fullname'}.'</td>'.
+                                $$memberinfo{$user}{'fullname'}.'</span></td>'.
                                 '<td>'.$$memberinfo{$user}{'uname'}.'</td>'.
                                 '<td>'.$$memberinfo{$user}{'udom'}.'</td>'.
-                                &Apache::loncommon::end_data_table_row();
+                                &Apache::loncommon::end_data_table_row());
                         }
                     }
-                    $result .= &Apache::loncommon::end_data_table();
+                    $r->print(&Apache::loncommon::end_data_table().'</form>'.
+                              '</fieldset><br />');
                 }
             }
-            $result .= '</td><td>&nbsp;&nbsp;</td>';
         }
-        $result .= '</tr></table>';
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div>');
+        }
     }
-    return $result;
+    return $hasfloat;
 }
 
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
-function toggleAll(caller,action) {
-    var pattern = new RegExp(":"+caller+"\$");
-    if (typeof(document.compemail.selectedusers_forminput.length)=="undefined") {
-        if (document.compemail.selectedusers_forminput.value.match(pattern)) {
-            if (action == 'check') {
-                document.groupmail.selectedusers_forminput.checked = true;
-            } else {
-                document.groupmail.selectedusers_forminput.checked = false;
-            }
+/ <![CDATA[
+function toggleAll(form,action) {
+    if (typeof(form.selectedusers_forminput.length)=="undefined") {
+         if (action == 'check') {
+            form.selectedusers_forminput.checked = true;
+         } else {
+            form.selectedusers_forminput.checked = false;
         }
     } else {
-        for (var i=0; i<document.compemail.selectedusers_forminput.length; i++) {
-            if (document.compemail.selectedusers_forminput[i].value.match(pattern)) {
-                if (action == 'check') {
-                    document.compemail.selectedusers_forminput[i].checked = true;
-                } else {
-                    document.compemail.selectedusers_forminput[i].checked = false;
-                }
+        for (var i=0; i<form.selectedusers_forminput.length; i++) {
+            if (action == 'check') {
+                form.selectedusers_forminput[i].checked = true;
+            } else {
+                form.selectedusers_forminput[i].checked = false;
             }
         }
     }
 }
+// ]]>
 </script>
     |;
 }
@@ -705,13 +732,13 @@ sub groupmail_header {
          {href=>"/adm/email?compose=group&amp;group=".
                 "$env{'form.group'}&amp;$refarg",
           text=>"Send a Message in a Group",
-          title=>"Compose Group Email Message"},);
+          title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
                          ({text=>"Messages being sent.",
-                           title=>"Messages sent"},);
+                           title=>"E-mails sent"},);
     }
-    my $groupheader = &Apache::loncommon::start_page('Group Email');
+    my $groupheader = &Apache::loncommon::start_page('Group Message');
     $groupheader .= &Apache::lonhtmlcommon::breadcrumbs
                 ('Group - '.$env{'form.group'}.' Email');
     return $groupheader;
@@ -725,7 +752,7 @@ sub groupmail_sent {
     }
     my $output .= '<br /><br /><a href="/adm/email?compose=group&amp;group='.
                   $group.'&amp;'.$refarg.'">'.
-                  &mt('Send another group email').'</a>'.'&nbsp;&nbsp;&nbsp;'.
+                  &mt('Send another group message').'</a>'.'&nbsp;&nbsp;&nbsp;'.
                   '<a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?'.
                   $refarg.'">'. &mt('Return to group page').'</a>';
     return $output;
@@ -735,28 +762,59 @@ sub groupmail_sent {
 
 sub discrit {
     my $r=shift;
-    my $header = '<h1><font color="red">'.&mt('Critical Messages').'</font></h1>'.
-        '<form action="/adm/email" method="POST">'.
-        '<input type="hidden" name="confirm" value="true" />';
+    my $header = '<h1>'.&mt('Critical Messages').'</h1>'
+                .'<div class="LC_warning">'
+                .&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.')
+                .'</div><br />'
+                .'<form action="/adm/email" method="post">'
+                .'<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
     foreach my $key (sort(keys(%what))) {
         my %content=&Apache::lonmsg::unpackagemsg($what{$key});
         next if ($content{'senderdomain'} eq '');
-        $result.='<hr />'.&mt('From').': <b>'.
-&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
-$content{'sendername'}.':'.
-            $content{'senderdomain'}.') '.$content{'time'}.
-            '<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').'" />';
+        $result .= &Apache::lonhtmlcommon::start_pick_box()
+                  .&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value')
+                  .'<b>'.&Apache::loncommon::aboutmewrapper(
+                   &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b>'
+                  .' ('.$content{'sendername'}.':'.$content{'senderdomain'}.')'
+                  .&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::row_title(&mt('Date'),undef,'LC_evenrow_value')
+                  .$content{'time'}
+                  .&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value')
+                  .$content{'subject'}
+                  .&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
+                  .'<pre>'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'</pre>'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
+                  .'<div class="LC_warning">';
+        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>'
+                  .&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::row_title('',undef,'LC_evenrow_value')
+                  .'<input type="submit" name="rec_'.$key.'" value="'.$rec_button.'" />';
+        if (!$content{'noreplies'}) {
+            $result .= '<input type="submit" name="reprec_'.$key.'" '
+                      .'value="'.$reprec_button.'" />'
+        }
+        $result .= &Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::end_pick_box()
+                  .'<br />';
     }
     # Check to see if there were any messages.
     if ($result eq '') {
@@ -774,7 +832,6 @@ sub sortedmessages {
     my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
-
     #unpack the varibles and repack into temp for sorting
     my @temp;
     my %descriptions;
@@ -788,8 +845,9 @@ sub sortedmessages {
     }
 
     foreach my $msgid (@messages) {
+        next if ($msgid eq '');
 	my $esc_msgid=&escape($msgid);
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
 	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
 					 \%status_cache);
         next if ($msgstatus ne '' && $msgstatus ne $status);
@@ -892,8 +950,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',
 		    );
@@ -925,28 +982,11 @@ sub disfolder {
                       nome => 'No messages have been selected to apply ths action to.',
                       chec => 'Check the checkbox for at least one message.',  
     );
+    my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
-    function checkall() {
-	for (i=0; i<document.forms.disall.delmark.length; i++) {
-	    document.forms.disall.delmark[i].checked=true;
-        }
-    }
-
-    function uncheckall() {
-	for (i=0; i<document.forms.disall.delmark.length; i++) {
-	    document.forms.disall.delmark[i].checked=false;
-        }
-    }
-    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; 
-    }
+// <![CDATA[
+    $jscript
 
     function validate_checkedaction() {
         document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
@@ -957,22 +997,28 @@ sub disfolder {
             } 
         }
         var checktotal = 0;
-        for (var i=0; i<document.forms.disall.delmark.length; i++) {
-            if (document.forms.disall.delmark[i].checked) {
+        if (document.forms.disall.delmark.length > 0) {
+            for (var i=0; i<document.forms.disall.delmark.length; i++) {
+                if (document.forms.disall.delmark[i].checked) {
+                    checktotal ++;
+                }
+            }
+        } else {
+            if (document.forms.disall.delmark.checked) {
                 checktotal ++;
             }
-        }
+        }   
         if (checktotal == 0) {
             alert("$lt{'nome'}\\n$lt{'chec'}");
             return;
         }
         document.disall.submit();
     }
-
+// ]]>
 </script>
 ENDDISHEADER
 
-    my $fsqs='&folder='.$folder;
+    my $fsqs='&amp;folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
     if ($totalnumber < 1) {
@@ -983,6 +1029,10 @@ ENDDISHEADER
         } else { 
             $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
         }
+        if ($numblocked > 0) {
+            $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+                                         \%setters));
+        }
 	return;
     }
     my $interdis = $env{'form.interdis'};
@@ -1000,48 +1050,50 @@ ENDDISHEADER
     $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      '<table class="LC_mail_list"><tr><th colspan="1">&nbsp;</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
-	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
-	$r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
     }
     $r->print('<th>');
     if ($env{'form.sortedby'} eq "revuser") {
-	$r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
     } else {
-	$r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revdomain") {
-	$r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
     } else {
-	$r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revsubject") {
-	$r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
     } else {
-    	$r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
+    	$r->print('<a href = "/adm/email?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revcourse") {
-        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "/adm/email?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
     } else {
-        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revstatus") {
-	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
-     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
+     	$r->print('<a href = "/adm/email?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
+    my $count = $firstdis;
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
 		@{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+            $count ++;
 	    if ($status eq 'new') {
 		$r->print('<tr class="LC_mail_new">');
 	    } elsif ($status eq 'read') {
@@ -1053,28 +1105,34 @@ ENDDISHEADER
 	    }
 	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
 	    if ($folder eq 'sent') {
-		if (defined($recv_name) && !defined($recv_domain)) {
-		    $dis_name   = join('<br />',@{$recv_name});
-		    $dis_domain = join('<br />',@{$recv_domain});
+                if (defined($recv_name) && defined($recv_domain)) {
+		    if (ref($recv_name) eq 'ARRAY' && 
+                        ref($recv_domain) eq 'ARRAY') {
+		        $dis_name   = join('<br />',@{$recv_name});
+		        $dis_domain = join('<br />',@{$recv_domain});
+                    }
 		} else {
 		    my $msg_id  = &unescape($origID);
 		    my %message = &Apache::lonnet::get('nohist_email'.$suffix,
 						       [$msg_id]);
 		    my %content = &Apache::lonmsg::unpackagemsg($message{$msg_id});
-		    $dis_name   = join('<br />',@{$content{'recuser'}});
-		    $dis_domain = join('<br />',@{$content{'recdomain'}});
+                    if (ref($content{'recuser'}) eq 'ARRAY') {
+		        $dis_name   = join('<br />',@{$content{'recuser'}});
+                    }
+                    if (ref($content{'recdomain'}) eq 'ARRAY') {
+		        $dis_domain = join('<br />',@{$content{'recdomain'}});
+                    }
 		}
 	    }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
-            my $count = $n +1;
-	    $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
+	    $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
                       '<input type="checkbox" name="delmark"'. 
-                      ' value="'.$origID.'" /></nobr></td>');
+                      ' value="'.$origID.'" /></span></td>');
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
-                          $item.(($status eq 'new')?'</b>':'').'</td>');
+                          $item.(($status eq 'new')?'</b>':'').'</a></td>');
             }
             my $showstatus;
             my %statushash = &get_msgstatus_types();
@@ -1098,11 +1156,11 @@ ENDDISHEADER
     $r->print('<table border="0" cellspacing="2" cellpadding="2">
  <tr>
   <td>'.
-  '<input type="button" onclick="javascript:checkall()" value="'.&mt('Check All').'" /><br />'."\n".
-  '<input type="button" onclick="javascript:uncheckall()" value="'.&mt('Uncheck All').'" />'."\n".
+  '<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".
+  '<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");
@@ -1137,17 +1195,24 @@ ENDDISHEADER
               '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
               '</tr></table>');
     my $postedstartdis=$startdis+1;
-    $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></form>');
+    $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {
-        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-        $r->print('<br /><br />'.
-                  &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock));
-        $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,
-                                                        \%setters));
+        $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+                                     \%setters));
     }
 }
 
+sub blocked_in_folder {
+    my ($numblocked,$startblock,$endblock,$setters) = @_;
+    my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+    my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+    my $output = '<br /><br />'.
+                  &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
+    $output .= &Apache::loncommon::build_block_table($startblock,$endblock,
+                                                     $setters);
+    return $output;
+}
+
 # ============================================================== Compose output
 
 sub compout {
@@ -1188,7 +1253,14 @@ sub compout {
           text=>"Display All Messages"});
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
-        $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 />');
+        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 />');
+        } else {
+            $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
+        }
+
     } else {
 	&printheader($r,'/adm/email?compose=upload',
 	     'Distribute from Uploaded File');
@@ -1198,42 +1270,126 @@ sub compout {
     my $dissub='';
     my $dismsg='';
     my $disbase='';
-    my $func=&mt('Send New');
+    my $attachrow;
+    my $func1='Send'; # do not translate here!
+    my %func2=( # do not translate here!
+               'ma'  => 'Message',
+               'msg' => 'Messages',
+              );
     my %lt=&Apache::lonlocal::texthash('us'  => 'Username',
 				       'do'  => 'Domain',
 				       'ad'  => 'Additional Recipients',
+                                       'rt'  => 'Reply to',
+                                       'ar'  => 'Allow replies',
 				       'sb'  => 'Subject',
 				       'ca'  => 'Cancel',
-				       'ma'  => 'Mail',
-                                       'msg' => 'Messages',
                                        'gen' => 'Generate messages from a file',
                                        'gmt' => 'General message text',
                                        'tff' => 'The file format for the uploaded portion of the message is',
                                        'uas' => 'Upload and Send',
+                                       'atta' => 'Attachment',
+                                       'to'   => 'To:',
                                       );
+    my %attachmax = (
+                     text => &mt('(128 KB max size)'),
+                     num  => 131072,
+                    );
+    if (!$forwarding && !$multiforward) {
+        $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}.': <input type="file" name="attachment" /></td></tr>';
+    }
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 				    '/'.$env{'request.course.sec'})) {
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
- '<p><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'</label> ' . $crithelp . 
- '</p><p>'.
- '<label><input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
- &mt('and return receipt') . '</label>' . $crithelp . 
- '</p><p><label><input type="checkbox" name="permanent" /> '.
-&mt('Send copy to permanent email address (if known)').'</label></p>'.
-'<p><label><input type="checkbox" name="rsspost" /> '.
-		  &mt('Include in course RSS newsfeed').'</label></p>';
-     }
+ '<span class="LC_nobreak"><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'.</label>'.$crithelp.'&nbsp;&nbsp;'.&mt('Require return receipt?').'<label><input type="radio" name="sendbck" value="1" />'.&mt('Yes').'</label>&nbsp;&nbsp;<label><input type="radio" name="sendbck" value="" checked="checked" />'.&mt('No').'</label></span><br />'.
+ '<label><input type="checkbox" name="permanent" /> '.
+&mt('Send copy to permanent e-mail address (if known)').'</label><br />'.
+'<label><input type="checkbox" name="rsspost" /> '.
+		  &mt('Include in course RSS newsfeed').'</label><br />';
+    }
+    if ($broadcast ne 'group') {
+        if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
+            &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
+                                     '/'.$env{'request.course.sec'})) {
+
+            $dispcrit.='<label>'.
+                       '<input type="checkbox" name="courserecord" value="1" /> '.
+                       &mt("Include in course's 'User records' for recipient(s)").
+                       '</label><br />';
+        }
+    }
+
     my %message;
     my %content;
+    my ($hasfloat,$broadcast_js,$sendmode,$can_grp_broadcast);
     my $defdom=$env{'user.domain'};
+    if ($broadcast eq 'group') {
+        my %access_status = (
+                           active => 0,
+                           previous => 0,
+                           future => 0,
+                      );
+ 
+        if ($group eq '') {
+            my $studentsel = &discourse(\%access_status);
+            if ($studentsel) {
+                if ($env{'environment.wysiwygeditor'} eq 'on') {
+                    $r->print($studentsel);
+                } else {
+                    $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+                }
+                $hasfloat = 1;
+            }
+        } else {
+            $can_grp_broadcast = &check_group_priv($group);
+            if ($can_grp_broadcast) {
+                $hasfloat = &disgroup($r,$cdom,$cnum,$group,\%access_status);
+            }
+        }
+        if ($hasfloat) {
+            $sendmode = '<input type="hidden" name="sendmode" value="group" />'."\n";
+            $broadcast_js = qq|
+<script type="text/javascript">
+// <![CDATA[
+function courseRecipients() {
+|;
+        foreach my $type (keys(%access_status)) {
+            if ($access_status{$type}) {
+                my $formname = $type.'users';
+                if ($type eq 'active' && $group ne '') {
+                    $broadcast_js .= qq|
+                    document.compemail.groupmail.value = document.$formname.groupmail[document.$formname.groupmail.selectedIndex].value;
+|;
+                }
+                $broadcast_js .= qq|
+    if (typeof(document.$formname.selectedusers_forminput.length)=="undefined") {
+        document.compemail.courserecips.value += '_&&&_'+document.$formname.selectedusers_forminput.value;
+    } else {
+        for (var i=0; i<document.$formname.selectedusers_forminput.length; i++) {
+            if (document.$formname.selectedusers_forminput[i].checked) {
+                document.compemail.courserecips.value += '_&&&_'+document.$formname.selectedusers_forminput[i].value;  
+            }
+        }
+    }
+                |;
+            }
+        }
+        $broadcast_js .= qq|
+    return;
+}
+// ]]>
+</script>
+
+|;
+        }
+    }
     if ($forwarding) {
 	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
 	%content=&Apache::lonmsg::unpackagemsg($message{$forwarding},$folder);
 	$dispcrit.='<input type="hidden" name="forwid" value="'.
 	    $forwarding.'" />';
-	$func=&mt('Forward');
+	$func1='Forward'; # do not translate here!
 	
 	$dissub=&mt('Forwarding').': '.$content{'subject'};
 	$dismsg=&mt('Forwarded message from').' '.
@@ -1247,7 +1403,7 @@ sub compout {
 	%content=&Apache::lonmsg::unpackagemsg($message{$replying},$folder);
 	$dispcrit.='<input type="hidden" name="replyid" value="'.
 	    $replying.'" />';
-	$func=&mt('Send Reply to');
+	$func1='Send Reply to'; # do not translate here!
 	
 	$dissub=&mt('Reply').': '.$content{'subject'};       
 	$dismsg='> '.$content{'message'};
@@ -1257,56 +1413,142 @@ sub compout {
 	if ($content{'baseurl'}) {
 	    $disbase='<input type="hidden" name="baseurl" value="'.&escape($content{'baseurl'}).'" />';
 	    if ($env{'user.adv'}) {
-		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Save message for re-use').
 		    '</label> <a href="/adm/email?showcommentbaseurl='.
 		    &escape($content{'baseurl'}).'" target="comments">'.
 		    &mt('Show re-usable messages').'</a><br />';
 	    }
 	}
+        my $jscript = &Apache::loncommon::check_uncheck_jscript();
+        $r->print(<<"ENDREPSCRIPT");
+<script type="text/javascript">
+// <![CDATA[
+$jscript
+// ]]>
+</script>
+ENDREPSCRIPT
     }
     my $citation=&displayresource(%content);
-    my ($can_grp_broadcast,$viewgrps,$editgrps);
+    my $onsubmit;
     if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
     if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
     if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
+    if ($hasfloat) {
+        if ($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print($broadcast_js);
+        } else {
+            $r->print($broadcast_js.'<div class="LC_left_float">');
+        }
+        $onsubmit = ' onsubmit="javascript:courseRecipients();" ';
+    }
     $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
-                ' enctype="multipart/form-data">'."\n".
-                '<input type="hidden" name="sendmail" value="on" />'."\n");
-    if ($broadcast eq 'group' && $env{'form.group'} ne '') {
-        $can_grp_broadcast = 
-                &Apache::lonnet::allowed('sgb',$env{'request.course.id'}.'/'.
-                                         $group);
-        $viewgrps = 
-               &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.
-               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
-        $editgrps = 
-               &Apache::lonnet::allowed('mdg',$env{'request.course.id'}.
-               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
-        if ($viewgrps || $editgrps || $can_grp_broadcast) {
-            $r->print(&disgroup($cdom,$cnum,$group,$viewgrps,$editgrps));
-        }
-    }
-    $r->print('<table>');
-    if (($broadcast eq 'group') && ($group ne '') && 
-        (!$can_grp_broadcast && !$viewgrps && !$editgrps)) {
+                ' enctype="multipart/form-data"'.$onsubmit.'>'."\n".
+                '<input type="hidden" name="sendmail" value="on" />'."\n".
+                '<table>');
+    if (($broadcast eq 'group') && ($group ne '') && (!$can_grp_broadcast)) {
         $r->print(&recipient_input_row($cdom,%lt));
-    } 
+    }
     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="3"><b>'.&mt('Replying to').'</b> ');
+            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 %recips;
+                &retrieve_recips('replying',\%content,\%recips);
+                if (ref($recips{'to'}) eq 'ARRAY') {
+                    if (@{$recips{'to'}} > 0) {
+                        my $replyall;
+                        if (@{$recips{'to'}} > 1) {
+                            $replyall = qq|
+ <span class="LC_nobreak">
+      <input type="button" value="check all"
+        onclick="javascript:checkAll(document.compemail.replying_to)" />
+        &nbsp;&nbsp;
+      <input type="button" value="uncheck all"
+        onclick="javascript:uncheckAll(document.compemail.replying_to)" />
+ </span>
+|;
+                        }
+                        my $tolist = join(' ',@{$recips{'to'}});
+                        $r->print('<tr><td colspan="3"><table><tr><td>'.&mt('[_1]Send reply[_2] to other recipients','<b>','</b>').':<br />'.$replyall.'</td><td>'.$tolist.'</td></tr></table></td></tr>');
+                    }
+                }
+                if (ref($recips{'cc'}) eq 'ARRAY') {
+                    if (@{$recips{'cc'}} > 0) {
+                        my $replyall;
+                        if (@{$recips{'cc'}} > 1) {
+                            $replyall = qq|
+ <span class="LC_nobreak">
+      <input type="button" value="check all"
+        onclick="javascript:checkAll(document.compemail.replying_cc)" />
+        &nbsp;&nbsp;
+      <input type="button" value="uncheck all"
+        onclick="javascript:uncheckAll(document.compemail.replying_cc)" />
+ </span>
+|;
+                        }
+                        my $cclist = join(' ',@{$recips{'cc'}});
+                        $r->print('<tr><td colspan="3"><table><tr><td>'.&mt('[_1]Cc[_2] to other copied recipients','<b>','</b>').':<br />'.$replyall.'</td><td>'.$cclist.'</td></tr></table></td></tr>');
+                    }
+                }
+                if ($content{'group'} ne '') {
+                    if (&check_group_priv($content{'group'})) {
+                        if (ref($recips{'group_cc_broadcast'}) eq 'ARRAY') {
+                            if (@{$recips{'group_cc_broadcast'}} > 0) {
+                                my $replyall;
+                                if (@{$recips{'group_cc_broadcast'}} > 1) {
+                                    $replyall = qq|
+ <span class="LC_nobreak">
+      <input type="button" value="check all"
+        onclick="javascript:checkAll(document.compemail.replying_groupcc)" />
+        &nbsp;&nbsp;
+      <input type="button" value="uncheck all"
+        onclick="javascript:uncheckAll(document.compemail.replying_groupcc)" />
+ </span>
+|;
+                                }
+                                my $groupcclist = join(' ',@{$recips{'group_cc_broadcast'}});
+                                $r->print('<tr><td colspan="3"><table><tr><td>'.&mt('[_1]Cc[_2] to other copied group members','<b>','</b>').':<br />'.$replyall.'</td><td>'.$groupcclist.'<input type="hidden" name="group" value="'.$content{'group'}.'" /><input type="hidden" name="sendmode" value="group" /><input type="hidden" name="groupmail" value="cc" /></td></tr></table></td></tr>');
+                            }
+                        }
+                    }
+                }
+            }
 	} else {
             $r->print(&recipient_input_row($defdom,%lt));
         }
     }
-    my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
+    my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'<br />';
     my $subj_size;
     if ($multiforward) {
         $r->print(&additional_rec_row(\%lt));
@@ -1314,7 +1556,7 @@ sub compout {
                   &mt('Unless you choose otherwise:').'<ul><li>'.
         &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.
         &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');
-        $func=&mt('Forward');
+        $func1='Forward'; # do not translate here!
         $dissub = &mt('Forwarding').': ';
         $subj_size = '10';
         my $extra = '&lt;'.&mt('original subject').'&gt;&nbsp;&nbsp;&nbsp;'.
@@ -1324,31 +1566,39 @@ sub compout {
         $r->print(&msg_subject_row($dissub,\%lt,$subj_size,$extra));
         $r->print('<tr><td>'.&mt('Message begins with:').'</td><td><input type="text" name="msgheader" value="'.$dismsg.'" />&nbsp;'.$sender.'&nbsp;&nbsp;&nbsp;<input type="radio" name="showorigsender" value="1" checked="checked" />'.&mt('Yes').'&nbsp;<input type="radio" name="showorigsender" value="0" />'.&mt('No').'<input type="hidden" name="multiforward" value="'.$multiforward.'" /></td></tr>
 </table>
-<br />'.
-$latexHelp.
-&mt("Any new text to display before the text of the original messages:").'<br />
-<textarea name="message" id="message" cols="80" rows="5" wrap="hard">
-</textarea></p><br />');
+<br /><table>
+<tr><td align="left">'."\n".
+$latexHelp."<br />\n".
+&mt("Any new text to display before the text of the original messages:").'<br />'."\n".
+'<textarea name="message" id="message" cols="80" rows="5" wrap="hard"></textarea>'.
+$wysiwyglink);
         my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
         foreach my $msg (@to_forward) {
             $r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');
         }
-        $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'msg'},
+        $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'msg'}),
                                      \%lt));
     } 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
+$attachrow
+</table><br />
+$latexHelp<br />
 <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
-</textarea></p><br />
+</textarea>$wysiwyglink
+$sendmode
 $dispcrit
 $disbase
 ENDCOMP
-        $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'ma'},
-                                     \%lt));
+        $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
+                                     \%lt,$hasfloat,$group));
         $r->print($citation);
         if (exists($env{'form.ref'})) {
             $r->print('<input type="hidden" name="ref" value="'.
@@ -1368,7 +1618,7 @@ Subject: <input type="text" size="50" na
 </p>
 <p>$lt{'gmt'}:<br />
 <textarea name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
-</textarea></p>
+</textarea>$wysiwyglink</p>
 <p>
 $lt{'tff'}:
 ENDBLOCK
@@ -1389,22 +1639,32 @@ $dispcrit
 <input type="submit" value="$lt{'uas'}" /></p>
 ENDUPLOAD
     }
-    if ($broadcast eq 'group') {
-       if ($group eq '') {
-           my $studentsel = &discourse();
-           $r->print($studentsel);
-       }
-    }
     if ($env{'form.displayedcrit'}) {
 	$r->print('<input type="hidden" name="displayedcrit" value="true" />');
     }
-    $r->print('</form>'.
-	      &Apache::lonfeedback::generate_preview_button('compemail','message').
-	      &Apache::lonhtmlcommon::htmlareaselectactive('message'));
+    $r->print('</form>');
+    if ($hasfloat) {
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div><div class="LC_clear_float_footer"></div>');
+        }
+    }
+    $r->print(&generate_preview_form);
+}
+
+sub check_group_priv {
+    my ($group) = @_;
+    my $cid = $env{'request.course.id'};
+    my $sec = $env{'request.course.sec'};
+    return if !$cid;
+    my $can_broadcast = &Apache::lonnet::allowed('sgb',$cid.'/'.$group);
+    my $viewgrps = &Apache::lonnet::allowed('vcg',$cid.($sec?'/'.$sec:''));
+    my $editgrps = &Apache::lonnet::allowed('mdg',$cid.($sec?'/'.$sec:''));
+    if ($viewgrps || $editgrps || $can_broadcast) {
+        return 1;
+    }
+    return;
 }
 
-# ---------------------------------------------------- Display all face to face
-
 sub recipient_input_row {
     my ($dom,%lt) = @_;
     my $domform = &Apache::loncommon::select_dom_form($dom,'recdomain');
@@ -1412,42 +1672,77 @@ 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="3"><span class="LC_nobreak"><b>$lt{'to'}</b> $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="3"><span class="LC_nobreak"><b>$lt->{'ar'}</b>:<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 $exmpl = &mt('username:domain,username:domain,...'); 
     my $output = <<"ENDADD";
-<tr><td>$lt->{'ad'}:<br /><tt>username:domain,username:domain, ...
-</tt></td><td>
-<input type="text" size="50" name="additionalrec" /></td></tr>
+<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <tt>($exmpl)</tt>:</legend><table>
+<tr><td>&nbsp;</td><td>$lt->{'to'}</td><td><input type="text" size="50" name="additionalrec_to" /></td></tr>
+<tr><td>&nbsp;</td><td>$cc</td><td><input type="text" size="50" name="additionalrec_cc" /></td></tr> 
+<tr><td>&nbsp;</td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
 ENDADD
     return $output;
 }
 
 sub submit_button_row {
-    my ($folder,$dismode,$sendtext,$lt) = @_;
-    my $output = qq| 
+    my ($folder,$dismode,$sendtext,$lt,$is_crsform,$group) = @_;
+    my $pre=&mt("Show Preview and Check Spelling");
+    my $value=&mt('Send');
+    my $prevbutton = '<input type="button" name="preview" value="'.$pre.'" onclick="if (typeof(document.compemail.onsubmit)=='."'function'".') {document.compemail.onsubmit();};document.preview.comment.value=document.compemail.message.value;document.preview.subject.value=document.compemail.subject.value;document.preview.submit();" />';
+    my $output = qq|
 <input type="hidden" name="folder" value="$folder" />
-<input type="hidden" name="dismode" value="$dismode" />
-<input type="submit" name="send" value="$sendtext" />
-<input type="submit" name="cancel" value="$lt->{'ca'}" /><hr />
+<input type="hidden" name="dismode" value="$dismode" />|;
+    if ($is_crsform) {
+        $output .= '<input type="hidden" name="courserecips" value="" />'."\n";
+        if ($group ne '') {
+            $output .= '<input type="hidden" name="groupmail" value="" />'."\n";
+        }
+    }
+    $output .= qq|
+<table><tr><td align="left">
+<input type="submit" name="send" value="$value" title="$sendtext" />
+<input type="submit" name="cancel" value="$lt->{'ca'}" />
+</td><td width="60">&nbsp;</td><td align="right">$prevbutton</td></tr></table>
 |;
     return $output;
 }
 
 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="3"><b>'.$lt->{'sb'}.'</b>:&nbsp;<input type="text" size="'.
                  $subj_size.'" name="subject" value="'.$dissub.'" />'.$extra.
                  '</td></tr>';
     return $output;
 }
 
+sub generate_preview_form {
+    my $prevbutton = (<<ENDPREVIEW);
+<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
+<input type="hidden" name="subject" />
+<input type="hidden" name="comment" />
+</form>
+ENDPREVIEW
+}
+
+# ---------------------------------------------------- Display all face to face
+
 sub retrieve_instructor_comments {
     my ($user,$domain)=@_;
     my $target=$env{'form.grade_target'};
@@ -1509,7 +1804,20 @@ sub disfacetoface {
                     '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
                     $content{'message'};
                 }
-            }    
+            }
+        } elsif ($content{'subject'}=~/^Archive/) {
+            $result.='<h3>'.&mt('Archived Message').'</h3>';
+            if (defined($content{'coursemsgid'})) {
+                my $crsmsgid = &escape($content{'coursemsgid'});
+                my $archive_message = &general_message($crsmsgid);
+                $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$archive_message;
+            } else {
+                %content=&Apache::lonmsg::unpackagemsg($content{'message'});
+                $content{'message'} =
+                '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br
+'.
+                $content{'message'};
+            }
         } else {
             $result.='<h3>'.&mt('Critical Message').'</h3>';
             if (defined($content{'coursemsgid'})) {
@@ -1534,7 +1842,7 @@ $content{'sendername'}.':'.
      }
     # Check to see if there were any messages.
     if ($result eq '') {
-        my $lctype = lc(&Apache::loncommon::course_type());
+        my $lctype = &mt(lc(&Apache::loncommon::course_type()));
 	if ($target ne 'tex') { 
 	    $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."</b></p>");
 	} else {
@@ -1568,11 +1876,11 @@ sub facetoface {
 	return;
     }
     my $crstype = &Apache::loncommon::course_type();
-    my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
+    my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
                                         : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
-		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
+		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
 # from query string
 
     if ($env{'form.recname'}) { $env{'form.recuname'}=$env{'form.recname'}; }
@@ -1587,25 +1895,27 @@ sub facetoface {
 	('stdselect','recuname','recdomain');
     my %lt=&Apache::lonlocal::texthash('user' => 'Username',
 				       'dom' => 'Domain',
-				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in $crstype",
+				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, Broadcast Messages and Archived Messages in $crstype",
 				       'subm' => 'Retrieve discussion and message records',
 				       'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
 				       'post' => 'Post this Record');
-    $r->print(<<"ENDTREC");
-<h3>$lt{'head'}</h3>
-<form method="post" action="/adm/email" name="stdselect">
-<input type="hidden" name="recordftf" value="retrieve" />
-<table>
-<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$env{'form.recuname'}" /></td>
-<td rowspan="2">
-$stdbrws
-<input type="submit" value="$lt{'subm'}" /></td>
-</tr>
-<tr><td>$lt{'dom'}:</td>
-<td>$domform</td></tr>
-</table>
-</form>
-ENDTREC
+
+    $r->print('<h2>'.$lt{'head'}.'</h2>'
+             .'<form method="post" action="/adm/email" name="stdselect">'
+             .'<input type="hidden" name="recordftf" value="retrieve" />'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title($lt{'user'})
+             .'<input type="text" size="12" name="recuname" value="'.$env{'form.recuname'}.'" />'
+             .' '.$stdbrws
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title($lt{'dom'})
+             .$domform
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .'<br />'
+             .'<input type="submit" value="'.$lt{'subm'}.'" />'
+    );
+
     if (($stage ne 'query') &&
         ($env{'form.recdomain'}) && ($env{'form.recuname'})) {
         chomp($env{'form.newrecord'});
@@ -1614,8 +1924,17 @@ ENDTREC
 						      $env{'form.recuname'},
 						      $env{'form.recdomain'});
         }
-        $r->print('<h3>'.&Apache::loncommon::plainname($env{'form.recuname'},
-				     $env{'form.recdomain'}).'</h3>');
+        my $aboutmelink=&Apache::loncommon::aboutmewrapper(
+                            &Apache::loncommon::plainname($env{'form.recuname'}
+                                                         ,$env{'form.recdomain'})
+                           ,$env{'form.recuname'},$env{'form.recdomain'});
+        $r->print('<hr />'
+                 .'<h2>'
+                 .&mt('Discussion and message records for [_1] ([_2])'
+                     ,$aboutmelink
+                     ,$env{'form.recuname'}.':'.$env{'form.recdomain'})
+                 .'<h2>'
+       );
         &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'});
 	$r->print(<<ENDRHEAD);
 <form method="post" action="/adm/email">
@@ -1644,15 +1963,15 @@ sub examblock {
 	$r->print('Not allowed');
 	return;
     }
-    my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
+    my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
 	                                                          : 'students';
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
             'cbds' => 'Communication blocking during scheduled exams',
             'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
              'mecb' => 'Modify existing communication blocking periods',
-             'ncbc' => 'No communication blocks currently stored',
-             'stor' => 'Store',
+             'ncbc' => 'No communication blocks currently saved',
+             'stor' => 'Save',
     );
 
     my %ltext = &Apache::lonlocal::texthash(
@@ -1854,7 +2173,7 @@ END
         foreach my $block (@{$typeorder}) {
             my $blockstatus = '';
             if ($blocks->{$block} eq 'on') {
-                $blockstatus = 'checked="true"';
+                $blockstatus = 'checked="checked"';
             }
             $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
         }
@@ -1921,7 +2240,7 @@ END
 sub blocktype_text {
     my %types = &Apache::lonlocal::texthash(
         'com' => 'Messaging',
-        'chat' => 'Chat',
+        'chat' => 'Chat Room',
         'boards' => 'Discussion',
         'port' => 'Portfolio',
         'groups' => 'Groups',
@@ -1950,12 +2269,12 @@ sub displaymessage {
         &build_block_table($r,$startblock,$endblock,\%setters);
         return;
     }
-    &statuschange($msgid,'read',$folder);
+    if ($msgstatus eq '') {
+        &statuschange($msgid,'read',$folder);
+    }
     my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
     my %content=&Apache::lonmsg::unpackagemsg($message{$msgid});
-
     my $counter=0;
-    $r->print('<pre>');
     my $escmsgid=&escape($msgid);
     foreach (@messages) {
 	if ($_->[5] eq $escmsgid){
@@ -1963,73 +2282,502 @@ 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.
-	      '"><b>'.&mt('Forward').'</b></a></td>'.
-	      '<td><a href="/adm/email?markunread='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-	      '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Delete').'</b></a></td>'.
-	      '<td><a href="/adm/email?'.$sqs.
-	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
+
+# Functions and Actions
+    my $li_start='<span class="LC_nobreak">&bull; ';
+    my $li_end='</span> ';
+
+# Prepare available functions
+    my @functionlist;
+    if (!$content{'noreplies'}) {
+        push(@functionlist,'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
+                     .&mt('Reply')
+                     .'</a>');
+    }
+    push(@functionlist,'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
+                  .&mt('Forward')
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
+                  .&mt('Mark Unread')
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
+                  .&mt('Delete')
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?'.$sqs.'">'
+                  .&mt('Back to Folder Display')
+                  .'</a>');
     if ($counter > 0){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
-		  '"><b>'.&mt('Previous').'</b></a></td>');
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+                          .&mt('Previous')
+                          .'</a>');
     }
     if ($counter < $number_of_messages - 1){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
-		  '"><b>'.&mt('Next').'</b></a></td>');
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+                          .&mt('Next')
+                          .'</a>');
+    }
+# Print functions
+    my $legendtext='<span class="LC_mail_functions">'
+                   .&mt('Functions')
+                   .'</span>';
+    my $showfunctionlist = $li_start.join($li_end.$li_start,@functionlist).$li_end;
+    $r->print('<div class="LC_left_float">'
+             .'<fieldset>'
+             .'<legend>'
+             .$legendtext
+             .'</legend>'
+             .$showfunctionlist
+             .'</fieldset>'
+             .'</div>'
+    );
+
+# Prepare available actions
+    my $symb;
+    if (defined($content{'symb'})) {
+        $symb = $content{'symb'};
+    } elsif (defined($content{'baseurl'})) {
+        $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }
-    $r->print('</tr></table>');
     if ($env{'user.adv'}) {
-	$r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
-	my $symb=&Apache::lonnet::symbread($content{'baseurl'});      
+        my @actionlist;
+
 	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>');
-	    }
+		push(@actionlist,&Apache::loncommon::track_student_link(
+                                      &mt('View recent activity')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,'check'));
+	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
-	    $r->print('<td><b>'.&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+	    push(@actionlist,&Apache::loncommon::pprmlink(
+                                  &mt('Set/Change parameters')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
-	    $r->print('<td><b>'.&Apache::loncommon::pgrdlink(&mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
-	}
-	$r->print('</tr></table>');
+	    push(@actionlist,&Apache::loncommon::pgrdlink(
+                                 &mt('Set/Change grades')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
+	}
+
+# Print actions
+        if (@actionlist) {
+            my $showactionlist = $li_start.join($li_end.$li_start,@actionlist).$li_end;
+            $legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
+                           ,'<span class="LC_mail_functions">','</span>');
+            $r->print('<div class="LC_left_float">'
+                     .'<fieldset>'
+                     .'<legend>'
+                     .$legendtext
+                     .'</legend>'
+                     .$showactionlist
+                     .'</fieldset>'
+                     .'</div>'
+            );
+        }
+    }
+
+    my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
+    if ($content{'recipid'}) {
+        $tonum = &retrieve_recips('display',\%content,\%recipients);
+        if (ref($recipients{'cc'}) eq 'ARRAY') {
+            $cclist = join(', ',@{$recipients{'cc'}});
+        }
+        if (ref($recipients{'to'}) eq 'ARRAY') {
+            $tolist = join(', ',@{$recipients{'to'}});
+        }
+        if (ref($recipients{'bcc'}) eq 'ARRAY') {
+            $bcclist = join(', ',@{$recipients{'bcc'}});
+        }
     }
-    my $tolist;
-    my @recipients = ();
-    for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
-        $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
-           &Apache::loncommon::plainname($content{'recuser'}[$i],
+
+    my $broadcast_link;
+    if (($content{'courseid'}) && ($content{'recipid'} &&
+        (ref($recipients{'course_broadcast'}) eq 'ARRAY') ||
+        (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
+        (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
+        $broadcast_link = &recipients_link($r,\%content,\%recipients);
+    }
+
+    if (((!$tolist) && (!$broadcast_link)) && ref($content{'recuser'}) eq 'ARRAY') {
+        my @recipients;
+        for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
+            $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
+               &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],$content{'recdomain'}[$i]).
+           ' ('.$content{'recuser'}[$i].':'.$content{'recdomain'}[$i].') ';
+        }
+        $tolist = join(', ',@recipients);
+    }
+    my ($restitle,$baseurl,$refers_to);
+    if (defined($content{'resource_title'})) {
+        $restitle = $content{'resource_title'};
+    } else {
+        if (defined($content{'baseurl'})) {
+            $restitle = &Apache::lonnet::gettitle($content{'baseurl'});
+        }
     }
-    $tolist = join(', ',@recipients);
-    $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
-	      ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
-	      &Apache::loncommon::aboutmewrapper(
-						 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
-						 $content{'sendername'},$content{'senderdomain'}).' ('.
-	      $content{'sendername'}.' at '.
-	      $content{'senderdomain'}.') ':'<br /><b>'.&mt('To').':</b> '.
-              $tolist).
-	      ($content{'courseid'}?'<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'}.
-	       ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):'').
-	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
-	      ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.
-	       $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').
-	      '<p><pre>'.
-	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
-	      '</pre><hr />'.&displayresource(%content).'</p>');
-    return;   
+    if (defined($content{'baseurl'})) {
+        $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
+    }
+    $r->print('<div class="LC_clear_float_footer">');
+    if ($from_student && $see_anonymous ) {
+	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
+    }
+
+    # Display LON-CAPA Message (Start)
+    # Subject
+    $r->print('</div>'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+             .$content{'subject'}
+             .&Apache::lonhtmlcommon::row_closure()
+    );
+    if ($folder eq 'sent') {
+        # To
+        if ($tolist) {
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+                     .$tolist
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
+        }
+        if ($cclist) {
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
+                     .$cclist
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
+        }
+        if ($bcclist) {
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('Bcc'))
+                     .$bcclist
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
+        }
+        if (($content{'courseid'}) && ($content{'recipid'})) {
+            my %broadcast_types = 
+                &Apache::lonlocal::texthash (
+                    course_broadcast    => 'Broadcast to', 
+                    group_cc_broadcast  => 'Cc to group',
+                    group_bcc_broadcast => 'Bcc to group',
+                );                   
+            foreach my $type (sort(keys(%broadcast_types))) {
+                if (ref($recipients{$type}) eq 'ARRAY') {
+                    my $num = @{$recipients{$type}};
+                    my $broadcastlist = join(', ',@{$recipients{$type}});
+                    if ($broadcastlist && $broadcast_link) {
+                        if ($type eq 'group_cc_broadcast') {
+                            $groupcclist = $broadcastlist;
+                        }
+                        $r->print(&Apache::lonhtmlcommon::row_title(
+                                            $broadcast_types{$type})
+                                  .&mt('[quant,_1,recipient]',$num)
+                                  .' <a href="javascript:showBroadcastList();">['
+                                  .&mt('Show').']</a>' 
+                                  .&Apache::lonhtmlcommon::row_closure());
+                    }
+                }
+            }
+        }
+        if ($content{'replytoaddr'}) {
+            my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+            if ($replytoname ne '' && $replytodom ne '') {
+                $r->print(&Apache::lonhtmlcommon::row_title(&mt('Reply To'))
+                         .$replytoname.':'.$replytodom
+                         .&Apache::lonhtmlcommon::row_closure()
+                );
+            }
+        }
+    } else {
+        # From, Reply
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('From'))
+                 .&Apache::loncommon::aboutmewrapper(
+                     &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+                                                 $content{'sendername'},$content{'senderdomain'})
+        );
+        if ($content{'noreplies'}) {
+            $r->print(' ('.&mt('No replies to sender').')'
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
+        } else {
+            if ($content{'replytoaddr'}) {
+                my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+                if ($replytoname ne '' && $replytodom ne '') {
+                    $r->print(&Apache::lonhtmlcommon::row_closure()
+                             .&Apache::lonhtmlcommon::row_title(&mt('Reply To'))
+                             .$replytoname.':'.$replytodom
+                             .&Apache::lonhtmlcommon::row_closure()
+                    );
+                } else {
+                    $r->print(&Apache::lonhtmlcommon::row_closure());
+                }
+            } else {
+                $r->print(' ('.$content{'sendername'}.':'.$content{'senderdomain'}.') '
+                         .&Apache::lonhtmlcommon::row_closure()
+                );
+            }
+            if ($tonum && $tolist) {
+                $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+                         .$tolist
+                         .&Apache::lonhtmlcommon::row_closure()
+                    );
+            }
+            if ($cclist) { 
+                $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
+                         .$cclist
+                         .&Apache::lonhtmlcommon::row_closure()
+                    );
+            }
+            if ($content{'group'} ne '') {
+                if (&check_group_priv($content{'group'})) {
+                    $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
+                    if ($groupcclist) {
+                        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
+                                 .$groupcclist
+                                 .&Apache::lonhtmlcommon::row_closure()
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    # Course
+    if ($content{'courseid'}) {
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
+                 .$courseinfo{'description'}
+        );
+        if ($content{'coursesec'}) {
+            $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+        }
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+    }
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Time'))
+             .$content{'time'}
+             .&Apache::lonhtmlcommon::row_closure()
+    );
+
+    # Refers to
+    if ($baseurl) {
+        if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
+            if ($content{'courseid'} eq $env{'request.course.id'}) {
+                my $symblink;
+                my $showsymb = &Apache::lonenc::check_decrypt($symb);
+                my $showurl = &Apache::lonenc::check_decrypt($baseurl);
+                my $encrypturl = &Apache::lonnet::EXT('resource.0.encrypturl',
+                              $showsymb,$env{'user.domain'},$env{'user.name'});
+                if ($symb) {
+                    if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
+                        $showsymb = &Apache::lonenc::check_encrypt($symb);
+                    }
+                    $symblink = '?symb='.$showsymb;
+                }
+                if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
+                    $showurl = $baseurl;
+                }
+                $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+                         .'<a href="'.$showurl.$symblink.'">'.$restitle.'</a>'
+                         .&Apache::lonhtmlcommon::row_closure()
+                );
+                $refers_to = 1;
+            }
+        }
+        if (!$refers_to) {
+            if ($baseurl =~ m-^/enc/-) {
+                if (defined($content{'courseid'})) {
+                    if (!$env{'request.course.id'}) {
+                        my $unencurl =
+                           &Apache::lonenc::unencrypted($baseurl,
+                                                        $content{'courseid'});
+                        if ($unencurl ne '') {
+                            if (&Apache::lonnet::allowed('bre',$unencurl)) {
+                                $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+                                         .'<a href="'.$unencurl.'">'.$restitle.'</a>'
+                                         .&Apache::lonhtmlcommon::row_closure()
+                                );
+                            }
+                        }
+                    }
+                }
+            } else {
+                if (&Apache::lonnet::allowed('bre',$baseurl)) {
+                    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+                             .'<a href="'.$baseurl.'">'.$restitle.'</a>'
+                             .&Apache::lonhtmlcommon::row_closure()
+                    );
+
+                }
+            }
+        }
+    }
+
+    # Message
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))
+             .'<pre>'
+	     .&Apache::lontexconvert::msgtexconverted($content{'message'},1)
+	     .'</pre>'
+    );
+    if (&displayresource(%content)) {
+        $r->print(&Apache::lonhtmlcommon::row_closure()
+                 .&Apache::lonhtmlcommon::row_title(&mt('Resource Details'))
+                 .&displayresource(%content)
+        );
+    } 
+    $r->print(&Apache::lonhtmlcommon::row_closure(1).
+              &Apache::lonhtmlcommon::end_pick_box());
+    # Display LON-CAPA Message (End)
+    return;
+}
+
+sub retrieve_recips {
+    my ($context,$content,$recips)= @_;
+    my $tonum = 0;
+    if (ref($content) eq 'HASH') {
+        my %reciphash =
+            &Apache::lonnet::get('nohist_emailrecip',[$content->{'recipid'}],
+                                 $content->{'senderdomain'},$content->{'sendername'});
+        my $recipinfo = $reciphash{$content->{'recipid'}};
+        if (ref($recipinfo) eq 'HASH') {
+            foreach my $type ('to','cc','course_broadcast','group_cc_broadcast','group_bcc_broadcast') {
+                if (ref($recipinfo->{$type}) eq 'HASH') {
+                    if ($type eq 'to') {
+                        $tonum = keys(%{$recipinfo->{$type}});
+                    }
+                    foreach my $user (sort(keys(%{$recipinfo->{$type}}))) {
+                        my ($uname,$udom) = split(/:/,$user);
+                        next if (($context eq 'replying') && ($uname eq $env{'user.name'})
+                                 && ($udom eq $env{'user.domain'}));
+                        my $showuser ='<span class="LC_nobreak">';
+                        if ($context eq 'replying') {
+                            if (($type eq 'to') || ($type eq 'cc')) { 
+                                $showuser = '<label><input type="checkbox" name="replying_'.$type.'" value="'.$user.'" />';
+                            } elsif ($type eq 'group_cc_broadcast') {
+                                $showuser = '<label><input type="checkbox" name="replying_groupcc" value="'.$user.'" />';
+                            }
+                        }
+                        $showuser .= &Apache::loncommon::aboutmewrapper(
+                                           &Apache::loncommon::plainname($uname,
+                                           $udom),$uname,$udom);
+		        if ($context eq 'replying') {
+		            $showuser .='</label>';
+		        }
+		        $showuser .= '</span>';
+                        if (ref($recips) eq 'HASH') {
+		            push(@{$recips->{$type}},$showuser);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return $tonum;
+}
+
+sub recipients_link {
+    my ($r,$content,$recipients) = @_;
+    my ($broadcast_link,$show);
+    if ((ref($content) eq 'HASH') && (ref($recipients) eq 'HASH')) {
+        if (ref($recipients->{'course_broadcast'}) eq 'ARRAY') {
+            if (@{$recipients->{'course_broadcast'}} > 0) {
+                $show = 'course';
+            }
+        } elsif (ref($recipients->{'group_cc_broadcast'}) eq 'ARRAY') {
+            if (@{$recipients->{'group_cc_broadcast'}} > 0) {
+                $show = 'group_cc';
+            }
+        } elsif (ref($recipients->{'group_bcc_broadcast'}) eq 'ARRAY') {
+            if (@{$recipients->{'group_bcc_broadcast'}} > 0) {
+                $show = 'group_bcc';
+            }
+        }
+        if ($show) {
+            my ($nothing,$height,$width,$start_page,$end_page,$body);
+            $nothing=&Apache::lonhtmlcommon::javascript_nothing();
+            $height = 400;
+            $width = 600;
+            $start_page =
+                &Apache::loncommon::start_page('Broadcast List', undef,
+                                               {only_body => 1,
+                                                js_ready  => 1,});
+            $end_page = &Apache::loncommon::end_page({js_ready => 1,});
+            $body = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
+                    &Apache::loncommon::start_data_table();
+            my $cell = 0;
+            $body .= &Apache::loncommon::start_data_table_row();
+            foreach my $item (@{$recipients->{$show.'_broadcast'}}) {
+                $item =~ s/'/\\'/g;
+                if (!($cell%2) && $cell > 0) {
+                    $body .= &Apache::loncommon::end_data_table_row().
+                             &Apache::loncommon::start_data_table_row();
+                }
+                $cell ++;
+                $body .= '<td>'.$cell.'&nbsp;'.$item.'&nbsp;&nbsp;</td>';
+            }
+            if ($cell%2) {
+                $body .= '<td>&nbsp;</td>';
+            }
+            $body .= &Apache::loncommon::end_data_table_row().
+                     &Apache::loncommon::end_data_table();
+            $body =~ s{</}{<\\/}g;
+            $body =~ s{\n}{}g;
+            $r->print(<<ENDJS);
+<script type="text/javascript">
+// <![CDATA[
+function showBroadcastList() {
+    var caller = this;
+    var newWindow = null;
+    try {
+        newWindow =  window.open($nothing,"broadcast","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" );
+    }
+    catch(error) {
+        writeWin(caller);
+        return;
+    }
+    if (newWindow) {
+        caller = newWindow;
+    }
+    writeWin(caller);
+    return;
+}
+
+function writeWin(caller) {
+    caller.document.writeln('$start_page $body $end_page');
+    caller.document.close();
+    caller.focus();
+}
+// ]]>
+</script>
+
+ENDJS
+            $broadcast_link = 1;
+        }
+    }
+    return $broadcast_link;
 }
 
 # =========================================================== Show the citation
@@ -2042,7 +2790,12 @@ sub displayresource {
 #
     if (($env{'request.course.id'} eq $content{'courseid'})
      && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
-	my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+        my $symb;
+        if (defined($content{'symb'})) {
+            $symb = $content{'symb'};
+        } else { 
+	    $symb=&Apache::lonnet::symbread($content{'baseurl'});
+        }
 # Could not get a symb, give up
 	unless ($symb) { return $content{'citation'}; }
 # Have a symb, can render
@@ -2071,15 +2824,14 @@ sub displayresource {
 
 sub header {
     my ($r,$title,$baseurl)=@_;
-    
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
-    $r->print(&Apache::loncommon::start_page('Communication and Messages',
+    $r->print(&Apache::loncommon::start_page('Communication',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-     		(($title?$title:'Communication and Messages')));
+     		(($title?$title:'Send and Receive Messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -2111,10 +2863,10 @@ sub storedcommentlisting {
     my ($r)=@_;
     my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
        '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
-    $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef,
+    $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
 					     {'onlybody' => 1}));
     if ((keys %msgs)[0]=~/^error\:/) {
-	$r->print(&mt('No stored comments yet.'));
+	$r->print(&mt('No saved comments yet.'));
     } else {
 	my $found=0;
 	foreach my $key (sort(keys(%msgs))) {
@@ -2122,7 +2874,7 @@ sub storedcommentlisting {
 	    $found=1;
 	}
 	unless ($found) {
-	    $r->print(&mt('No stored comments yet for this resource.'));
+	    $r->print(&mt('No saved comments yet for this resource.'));
 	}
     }
 }
@@ -2133,8 +2885,11 @@ sub sendoffmail {
     my ($r,$folder)=@_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my $sendstatus='';
-    my %specialmsg_status;
-    my $numspecial = 0;
+    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'};
@@ -2157,10 +2912,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'};
@@ -2169,50 +2927,109 @@ sub sendoffmail {
 	    &statuschange($msgid,'replied',$folder);
 	}
 
-	my @to =
-	    &Apache::loncommon::get_env_multiple('form.selectedusers_forminput');
 	my $mode = $env{'form.sendmode'};
+	my (%toaddr,$tos,$cc,$bcc,$broadcast);
 
-	my %toaddr;
-	if (@to) {
-	    foreach my $dest (@to) {
-		my ($user,$domain) = split(/:/, $dest);
-		if (($user ne '') && ($domain ne '')) {
-		    my $address = $user.":".$domain; # How the code below expects it.
-		    $toaddr{$address} = '';
-		}
-	    }
-	}
-
-	if ($env{'form.sendmode'} eq 'group') {
-	     foreach my $address (keys(%env)) {
-	 	if ($address=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-	 	    $toaddr{$1}='';
-	 	}
-	    }
-	} elsif ($env{'form.sendmode'} eq 'upload') {
+	if ($mode eq 'group') {
+            if (defined($env{'form.courserecips'})) {
+                my $courseusers = $env{'form.courserecips'};
+                $courseusers =~ s/^_\&\&\&_//;
+                my @to = split('_&&&_',$courseusers);
+                foreach my $dest (@to) {
+                    my ($user,$domain) = split(/:/, $dest);
+                    if (($user ne '') && ($domain ne '')) {
+                        my $rec = $user.":".$domain;
+                        $toaddr{$rec} = '';
+                        $broadcast->{$rec} = '';
+                    }
+                }
+            }
+	} elsif ($mode eq 'upload') {
+            $nosentstore = 0;
 	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
                 my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/);
 		if ($txt) {
                     $rec =~ s/^\s+//;
                     $rec =~ s/\s+$//;
 		    $toaddr{$rec}.=$txt."\n";
+                    $broadcast->{$rec} = '';
 		}
 	    }
 	} else {
 	    if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) {
 		$toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+                $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
 	    }
 	}
-	if ($env{'form.additionalrec'}) {
-	    foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {
+        if ($env{'form.additionalrec_to'}) {
+            foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_to'})) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    $tos->{$auname.':'.$audom}='';
+                }
+            }
+        }
+        if ($env{'form.replying_to'}) {
+            my @toreplies =
+                &Apache::loncommon::get_env_multiple('form.replying_to');
+            foreach my $rec (@toreplies) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    $tos->{$auname.':'.$audom}='';
+                }
+            }
+        }
+	if ($env{'form.additionalrec_cc'}) {
+	    foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_cc'})) {
 		my ($auname,$audom)=split(/:/,$rec);
 		if (($auname ne "") && ($audom ne "")) {
-		    $toaddr{$auname.':'.$audom}='';
+                    $toaddr{$auname.':'.$audom}='';
+                    if (!defined($tos->{$auname.':'.$audom})) {
+		        $cc->{$auname.':'.$audom}='';
+                    }
 		}
 	    }
 	}
-
+        if ($env{'form.replying_cc'}) {
+            my @ccreplies =
+                &Apache::loncommon::get_env_multiple('form.replying_cc');
+            foreach my $rec (@ccreplies) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    if (!defined($tos->{$auname.':'.$audom})) {
+                        $cc->{$auname.':'.$audom}='';
+                    }
+                }
+            }
+        }
+        if ($env{'form.replying_groupcc'}) {
+            my @groupreplies =
+                &Apache::loncommon::get_env_multiple('form.replying_groupcc');
+            foreach my $rec (@groupreplies) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    if (!defined($tos->{$auname.':'.$audom})) {
+                        $broadcast->{$auname.':'.$audom}='';
+                    }
+                }
+            }
+        }
+        if ($env{'form.additionalrec_bcc'}) {
+            foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) {
+                my ($auname,$audom)=split(/:/,$rec);
+                if (($auname ne "") && ($audom ne "")) {
+                    $toaddr{$auname.':'.$audom}='';
+                    if ((!defined($tos->{$auname.':'.$audom})) && 
+                        (!defined($cc->{$auname.':'.$audom}))) {
+                        $bcc->{$auname.':'.$audom}='';
+                    }
+                }
+            }
+        }
         my $savemsg;
         my $msgtype;
         my %sentmessage;
@@ -2228,120 +3045,166 @@ sub sendoffmail {
         } else {
             $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
         }
-	
+        my %reciphash = (
+                           to => $tos,
+                           cc => $cc,
+                           bcc => $bcc,
+                        );
+        if ($mode eq 'group') {
+            if ($group eq '') {
+                $reciphash{'course_broadcast'} = $broadcast;
+            } else {
+                if ($env{'form.groupmail'} eq 'cc') {
+                    $reciphash{'group_cc_broadcast'} = $broadcast;
+                } else {
+                    $reciphash{'group_bcc_broadcast'} = $broadcast;
+                }
+            }
+        }
+        my ($recipid,$recipstatus) = 
+            &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'},
+                                       $env{'user.domain'},\%reciphash);
+        if ($recipstatus ne 'ok') {
+            &Apache::lonnet::logthis('Failed to store To, 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))) {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
-	    if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }
+            if ($toaddr{$address}) {
+	        $msgtxt.='<hr />'.$toaddr{$address};
+            }
 	    my @thismsg;
-	    if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && 
-		(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-		 || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
-					     '/'.$env{'request.course.sec'}))) {
-		$r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': ');
+	    if ($msgtype eq 'critical') {
+		$r->print(&mt('Sending critical message').' '.
+                              $recuname.':'.$recdomain.': ');
 		@thismsg=
 		    &Apache::lonmsg::user_crit_msg($recuname,$recdomain,
 						   $msgsubj,$msgtxt,
 						   $env{'form.sendbck'},
 						   $env{'form.permanent'},
-						   \$sentmessage{$address});
+						   \$sentmessage{$address},
+                                                   $nosentstore,$recipid);
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
 		@thismsg=
 		    &Apache::lonmsg::user_normal_msg($recuname,$recdomain,
 						     $msgsubj,$msgtxt,
 						     $content{'citation'},
-						     undef,undef,
+						     undef,$attachmenturl,
 						     $env{'form.permanent'},
-						     \$sentmessage{$address});
-            }
-	    if (($env{'request.course.id'}) && (($msgtype eq 'critical') || 
-                                         ($env{'form.sendmode'} eq 'group'))) {
-	        $specialmsg_status{$recuname.':'.$recdomain} =
-		    join(' ',@thismsg);
-		foreach my $result (@thismsg) {
-		    if ($result eq 'ok') {
-			$numspecial++;
-		    }
-		}
+						     \$sentmessage{$address},
+                                                     undef,undef,undef,
+                                                     $nosentstore,$recipid);
+            }
+	    $msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg);
+	    if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) {  
+	        $numsent++;
+                push(@recusers,$recuname);
+                push(@recudoms,$recdomain);
 	    }
 	    $sendstatus.=' '.join(' ',@thismsg);
 	}
-        if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group')
-                                              || ($msgtype eq 'critical'))) {
-            my $subj_prefix;
-            if ($msgtype eq 'critical') {
-                $subj_prefix = 'Critical.';
-            } else {
-                $subj_prefix = 'Broadcast.';
-            }
-            my ($specialmsgid,$specialresult);
-            my $course_str = &escape('['.$cnum.':'.$cdom.']');
-
-            if ($numspecial) {
-                $specialresult = &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                    ' '.$course_str,$savemsg,undef,undef,undef,
-                    undef,undef,\$specialmsgid);
+        my $subj_prefix;
+        if ($numsent > 0) {
+            if (($env{'request.course.id'}) && 
+                (($mode eq 'group') ||
+                 ($env{'form.courserecord'}) ||
+                 ($msgtype eq 'critical')) ||
+                ($env{'form.replyid'} && 
+                 (($content{'courseid'} ne '') && 
+                  ($mode eq 'group')))) {
+                if ($msgtype eq 'critical') {
+                    $subj_prefix = 'Critical.';
+                } elsif ($mode eq 'group') {
+                    $subj_prefix = 'Broadcast.';
+                } else {
+                    $subj_prefix = 'Archive';
+                }
+                my ($specialmsgid,$specialresult);
+                my $course_str;
+                if ($env{'form.replyid'}) {
+                    if ($content{'courseid'} ne '') {
+                        my %crsdesc = 
+                            &Apache::lonnet::coursedescription($content{'courseid'},
+                                                               {'one_time' => 1});
+                        $course_str = &escape('['.$crsdesc{'num'}.':'.$crsdesc{'domain'}.']');
+                    }
+                } elsif ($env{'request.course.id'}) {
+                    $course_str = &escape('['.$cnum.':'.$cdom.']');
+                }
+                $specialresult = 
+                    &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
+                        $subj_prefix.' '.$course_str,$savemsg,undef,undef,
+                        $attachmenturl,undef,undef,\$specialmsgid,undef,undef,undef,
+                        undef,undef,1);
                 $specialmsgid = &unescape($specialmsgid);
-            }
-            if ($specialresult eq 'ok') {
-                my $record_sent;
-                my @recusers;
-                my @recudoms;
-                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
-		    split(/\:/,&unescape($specialmsgid));
-
-                foreach my $recipient (sort(keys(%toaddr))) {
-                    if ($specialmsg_status{$recipient} eq 'ok') {
-                        my $usersubj = $subj_prefix.'['.$recipient.']';
-                        my $usermsgid = 
-			    &Apache::lonmsg::buildmsgid($stamp,$usersubj,
-							$msgname,$msgdom,
-							$msgcount,$context,
-							$pid);
-                        &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                                             ' ['.$recipient.']',$msgsubj,undef,
-                        undef,undef,undef,$usermsgid,undef,undef,$specialmsgid);
-                        my ($uname,$udom) = split(/:/,$recipient);
-                        push(@recusers,$uname);
-                        push(@recudoms,$udom);
-                    }
-                }
-                if (@recusers) {
-                    my $specialmessage;
-                    my $sentsubj = 
-			$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj;
-                    $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
-                    my $sentmsgid = 
-			&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname,
-						    $msgdom,$msgcount,$context,
-						    $pid);
-                    ($specialmsgid,$specialmessage) = &Apache::lonmsg::packagemsg($msgsubj,$savemsg,
-                            undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
-                    $record_sent = &Apache::lonmsg::store_sent_mail($specialmsgid,$specialmessage);
+                if ($specialresult eq 'ok') {
+                    my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+		        split(/\:/,&unescape($specialmsgid));
+
+                    foreach my $recipient (sort(keys(%toaddr))) {
+                        if ($msg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
+                            my $usersubj = $subj_prefix.'['.$recipient.']';
+                            my $usermsgid = 
+			        &Apache::lonmsg::buildmsgid($stamp,$usersubj,
+							    $msgname,$msgdom,
+							    $msgcount,$context,
+							    $pid);
+                            &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
+                                $subj_prefix.' ['.$recipient.']',$msgsubj,
+                                undef,undef,$attachmenturl,undef,$usermsgid,undef,
+                                undef,$specialmsgid,undef,undef,undef,1);
+                        }
+                    }
+                    if (($mode ne 'upload') && (@recusers > 0)) {
+                        &Apache::lonmsg::process_sent_mail($msgsubj,
+                           $subj_prefix,$numsent,$stamp,$msgname,$msgdom,
+                           $msgcount,$context,$pid,$savemsg,\@recusers,
+                           \@recudoms,undef,$attachmenturl,'','','','',$recipid);
+                    }
+                } else {
+                    &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 {
-                &Apache::lonnet::logthis('Failed to create record of critical message or broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
+                my $stamp = time;
+                my $msgcount = &Apache::lonmsg::get_uniq();
+                my $context = &Apache::lonmsg::get_course_context();
+                &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix,
+                       $numsent,$stamp,$env{'user.name'},
+                       $env{'user.domain'},$msgcount,$context,
+                       $$,$savemsg,\@recusers,\@recudoms,undef,$attachmenturl,
+                       '','','','',$recipid);
             }
         }
-    } else {
-	&printheader($r,'','No messages sent.'); 
-    }
-    if (!$env{'form.multiforward'}) { 
-        if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	    $r->print('<br /><span class="LC_success">'.&mt('Completed.').
-                      '</span>');
-	    if ($env{'form.displayedcrit'}) {
-	        &discrit($r);
+        if (!$env{'form.multiforward'}) { 
+            if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
+                          '</span>');
+	        if ($env{'form.displayedcrit'}) {
+	            &discrit($r);
+                }
+                if ($group ne '') {
+                    $r->print(&groupmail_sent($group,$cdom,$cnum)); 
+	        } else {
+	            &Apache::loncommunicate::menu($r);
+	        }
+            } else {
+	        $r->print('<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'<br /> '.
+		          &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
             }
-            if ($group ne '') {
-                $r->print(&groupmail_sent($group,$cdom,$cnum)); 
-	    } else {
-	        &Apache::loncommunicate::menu($r);
-	    }
-        } 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>');
         }
     }
     return $sendstatus;
@@ -2366,7 +3229,7 @@ sub handler {
          'recordftf','sortedby','block','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
          'msgstatus']);
-    $sqs='&sortedby='.$env{'form.sortedby'};
+    $sqs='&amp;sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
     unless ($env{'form.block'}) {
@@ -2387,7 +3250,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs.='&folder='.&escape($folder);
+	$sqs.='&amp;folder='.&escape($folder);
     }
 # ------------------------------------------------------------ Get Display Mode
 
@@ -2419,7 +3282,7 @@ sub handler {
 	$startdis++;
     }
     my $postedstartdis=$startdis+1;
-    $sqs.='&startdis='.$postedstartdis;
+    $sqs.='&amp;startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output
 
@@ -2431,16 +3294,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) {
@@ -2572,7 +3438,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 {
@@ -2586,8 +3452,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);
@@ -2638,7 +3506,7 @@ sub handler {
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+            $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
         } else {
             $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
                       $warning);
@@ -2653,7 +3521,8 @@ sub handler {
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+            $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
+            $env{'form.folder'} = '';
         } else {
             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
             $showfolder = $folder;
@@ -2665,7 +3534,7 @@ sub handler {
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+            $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
         } else {
             $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
             $showfolder = $folder;
@@ -2684,8 +3553,6 @@ sub handler {
 
 =pod
 
-=back
-
 =cut
 
 1;