--- loncom/interface/lonmsgdisplay.pm	2006/04/23 05:49:57	1.10
+++ loncom/interface/lonmsgdisplay.pm	2006/12/23 06:19:10	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.10 2006/04/23 05:49:57 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.56 2006/12/23 06:19:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,8 +74,8 @@ email program, so they have full access
 interface, or other features they may wish to use in response to the
 student's query.
 
-=item * B<Blocking>: LON-CAPA can block display of e-mails that are 
-sent to a student during an online exam. A course coordinator or
+=item * B<Blocking>: LON-CAPA can block selected communication 
+features for students during an online exam. A course coordinator or
 instructor can set an open and close date/time for scheduled online
 exams in a course. If a user uses the LON-CAPA internal messaging 
 system to display e-mails during the scheduled blocking event,  
@@ -125,6 +125,9 @@ use Apache::lonlocal;
 use Apache::loncommunicate;
 use Apache::lonfeedback;
 use Apache::lonrss();
+use Apache::lonselstudent();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 # Querystring component with sorting type
 my $sqs;
@@ -134,39 +137,184 @@ my $interdis;
 # ============================================================ List all folders
 
 sub folderlist {
-    my $folder=shift;
-    my @allfolders=&Apache::lonnet::getkeys('email_folders');
-    if ($allfolders[0]=~/^error:/) { @allfolders=(); }
-    return '<form method="post" action="/adm/email">'.
-	&mt('Folder').': '.
-	&Apache::loncommon::select_form($folder,'folder',
-			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
-			      'new' => &mt('New Messages Only'),
-                              'critical' => &mt('Critical'),
-			      'sent' => &mt('Sent Messages'),
-			      map { $_ => $_ } @allfolders)).
-			      ' '.&mt('Show').
-			      '<select name="interdis">'.
-			      join("\n",map { '<option value="'.$_.'"'.
-	 ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' }
-				   (10,20,50,100,200)).'</select>'.	
-   '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
+    my ($folder,$msgstatus) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                actn => 'Action',
+                fold => 'Folder',
+                show => 'Show',
+                status => 'Message Status',
+                go   => 'Go',
+                nnff => 'New Name for Folder',
+                newn => 'New Name',
+                thfm => 'The folder may not be renamed',
+                fmnb => 'folder may not be renamed as it is a folder provided by the system.',
+                asth => 'as this name is already in use for a system-provided or user-defined folder.',
+                the => 'The',
+                tnfm => 'The new folder may not be named',
+
+    );
+
+    my %actions = &Apache::lonlocal::texthash(
+                                view => 'View Folder',
+                                rename => 'Rename Folder',
+                                delete => 'Delete Folder',
+    );
+    $actions{'select_form_order'} = ['view','rename','delete'];
+
+    my %statushash = &get_msgstatus_types();
+
+    $statushash{'select_form_order'} = ['','new','read','replied','forwarded'];
+
+    my %permfolders = &get_permanent_folders();
+    my $permlist = join("','",sort(keys(%permfolders)));
+    my ($permlistkeys,$permlistvals);
+    foreach my $key (sort(keys(%permfolders))) {
+        $permlistvals .= $permfolders{$key}."','";
+        $permlistkeys .= $key."','";
+    }
+    $permlistvals =~ s/','$//;
+    $permlistkeys =~ s/','$//;
+    my %gotfolders = &Apache::lonmsg::get_user_folders();
+    my %userfolders;
+
+    foreach my $key (keys(%gotfolders)) {
+        $key =~ s/(['"])/\$1/g; #' stupid emacs
+        $userfolders{$key} = $key;
+    }
+    my @userorder = sort(keys(%userfolders));
+    my %formhash = (%permfolders,%userfolders);
+    my $folderlist = join("','",@userorder);
+    $folderlist .= "','".$permlistvals;
+
+    $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
+    my $output = qq|<script type="text/javascript">
+function folder_choice(targetform,caller) {
+    var permfolders_keys = new Array('$permlistkeys');
+    var permfolders_vals = new Array('$permlistvals');
+    var allfolders = new Array('$folderlist');
+    if (caller == 'change') {
+        if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
+            for (var i=0; i<permfolders_keys.length; i++) {
+                if (permfolders_keys[i] == targetform.folder.value) {
+                    alert("$lt{'the'} '"+permfolders_vals[i]+"' $lt{'fmnb'}");
+                    return;
+                }
+            }
+            var foldername=prompt('$lt{'nnff'}','$lt{'newn'}');
+            if (foldername) {
+                targetform.renamed.value=foldername;
+                for (var i=0; i<allfolders.length; i++) {
+                    if (allfolders[i] == foldername) {
+                        alert("$lt{'thfm'} '"+foldername+"' $lt{'asth'}");
+                        return;
+                    }
+                }
+                targetform.submit();
+            }
+        }
+        else {
+            targetform.submit();
+        }
+    }
+    if (caller == 'new') {
+        var newname=targetform.newfolder.value;
+        if (newname) {
+            for (var i=0; i<allfolders.length; i++) {
+                if (allfolders[i] == newname) {
+                    alert("$lt{'tnfm'} '"+newname+"' $lt{'asth'}");
+                    return;
+                }
+            }
+            targetform.submit();
+        }
+    }
+}
+</script>|;
+    $output .= '
+<form method="post" action="/adm/email" name="folderlist">
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+  <td align="left">
+   <table border="0" cellspacing="2" cellpadding="2">
+    <tr>
+     <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
+         &Apache::loncommon::select_form($folder,'folder',%formhash).'
+     </td>
+     <td align="center"><b>'.$lt{'show'}.'</b><br />
+      <select name="interdis">'.
+          join("\n",map { '<option value="'.$_.'"'.
+			      ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' 
+			}
+	       (10,20,50,100,200)).'</select>
+     </td>
+     <td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".
+       &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
+     </td>
+     <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'".');" />
+     </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="text" size="15" name="newfolder" value="" />
+    </td></tr></table>
+  </td>
+ </tr>
+</table>'."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
-			      ($folder=~/^(new|critical)/?'</form>':'');
+    '<input type="hidden" name="renamed" value="" />'.
+        ($folder=~/^critical/?'</form>':'');
+    return $output;
+}
+
+sub get_permanent_folders {
+    my %permfolders = 
+	&Apache::lonlocal::texthash(''         => 'INBOX',
+				    'trash'    => 'TRASH',
+				    'critical' => 'Critical',
+				    'sent'     => 'Sent Messages',
+				    );
+    return %permfolders;
+}
+
+sub get_msgstatus_types {
+    my %statushash = &Apache::lonlocal::texthash(
+                                '' => 'Any',
+                                new => 'Unread',
+                                read => 'Read',
+                                replied => 'Replied to',
+                                forwarded => 'Forwarded',
+    );
+    return %statushash;
 }
 
 sub scrollbuttons {
-    my ($start,$maxdis,$first,$finish,$total)=@_;
+    my ($start,$maxdis,$first,$finish,$total,$msgstatus)=@_;
     unless ($total>0) { return ''; }
     $start++; $maxdis++;$first++;$finish++;
+
+    my %statushash = &get_msgstatus_types();
+    my $status;
+    if ($msgstatus eq '') {
+        $status = &mt('All');
+    } else {
+        $status = $statushash{$msgstatus};
+    }
     return
-   &mt('Page').': '. 
+   '<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 />'.
-   &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
+   &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
 }
 # =============================================================== Status Change
 
@@ -192,14 +340,123 @@ sub statuschange {
 # ============================================================= Make new folder
 
 sub makefolder {
-    my ($newfolder)=@_;
-    if (($newfolder eq 'sent')
-     || ($newfolder eq 'critical')
-     || ($newfolder eq 'trash')
-     || ($newfolder eq 'new')) { return; }
-    &Apache::lonnet::put('email_folders',{$newfolder => time});
+    my ($newfolder) = @_;
+    my %permfolders = &get_permanent_folders();
+    my %userfolders = &Apache::lonmsg::get_user_folders();
+    my ($outcome,$warning);
+    if (defined($userfolders{$newfolder})) {
+        return &mt('The folder name: "[_1]" is already in use for an existing folder.',$newfolder);
+    }
+    foreach my $perm (keys(%permfolders)) {
+        if ($permfolders{$perm} eq $newfolder) {
+            return &mt('The folder name: "[_1]" is already used for one of the folders automatically generated by the system.',$newfolder);
+        }
+    } 
+    if (&get_msgfolder_lock() eq 'ok') {
+        my %counter_hash = &Apache::lonnet::get('email_folders',["\0".'idcount']);
+        my $lastcount = $counter_hash{"\0".'idcount'};
+        my $folder_id = $lastcount + 1;
+        while (defined($userfolders{$folder_id})) {
+            $folder_id ++;
+        }
+        my %folderinfo = ( id      => $folder_id,
+                           created => time, );
+        $outcome =  
+	    &Apache::lonnet::put('email_folders',{$newfolder => \%folderinfo,
+						  "\0".'idcount' => $folder_id});
+        my $releaseresult = &release_msgfolder_lock();
+        if ($releaseresult ne 'ok') {
+            $warning = $releaseresult;
+        }
+    } else {
+        $outcome = 
+	    &mt('Error - could not obtain lock on email folders record.');
+    }
+    return ($outcome,$warning);
+}
+
+# ============================================================= Delete folder
+
+sub deletefolder {
+    my ($folder)=@_;
+    my %permfolders = &get_permanent_folders();
+    if (defined($permfolders{$folder})) {
+        return &mt('The folder "[_1]" may not be deleted',$folder); 
+    }
+    my %userfolders = &Apache::lonmsg::get_user_folders();
+    if (!defined($userfolders{$folder})) {
+        return &mt('The folder "[_1]" does not exist so deletion is not required.',
+                   $folder);
+    }
+    # check folder is empty;
+    my $suffix=&Apache::lonmsg::foldersuffix($folder);
+    my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
+    if (@messages > 0) {
+        return &mt('The folder "[_1]" contains messages so it may not be deleted.',$folder).
+               '<br />'.
+               &mt('Delete or move the messages to a different folder first.');
+    }
+    my $delresult = &Apache::lonnet::del('email_folders',[$folder]);
+    return $delresult;
+}
+
+sub renamefolder {
+    my ($folder) = @_;
+    my $newname = $env{'form.renamed'};
+    my %permfolders = &get_permanent_folders();
+    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{$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);
+    }
+    my %userfolders = &Apache::lonmsg::get_user_folders();
+    if (defined($userfolders{$newname})) {
+        return &mt('The folder "[_1]" may not be renamed to "[_2]" because the new name you requested is already being used for an existing folder.',$folder,$newname);
+    }
+    if (!defined($userfolders{$folder})) {
+        return &mt('The folder "[_1]" could not be renamed to "[_2]" because the folder does not exist.',$folder,$newname);
+    }
+    my %folderinfo;
+    if (ref($userfolders{$folder}) eq 'HASH') {
+        %folderinfo = %{$userfolders{$folder}};
+    } else {
+        %folderinfo = ( id      => $folder,
+                        created => $userfolders{$folder},);
+    }
+    my $outcome =
+     &Apache::lonnet::put('email_folders',{$newname => \%folderinfo});
+    if ($outcome eq 'ok') {
+        $outcome = &Apache::lonnet::del('email_folders',[$folder]);
+    }
+    return $outcome;
+}
+
+sub get_msgfolder_lock {
+    # get lock for mail folder counter.
+    my $lockhash = { "\0".'lock_counter' => time, };
+    my $tries = 0;
+    my $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
+    while (($gotlock ne 'ok') && $tries <3) {
+        $tries ++;
+        sleep(1);
+        $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
+    }
+    return $gotlock;
+}
+
+sub release_msgfolder_lock {
+    #  remove lock
+    my @del_lock = ("\0".'lock_counter');
+    my $dellockoutcome=&Apache::lonnet::del('email_folders',\@del_lock);
+    if ($dellockoutcome ne 'ok') {
+        return ('<br />'.&mt('Warning: failed to release lock for counter').'<br />');
+    } else {
+        return 'ok';
+    }
 }
 
+
 # ======================================================== Move between folders
 
 sub movemsg {
@@ -214,7 +471,7 @@ sub movemsg {
 # Copy message
     my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
     if (!exists($message{$msgid}) || $message{$msgid} eq '') {
-	if (&Apache::slotrequest::network_error(%message)) {
+	if (&Apache::lonnet::error(%message)) {
 	    return (0,&mt('Message not moved, A network error occurred.'));
 	} else {
 	    return (0,&mt('Message not moved as the message is no longer in the source folder.'));
@@ -223,7 +480,7 @@ sub movemsg {
 
     my $result =&Apache::lonnet::put('nohist_email'.$trgsuffix,
 				     {$msgid => $message{$msgid}});
-    if (&Apache::slotrequest::network_error($result)) {
+    if (&Apache::lonnet::error($result)) {
 	return (0,&mt('Message not moved, A network error occurred.'));
     }
 
@@ -231,12 +488,12 @@ sub movemsg {
     unless ($trgfolder eq 'trash') {
        	my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
 	# a non-existant status is the mark of an unread msg
-	if (&Apache::slotrequest::network_error(%status)) {
+	if (&Apache::lonnet::error(%status)) {
 	    return (0,&mt('Message copied to new folder but status was not, A network error occurred.'));
 	}
 	my $result=&Apache::lonnet::put('email_status'.$trgsuffix,
 					{$msgid => $status{$msgid}});
-	if (&Apache::slotrequest::network_error($result)) {
+	if (&Apache::lonnet::error($result)) {
 	    return (0,&mt('Message copied to new folder but status was not, A network error occurred.'));
 	}
     }
@@ -246,10 +503,10 @@ sub movemsg {
 	&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
     my $result_del_stat =
 	&Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);
-    if (&Apache::slotrequest::network_error($result_del_msg)) {
+    if (&Apache::lonnet::error($result_del_msg)) {
 	return (0,&mt('Message copied, but unable to delete the original from the source folder.'));
     }
-    if (&Apache::slotrequest::network_error($result_del_stat)) {
+    if (&Apache::lonnet::error($result_del_stat)) {
 	return (0,&mt('Message copied, but unable to delete the original status from the source folder.'));
     }
 
@@ -259,89 +516,219 @@ sub movemsg {
 # ======================================================= Display a course list
 
 sub discourse {
-    my $r=shift;
-    my $classlist = &Apache::loncoursedata::get_classlist();
-    my $now=time;
-    my %lt=&Apache::lonlocal::texthash('cfa' => 'Check All',
-            'cfs' => 'Check Section/Group',
-            'cfn' => 'Uncheck All');
-    $r->print(<<ENDDISHEADER);
-<input type="hidden" name="sendmode" value="group" />
-<script>
-    function checkall() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
-	      document.forms.compemail.elements[i].checked=true;
+    my $result;
+    my ($course_personnel,
+	$current_members,
+	$expired_members,
+	$future_members) = 
+	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'});
+    unshift @$current_members, (@$course_personnel);
+    my %defaultUsers;
+    
+    $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
+
+    $result .= &Apache::lonselstudent::render_student_list($current_members,
+							   "compemail",
+							   "current",
+							   \%defaultUsers,
+							   1,"selectedusers",1);
+
+    $result .= &Apache::lonselstudent::render_student_list($expired_members,
+							   "compemail",
+							   "expired",
+							   \%defaultUsers,
+							   1, "selectedusers",0);
+    $result .= &Apache::lonselstudent::render_student_list($future_members,
+							   "compemail",
+							   "future",
+							   \%defaultUsers,
+							   1, "selectedusers", 0);
+    return $result;
+}
+
+sub disgroup {
+    my ($cdom,$cnum,$group,$viewgrps,$editgrps) = @_;
+    my $result;
+    #  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;
+    }
+    if ($cdom eq '' || $cnum eq '') {
+        $result = &mt('Error: could not determine domain or number of course');
+        return $result;
+    }
+    my ($memberinfo,$numitems) =
+                 &Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]);
+    my @statustypes = ('active');
+    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;
+    } else {
+        $result = &mt('Select message recipients from the group members listed below.<br />');  
+        my %Sortby = (
+                         active   => {},
+                         previous => {},
+                         future   => {},
+                     );
+        my %lt = &Apache::lonlocal::texthash(
+                                     'name'     => 'Name',
+                                     'usnm'     => 'Username',
+                                     'doma'     => 'Domain',
+                                     'active'   => 'Active Members',
+                                     'previous' => 'Former Members',
+                                     'future'   => 'Future Members',
+                                    );
+        foreach my $user (sort(keys(%{$memberinfo}))) {
+            my $status = $$memberinfo{$user}{status};
+            if ($env{'form.'.$status.'.sortby'} eq 'fullname') {
+                push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user);
+            } elsif ($env{'form.'.$status.'.sortby'} eq 'username') {
+                push(@{$Sortby{$status}{$$memberinfo{$user}{uname}}},$user);
+            } elsif ($env{'form.'.$status.'.sortby'} eq 'domain') {
+                push(@{$Sortby{$status}{$$memberinfo{$user}{udom}}},$user);
+            } else {
+                push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user);
             }
         }
-    }
-
-    function checksec() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf
-           ('send_to_&&&'+document.forms.compemail.chksec.value+'&&&')==0) {
-	      document.forms.compemail.elements[i].checked=true;
+        $result .= &group_check_uncheck();
+        $result .= '<table border="0" cellspacing="8" cellpadding="2">'.
+                   '<tr>';
+        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();
+                    foreach my $key (sort(keys(%{$Sortby{$status}}))) {
+                        foreach my $user (@{$Sortby{$status}{$key}}) {
+                            $result .=
+                                &Apache::loncommon::start_data_table_row().
+                                '<td><input type="checkbox" '.
+                                'name="selectedusers_forminput" value="'.
+                                $user.':'.$status.'" />'.
+                                $$memberinfo{$user}{'fullname'}.'</td>'.
+                                '<td>'.$$memberinfo{$user}{'uname'}.'</td>'.
+                                '<td>'.$$memberinfo{$user}{'udom'}.'</td>'.
+                                &Apache::loncommon::end_data_table_row();
+                        }
+                    }
+                    $result .= &Apache::loncommon::end_data_table();
+                }
             }
+            $result .= '</td><td>&nbsp;&nbsp;</td>';
         }
+        $result .= '</tr></table>';
     }
+    return $result;
+}
 
-    function uncheckall() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
-	      document.forms.compemail.elements[i].checked=false;
+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;
+            }
+        }
+    } 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;
+                }
             }
         }
     }
+}
 </script>
-<input type="button" onClick="checkall()" value="$lt{'cfa'}" />&nbsp;
-<input type="button" onClick="checksec()" value="$lt{'cfs'}" />
-<input type="text" size="5" name="chksec" />&nbsp;
-<input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
-<p>
-ENDDISHEADER
-    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
-    $r->print('<table>');
-    foreach my $role (sort keys %coursepersonnel) {
-        foreach (split(/\,/,$coursepersonnel{$role})) {
-            my ($puname,$pudom)=split(/\:/,$_);
-            $r->print('<tr><td><label>'.
-                      '<input type="checkbox" name="send_to_&&&&&&_'.
-                      $puname.':'.$pudom.'" /> '.
-                      &Apache::loncommon::plainname($puname,$pudom).
-                      '</label></td>'.
-                      '<td>('.$_.'),</td><td><i>'.$role.'</i></td></tr>');
-        }
-    }
-    $r->print('</table><table>');
-    my $sort = sub {
-	my $aname=lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]);
-	if (!$aname) { $aname=$a; }
-	my $bname=lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]);
-	if (!$bname) { $bname=$b; }
-	return $aname cmp $bname;
-    };
-    foreach my $student (sort $sort (keys(%{$classlist}))) {
-	my $info=$classlist->{$student};
-        my ($sname,$sdom,$status,$fullname,$section) =
-            (@{$info}[&Apache::loncoursedata::CL_SNAME(),
-                      &Apache::loncoursedata::CL_SDOM(),
-                      &Apache::loncoursedata::CL_STATUS(),
-                      &Apache::loncoursedata::CL_FULLNAME(),
-                      &Apache::loncoursedata::CL_SECTION()]);
-        next if ($status ne 'Active');
-	next if ($env{'request.course.sec'} &&
-		 $section ne $env{'request.course.sec'});
-        my $key = 'send_to_&&&'.$section.'&&&_'.$student;
-        if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
-        $r->print('<tr><td><label>'.
-                  qq{<input type="checkbox" name="$key" />}.('&nbsp;'x2).
-                  $fullname.'</label></td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
-                  '</td></tr>');
+    |;
+}
+
+sub groupmail_header {
+    my ($action,$group,$cdom,$cnum) = @_;
+    my ($description,$refarg);
+    if (!$cdom || !$cnum) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }
+    if (exists($env{'form.ref'})) {
+        $refarg = 'ref='.$env{'form.ref'};
+    }
+    if (!$group) {
+        $group = $env{'form.group'};
+    }
+    if ($group eq '') {
+        return  '';
+    } else {
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
+        if (defined($curr_groups{$group})) {
+            my %groupinfo =
+                    &Apache::longroup::get_group_settings($curr_groups{$group});
+            $description = &unescape($groupinfo{'description'});
+        }
+    }
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($refarg) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/coursegroups",
+              text=>"Groups",
+              title=>"View course groups"});
     }
-    $r->print('</table>');
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
+          text=>"Group: $description",
+          title=>"Go to group's home page"},
+         {href=>"/adm/email?compose=group&amp;group=".
+                "$env{'form.group'}&amp;$refarg",
+          text=>"Send a Message in a Group",
+          title=>"Compose Group Email Message"},);
+    if ($action eq 'sending') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                         ({text=>"Messages being sent.",
+                           title=>"Messages sent"},);
+    }
+    my $groupheader = &Apache::loncommon::start_page('Group Email');
+    $groupheader .= &Apache::lonhtmlcommon::breadcrumbs
+                ('Group - '.$env{'form.group'}.' Email');
+    return $groupheader;
+}
+
+sub groupmail_sent {
+    my ($group,$cdom,$cnum) = @_;
+    my $refarg;
+    if (exists($env{'form.ref'})) {
+        $refarg = 'ref='.$env{'form.ref'};
+    }
+    my $output .= '<br /><br /><a href="/adm/email?compose=group&amp;group='.
+                  $group.'&amp;'.$refarg.'">'.
+                  &mt('Send another group email').'</a>'.'&nbsp;&nbsp;&nbsp;'.
+                  '<a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?'.
+                  $refarg.'">'. &mt('Return to group page').'</a>';
+    return $output;
 }
 
 # ==================================================== Display Critical Message
@@ -353,13 +740,13 @@ sub discrit {
         '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
-    foreach (sort keys %what) {
-        my %content=&Apache::lonmsg::unpackagemsg($what{$_});
+    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{'sendername'}.':'.
             $content{'senderdomain'}.') '.$content{'time'}.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
             '<br /><pre>'.
@@ -367,8 +754,8 @@ $content{'sendername'}.'@'.
             '</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_'.$_.'" value="'.&mt('Confirm Receipt').'" />'.
-            '<input type="submit" name="reprec_'.$_.'" '.
+            '<input type="submit" name="rec_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.
+            '<input type="submit" name="reprec_'.$key.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'" />';
     }
     # Check to see if there were any messages.
@@ -384,26 +771,40 @@ $content{'sendername'}.'@'.
 }
 
 sub sortedmessages {
-    my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_;
+    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;
     my %status_cache = 
 	&Apache::lonnet::get('email_status'.&Apache::lonmsg::foldersuffix($folder),\@messages);
-    foreach (@messages) {
-	my $msgid=&Apache::lonnet::escape($_);
+
+    my $get_received;
+    if ($folder eq 'sent' 
+	&& ($env{'form.sortedby'} =~ m/^(rev)?(user|domain)$/)) {
+	$get_received = 1;
+    }
+
+    foreach my $msgid (@messages) {
+	my $esc_msgid=&escape($msgid);
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
-	    &Apache::lonmsg::unpackmsgid($msgid,$folder,undef,
+	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
 					 \%status_cache);
+        next if ($msgstatus ne '' && $msgstatus ne $status);
         my $description = &get_course_desc($fromcid,\%descriptions);
 	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
-		     $msgid,$description);
+		     $esc_msgid,$description);
+	if ($get_received) {
+	    my %message = &Apache::lonnet::get('nohist_email'.$suffix,
+					       [$msgid]);
+	    my %content = &Apache::lonmsg::unpackagemsg($message{$msgid});
+	    push(@temp1,$content{'recuser'},$content{'recdomain'});
+	}
         # Check whether message was sent during blocking period.
         if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) {
-            my $escid = &Apache::lonnet::unescape($msgid);
-            $$blocked{$escid} = 'ON';
+            $$blocked{$msgid} = 'ON';
             $$numblocked ++;
         } else { 
             push @temp ,\@temp1;
@@ -418,16 +819,32 @@ sub sortedmessages {
     	@temp = sort  {$b->[0] <=> $a->[0]} @temp; 
     }
     if ($env{'form.sortedby'} eq "user"){
-	@temp = sort  {lc($a->[2]) cmp lc($b->[2])} @temp;
+	if ($get_received) {
+	    @temp = sort  {lc($a->[7][0]) cmp lc($b->[7][0])} @temp;
+	} else {
+	    @temp = sort  {lc($a->[2])    cmp lc($b->[2])}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "revuser"){
-	@temp = sort  {lc($b->[2]) cmp lc($a->[2])} @temp;
+	if ($get_received) {
+	    @temp = sort  {lc($b->[7][0]) cmp lc($a->[7][0])} @temp;
+	} else {
+	    @temp = sort  {lc($b->[2])    cmp lc($a->[2])}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "domain"){
-        @temp = sort  {$a->[3] cmp $b->[3]} @temp;
+	if ($get_received) {
+	    @temp = sort  {$a->[8][0] cmp $b->[8][0]} @temp;
+	} else {
+	    @temp = sort  {$a->[3]    cmp $b->[3]}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "revdomain"){
-        @temp = sort  {$b->[3] cmp $a->[3]} @temp;
+	if ($get_received) {
+	    @temp = sort  {$b->[8][0] cmp $a->[8][0]} @temp;
+	} else {
+	    @temp = sort  {$b->[3]    cmp $a->[3]}    @temp;
+	}
     }
     if ($env{'form.sortedby'} eq "subject"){
         @temp = sort  {lc($a->[1]) cmp lc($b->[1])} @temp;
@@ -462,7 +879,7 @@ sub get_course_desc {
             if (defined($env{'course.'.$fromcid.'.description'})) {
                 $description = $env{'course.'.$fromcid.'.description'};
             } else {
-                my %courseinfo=&Apache::lonnet::coursedescription($fromcid);                $description = $courseinfo{'description'};
+                my %courseinfo=&Apache::lonnet::coursedescription($fromcid);
                 $description = $courseinfo{'description'};
             }
             $$descriptions{$fromcid} = $description;
@@ -471,158 +888,110 @@ sub get_course_desc {
     }
 }
 
-# ======================================================== Display new messages
-
-
-sub disnew {
-    my $r=shift;
-    my %lt=&Apache::lonlocal::texthash(
-				       'nm' => 'New Messages',
-				       'su' => 'Subject',
-                                       'co' => 'Course',
-				       'da' => 'Date',
-				       'us' => 'Username',
-				       'op' => 'Open',
-				       'do' => 'Domain'
-				       );
-    my @msgids = sort(&Apache::lonnet::getkeys('nohist_email'));
-    my @newmsgs;
-    my %setters = ();
-    my $startblock = 0;
-    my $endblock = 0;
-    my %blocked = ();
-    my $numblocked = 0;
-    # Check for blocking of display because of scheduled online exams.
-    &blockcheck(\%setters,\$startblock,\$endblock);
-    my %status_cache = 
-	&Apache::lonnet::get('email_status',\@msgids);
-    my %descriptions;
-    foreach (@msgids) {
-	my $msgid=&Apache::lonnet::escape($_);
-        my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-	    &Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
-        if (defined($sendtime) && $sendtime!~/error/) {
-            my $description = &get_course_desc($fromcid,\%descriptions);
-            my $numsendtime = $sendtime;
-            $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-            if ($status eq 'new') {
-                if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
-                    $blocked{$_} = 'ON';
-                    $numblocked ++;
-                } else {
-                    push @newmsgs, { 
-                        msgid    => $msgid,
-                        sendtime => $sendtime,
-                        shortsub => $shortsubj,
-                        from     => $fromname,
-                        fromdom  => $fromdom,
-                        course   => $description 
-                        }
-                }
-            }
-        }
-    }
-    if ($#newmsgs >= 0) {
-        $r->print(<<TABLEHEAD);
-<h2>$lt{'nm'}</h2>
-<table class="LC_mail_list"><tr><th>&nbsp</th>
-<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr>
-TABLEHEAD
-        foreach my $msg (@newmsgs) {
-            $r->print(<<"ENDLINK");
-<tr class="LC_mail_new">
-<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
-ENDLINK
-            foreach ('sendtime','from','fromdom','shortsub','course') {
-                $r->print("<td>$msg->{$_}</td>");
-            }
-            $r->print("</td></tr>");
-        }
-        $r->print('</table>');
-    } elsif ($numblocked == 0) {
-        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
-    }
-    if ($numblocked > 0) {
-        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-        if ($numblocked == 1) {
-            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
-            $r->print(&mt('This message is not viewable because').' ');
-        } else {
-            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
-            $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
-        }
-        $r->print(
-&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
-        &build_block_table($r,$startblock,$endblock,\%setters);
-    }
-}
-
-
 # ======================================================== Display all messages
 
 sub disall {
-    my ($r,$folder)=@_;
-    $r->print(&folderlist($folder));
-    if ($folder eq 'new') {
-	&disnew($r);
-    } elsif ($folder eq 'critical') {
+    my ($r,$folder,$msgstatus)=@_;
+    $r->print(&folderlist($folder,$msgstatus));
+    if ($folder eq 'critical') {
 	&discrit($r);
     } else {
-	&disfolder($r,$folder);
+	&disfolder($r,$folder,$msgstatus);
     }
 }
 
 # ============================================================ Display a folder
 
 sub disfolder {
-    my ($r,$folder)=@_;
+    my ($r,$folder,$msgstatus)=@_;
+    my %statushash = &get_msgstatus_types();
     my %blocked = ();
     my %setters = ();
-    my $startblock;
-    my $endblock;
     my $numblocked = 0;
-    &blockcheck(\%setters,\$startblock,\$endblock);
+    my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
+    my %lt = &Apache::lonlocal::texthash(
+                      sede => 'Select a destination folder to which the messages will be moved.',
+                      nome => 'No messages have been selected to apply ths action to.',
+                      chec => 'Check the checkbox for at least one message.',  
+    );
     $r->print(<<ENDDISHEADER);
-<script>
+<script type="text/javascript">
     function checkall() {
-	for (i=0; i<document.forms.disall.elements.length; i++) {
-            if 
-          (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
-	      document.forms.disall.elements[i].checked=true;
-            }
+	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.elements.length; i++) {
-            if 
-          (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
-	      document.forms.disall.elements[i].checked=false;
+	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; 
     }
+
+    function validate_checkedaction() {
+        document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
+        if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
+            if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
+                alert("$lt{'sede'}");
+                return;
+            } 
+        }
+        var checktotal = 0;
+        for (var i=0; i<document.forms.disall.delmark.length; i++) {
+            if (document.forms.disall.delmark[i].checked) {
+                checktotal ++;
+            }
+        }
+        if (checktotal == 0) {
+            alert("$lt{'nome'}\\n$lt{'chec'}");
+            return;
+        }
+        document.disall.submit();
+    }
+
 </script>
 ENDDISHEADER
+
     my $fsqs='&folder='.$folder;
-    my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+    my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
-    unless ($totalnumber>0) {
-	$r->print('<h2>'.&mt('Empty Folder').'</h2>');
+    if ($totalnumber < 1) {
+        if ($msgstatus eq '') {
+	    $r->print('<h2>'.&mt('Empty Folder').'</h2>');
+        } elsif ($msgstatus eq 'replied') {
+            $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
+        } else { 
+            $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
+        }
 	return;
     }
     unless ($interdis) {
 	$interdis=20;
     }
     my $number=int($totalnumber/$interdis);
+    if ($interdis) {
+        if ($totalnumber%$interdis == 0) {
+            $number--; 
+        }
+    }
+
     if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
     my $firstdis=$interdis*$startdis;
     if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
     my $lastdis=$firstdis+$interdis-1;
     if ($lastdis>$#temp) { $lastdis=$#temp; }
-    $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
+    $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus));
     $r->print('<form method="post" name="disall" action="/adm/email">'.
-	      '<table class="LC_mail_list"><tr><th colspan="3">&nbsp</th><th>');
+	      '<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>');
     } else {
@@ -662,7 +1031,9 @@ ENDDISHEADER
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$temp[$n]};
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
+	    $description,$recv_name,$recv_domain)= 
+		@{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
 	    if ($status eq 'new') {
 		$r->print('<tr class="LC_mail_new">');
@@ -675,61 +1046,115 @@ ENDDISHEADER
 	    }
 	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
 	    if ($folder eq 'sent') {
-		my $msg_id = &Apache::lonnet::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 (defined($recv_name) && !defined($recv_domain)) {
+		    $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'}});
+		}
 	    }
-	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
-		      '">'.&mt('Open').'</a></td><td>'.
-		      ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
-		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
-		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
-		      $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
-		      $shortsubj.'</td><td>'.
-                      $description.'</td><td>'.$status.'</td></tr>'."\n");
+            my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
+            my $count = $n +1;
+	    $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
+                      $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
+                      '<input type="checkbox" name="delmark"'. 
+                      ' value="'.$origID.'" /></nobr></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>');
+            }
+            my $showstatus;
+            my %statushash = &get_msgstatus_types();
+            if ($status eq '') {
+                $showstatus = '';
+            } else {
+                $showstatus = $statushash{$status};
+            }
+	    $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
+                      (($status eq 'new')?'</b>':'').'</td><td>'.
+                      (($status eq 'new')?'<b>':'').$showstatus.
+                      (($status eq 'new')?'</b>':'').'</td></tr>'."\n");
 	} elsif ($status eq 'deleted') {
 # purge
 	    my ($result,$msg) = 
-		&movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
+		&movemsg(&unescape($origID),$folder,'trash');
 	    
 	}
     }   
-    $r->print("</table>\n<p>".
-  '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
-  '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a></p>'.
-  '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />');
+    $r->print("</table>\n");
+    $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="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");
+
     if ($folder ne 'trash') {
-	$r->print(
-	      '<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
+        $r->print('    <option value="markeddel">'.&mt('Delete').'</option>'."\n");
     }
-    $r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
-    my @allfolders=&Apache::lonnet::getkeys('email_folders');
-    if ($allfolders[0]=~/^error:/) { @allfolders=(); }
-    $r->print(
-	&Apache::loncommon::select_form('','movetofolder',
-			     ( map { $_ => $_ } @allfolders))
-	      );
+    if ($msgstatus ne 'read') {
+        $r->print('    <option value="markedread">'.&mt('Mark Read').'</option>."\n"');
+    }
+    if ($msgstatus ne 'unread') {
+        $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
+    }
+    $r->print('   <option value="markedforward">'.&mt('Forward').'</option>'."\n");
+
+    my %gotfolders = &Apache::lonmsg::get_user_folders();
+    if (keys(%gotfolders) > 0) {
+        $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').
+                  '</option>');
+    }
+    $r->print("\n".'</select></td>'."\n");
+
+    if (keys(%gotfolders) > 0) {
+        $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
+	my %userfolders;
+        foreach my $key (keys(%gotfolders)) {
+            $userfolders{$key} = $key;
+        }
+        $userfolders{''} = "";
+        $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).
+                  '</td>');
+    }
+    $r->print('<td>&nbsp;</td><td>&nbsp;&nbsp;'.
+              '<input type="button" name="go" value="'.&mt('Go').
+              '" 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'}.'" /></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 />'.
-                  $numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.'));
-        &build_block_table($r,$startblock,$endblock,\%setters);
+                  &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));
     }
 }
 
 # ============================================================== Compose output
 
 sub compout {
-    my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_;
+    my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode,
+        $multiforward)=@_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
-
-    if ($broadcast eq 'individual') {
+    my ($cdom,$cnum,$group,$refarg);
+    if (exists($env{'form.group'})) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $group = $env{'form.group'};
+        my $action = 'composing';
+        $r->print(&groupmail_header($action,$group,$cdom,$cnum));
+    } elsif ($broadcast eq 'individual') {
 	&printheader($r,'/adm/email?compose=individual',
 	     'Send a Message');
     } elsif ($broadcast) {
@@ -737,19 +1162,26 @@ sub compout {
 	     'Broadcast Message');
     } elsif ($forwarding) {
 	&Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/email?display=".&Apache::lonnet::escape($forwarding),
+        ({href=>"/adm/email?display=".&escape($forwarding),
           text=>"Display Message"});
-	&printheader($r,'/adm/email?forward='.&Apache::lonnet::escape($forwarding),
+	&printheader($r,'/adm/email?forward='.&escape($forwarding),
 	     'Forwarding a Message');
     } elsif ($replying) {
 	&Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/email?display=".&Apache::lonnet::escape($replying),
+        ({href=>"/adm/email?display=".&escape($replying),
           text=>"Display Message"});
-	&printheader($r,'/adm/email?replyto='.&Apache::lonnet::escape($replying),
+	&printheader($r,'/adm/email?replyto='.&escape($replying),
 	     'Replying to a Message');
     } elsif ($replycrit) {
 	$r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');
 	$replying=$replycrit;
+    } elsif ($multiforward) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/email?folder=".&escape($folder),
+          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 />');
     } else {
 	&printheader($r,'/adm/email?compose=upload',
 	     'Distribute from Uploaded File');
@@ -760,13 +1192,18 @@ sub compout {
     my $dismsg='';
     my $disbase='';
     my $func=&mt('Send New');
-    my %lt=&Apache::lonlocal::texthash('us' => 'Username',
-				       'do' => 'Domain',
-				       'ad' => 'Additional Recipients',
-				       'sb' => 'Subject',
-				       'ca' => 'Cancel',
-				       'ma' => 'Mail');
-
+    my %lt=&Apache::lonlocal::texthash('us'  => 'Username',
+				       'do'  => 'Domain',
+				       'ad'  => 'Additional Recipients',
+				       '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',
+                                      );
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 				    '/'.$env{'request.course.sec'})) {
@@ -795,7 +1232,7 @@ sub compout {
 	$dismsg=&mt('Forwarded message from').' '.
 	    $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
 	if ($content{'baseurl'}) {
-	    $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
+	    $disbase='<input type="hidden" name="baseurl" value="'.&escape($content{'baseurl'}).'" />';
 	}
     }
     if ($replying) {
@@ -811,92 +1248,148 @@ sub compout {
 	$dismsg=~s/\f/\n/g;
 	$dismsg=~s/\n+/\n\> /g;
 	if ($content{'baseurl'}) {
-	    $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($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').
 		    '</label> <a href="/adm/email?showcommentbaseurl='.
-		    &Apache::lonnet::escape($content{'baseurl'}).'" target="comments">'.
+		    &escape($content{'baseurl'}).'" target="comments">'.
 		    &mt('Show re-usable messages').'</a><br />';
 	    }
 	}
     }
     my $citation=&displayresource(%content);
+    my ($can_grp_broadcast,$viewgrps,$editgrps);
     if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
-      $r->print(
+    if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
+    if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
+    $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'."\n".
-                '<input type="hidden" name="sendmail" value="on" />'."\n".
-                '<table>');
-    unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
+                '<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)) {
+        $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(
 							 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
-		      $content{'sendername'}.'@'.
+		      $content{'sendername'}.':'.
 		      $content{'senderdomain'}.')'.
 		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
 		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
 		      '</td></tr>');
 	} else {
-	    my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
-	    my $selectlink=&Apache::loncommon::selectstudent_link
-	    ('compemail','recuname','recdomain');
-	    $r->print(<<"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>
-ENDREC
+            $r->print(&recipient_input_row($defdom,%lt));
         }
     }
     my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
-    if ($broadcast ne 'upload') {
-       $r->print(<<"ENDCOMP");
-<tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
-</tt></td><td>
-<input type="text" size="50" name="additionalrec" /></td></tr>
-<tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
-</td></tr></table>
+    my $subj_size;
+    if ($multiforward) {
+        $r->print(&additional_rec_row(\%lt));
+        $r->print('<tr><td colspan="2">'.
+                  &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');
+        $dissub = &mt('Forwarding').': ';
+        $subj_size = '10';
+        my $extra = '&lt;'.&mt('original subject').'&gt;&nbsp;&nbsp;&nbsp;'.
+                    '<input type="radio" name="showorigsubj" value="1" checked="checked" />'.&mt('Yes').'&nbsp;<input type="radio" name="showorigsubj" value="0" />'.&mt('No');
+        $dismsg = &mt('Forwarded message from ').' ';
+        my $sender = &mt("sender's name");
+        $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 />');
+        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'},
+                                     \%lt));
+    } elsif ($broadcast ne 'upload') {
+        $subj_size = '50';
+        $r->print(&additional_rec_row(\%lt));
+        $r->print(&msg_subject_row($dissub,\%lt,$subj_size));
+        $r->print(<<"ENDCOMP");
+</table>
 $latexHelp
 <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea></p><br />
 $dispcrit
 $disbase
-<input type="hidden" name="folder" value="$folder" />
-<input type="hidden" name="dismode" value="$dismode" />
-<input type="submit" name="send" value="$func $lt{'ma'}" />
-<input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
-$citation
 ENDCOMP
+        $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'ma'},
+                                     \%lt));
+        $r->print($citation);
+        if (exists($env{'form.ref'})) {
+            $r->print('<input type="hidden" name="ref" value="'.
+                      $env{'form.ref'}.'" />');
+        }
+        if (exists($env{'form.group'})) {
+            $r->print('<input type="hidden" name="group" value="'.
+                      $env{'form.group'}.'" />');
+        }
     } else { # $broadcast is 'upload'
-	$r->print(<<ENDUPLOAD);
+	$r->print(<<ENDBLOCK);
 <input type="hidden" name="sendmode" value="upload" />
 <input type="hidden" name="send" value="on" />
-<h3>Generate messages from a file</h3>
+<h3>$lt{'gen'}</h3>
 <p>
 Subject: <input type="text" size="50" name="subject" />
 </p>
-<p>General message text<br />
+<p>$lt{'gmt'}:<br />
 <textarea name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
 </textarea></p>
 <p>
-The file format for the uploaded portion of the message is:
-<pre>
-username1\@domain1: text
-username2\@domain2: text
-username3\@domain1: text
-</pre>
+$lt{'tff'}:
+ENDBLOCK
+       $r->print('
+<pre>'."\n".
+&mt('username1:domain1: text')."\n".
+&mt('username2:domain2: text')."\n".
+&mt('username3:domain1: text')."\n".
+'</pre>
 </p>
 <p>
-The messages will be assembled from all lines with the respective 
-<tt>username\@domain</tt>, and appended to the general message text.</p>
+'.&mt('The messages will be assembled from all lines with the respective'."\n".'<tt>username:domain</tt>, and appended to the general message text.'));
+        $r->print(<<ENDUPLOAD);
+</p>
 <p>
 <input type="file" name="upfile" size="40" /></p><p>
 $dispcrit
-<input type="submit" value="Upload and Send" /></p>
+<input type="submit" value="$lt{'uas'}" /></p>
 ENDUPLOAD
     }
     if ($broadcast eq 'group') {
-       &discourse($r);
+       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').
@@ -905,12 +1398,55 @@ ENDUPLOAD
 
 # ---------------------------------------------------- Display all face to face
 
+sub recipient_input_row {
+    my ($dom,%lt) = @_;
+    my $domform = &Apache::loncommon::select_dom_form($dom,'recdomain');
+    my $selectlink=
+      &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>
+ENDREC
+    return $output;
+}
+
+sub additional_rec_row {
+    my ($lt) = @_;
+    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>
+ENDADD
+    return $output;
+}
+
+sub submit_button_row {
+    my ($folder,$dismode,$sendtext,$lt) = @_;
+    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 />
+|;
+    return $output;
+}
+
+sub msg_subject_row {
+    my ($dissub,$lt,$subj_size,$extra) = @_;
+    my $output = '<tr><td>'.$lt->{'sb'}.':</td><td><input type="text" size="'.
+                 $subj_size.'" name="subject" value="'.$dissub.'" />'.$extra.
+                 '</td></tr>';
+    return $output;
+}
+
 sub retrieve_instructor_comments {
     my ($user,$domain)=@_;
     my $target=$env{'form.grade_target'};
     if (! $env{'request.course.id'}) { return; }
-    if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})
-	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+    if (! &Apache::lonnet::allowed('dff',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
 				      '/'.$env{'request.course.sec'})) {
 	return;
     }
@@ -919,13 +1455,13 @@ sub retrieve_instructor_comments {
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
     my $result='';
-    foreach (sort(keys(%records))) {
-        my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+    foreach my $key (sort(keys(%records))) {
+        my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
         next if ($content{'subject'} !~ /^Record/);
 	# &Apache::lonfeedback::newline_to_br(\$content{'message'});
 	$result.='Recorded by '.
-            $content{'sendername'}.'@'.$content{'senderdomain'}."\n";
+            $content{'sendername'}.':'.$content{'senderdomain'}."\n";
         $result.=
             &Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
      }
@@ -936,10 +1472,10 @@ sub disfacetoface {
     my ($r,$user,$domain)=@_;
     my $target=$env{'form.grade_target'};
     unless ($env{'request.course.id'}) { return; }
-    if  (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-	 && ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+    if  (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
+	 && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
 				       '/'.$env{'request.course.sec'})) {
-	$r->print('Not allowed');
+	$r->print(&mt('Not allowed'));
 	return;
     }
     my %records=&Apache::lonnet::dump('nohist_email',
@@ -947,8 +1483,8 @@ sub disfacetoface {
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
     my $result='';
-    foreach (sort keys %records) {
-        my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+    foreach my $key (sort(keys(%records))) {
+        my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
 	&Apache::lonfeedback::newline_to_br(\$content{'message'});
         if ($content{'subject'}=~/^Record/) {
@@ -957,7 +1493,7 @@ sub disfacetoface {
             $result .='<h3>'.&mt('Broadcast Message').'</h3>';
             if ($content{'subject'}=~/^Broadcast\./) {
                 if (defined($content{'coursemsgid'})) {
-                    my $crsmsgid = &Apache::lonnet::escape($content{'coursemsgid'});
+                    my $crsmsgid = &escape($content{'coursemsgid'});
                     my $broadcast_message = &general_message($crsmsgid);
                     $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$broadcast_message;
                 } else {
@@ -970,7 +1506,7 @@ sub disfacetoface {
         } else {
             $result.='<h3>'.&mt('Critical Message').'</h3>';
             if (defined($content{'coursemsgid'})) {
-                my $crsmsgid=&Apache::lonnet::escape($content{'coursemsgid'});
+                my $crsmsgid=&escape($content{'coursemsgid'});
                 my $critical_message = &general_message($crsmsgid);
                 $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$critical_message;
             } else {
@@ -983,7 +1519,7 @@ sub disfacetoface {
         $result.=&mt('By').': <b>'.
 &Apache::loncommon::aboutmewrapper(
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
-$content{'sendername'}.'@'.
+$content{'sendername'}.':'.
             $content{'senderdomain'}.') '.$content{'time'}.
             '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
@@ -991,10 +1527,11 @@ $content{'sendername'}.'@'.
      }
     # Check to see if there were any messages.
     if ($result eq '') {
+        my $lctype = 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 course.")."</b></p>");
+	    $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."</b></p>");
 	} else {
-	    $r->print('\textbf{'.&mt("No notes, face-to-face discussion records, critical messages or broadcast messages in this course.").'}\\\\');
+	    $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\');
 	}
     } else {
        $r->print($result);
@@ -1017,12 +1554,15 @@ sub general_message {
 
 sub facetoface {
     my ($r,$stage)=@_;
-    if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+    if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
 				      '/'.$env{'request.course.sec'})) {
-	$r->print('Not allowed');
+	$r->print(&mt('Not allowed'));
 	return;
     }
+    my $crstype = &Apache::loncommon::course_type();
+    my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
+                                        : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
 		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
@@ -1040,9 +1580,9 @@ 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 Course',
+				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in $crstype",
 				       'subm' => 'Retrieve discussion and message records',
-				       'newr' => 'New Record (record is visible to course faculty and staff)',
+				       'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
 				       'post' => 'Post this Record');
     $r->print(<<"ENDTREC");
 <h3>$lt{'head'}</h3>
@@ -1063,13 +1603,9 @@ ENDTREC
         ($env{'form.recdomain'}) && ($env{'form.recuname'})) {
         chomp($env{'form.newrecord'});
         if ($env{'form.newrecord'}) {
-           my $recordtxt = $env{'form.newrecord'};
-           &Apache::lonmsg::user_normal_msg_raw(
-            $env{'course.'.$env{'request.course.id'}.'.num'},
-            $env{'course.'.$env{'request.course.id'}.'.domain'},
-            &mt('Record').
-	     ' ['.$env{'form.recuname'}.':'.$env{'form.recdomain'}.']',
-	    $recordtxt);
+	    &Apache::lonmsg::store_instructor_comment($env{'form.newrecord'},
+						      $env{'form.recuname'},
+						      $env{'form.recdomain'});
         }
         $r->print('<h3>'.&Apache::loncommon::plainname($env{'form.recuname'},
 				     $env{'form.recdomain'}).'</h3>');
@@ -1095,24 +1631,28 @@ ENDBFORM
 sub examblock {
     my ($r,$action) = @_;
     unless ($env{'request.course.id'}) { return;}
-    if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+    if (!&Apache::lonnet::allowed('dcm',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
 				      '/'.$env{'request.course.sec'})) {
 	$r->print('Not allowed');
 	return;
     }
+    my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
+	                                                          : 'students';
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
             'cbds' => 'Communication blocking during scheduled exams',
-            'desc' => 'You can use communication blocking to prevent students enrolled in this course from displaying LON-CAPA messages sent by other students during an online exam. As blocking of communication could potentially interrupt legitimate communication between students 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.',
+            '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'
+             'ncbc' => 'No communication blocks currently stored',
+             'stor' => 'Store',
     );
 
     my %ltext = &Apache::lonlocal::texthash(
             'dura' => 'Duration',
             'setb' => 'Set by',
             'even' => 'Event',
+            'blck' => 'Blocked?',
             'actn' => 'Action',
             'star' => 'Start',
             'endd' => 'End'
@@ -1144,7 +1684,7 @@ sub examblock {
     $r->print(<<"END");
 <br />
 <input type="hidden" name="blocktotal" value="$blockcount" />
-<input type ="submit" value="Save Changes" />
+<input type ="submit" value="$lt{'stor'}" />
 </form>
 $end_page
 END
@@ -1155,10 +1695,6 @@ sub blockstore {
     my $r = shift;
     my %lt=&Apache::lonlocal::texthash(
             'tfcm' => 'The following changes were made',
-            'cbps' => 'communication blocking period(s)',
-            'werm' => 'was/were removed',
-            'wemo' => 'was/were modified',
-            'wead' => 'was/were added',
             'ncwm' => 'No changes were made.' 
     );
     my %adds = ();
@@ -1169,35 +1705,40 @@ sub blockstore {
     my $addtotal = 0;
     my %blocking = ();
     $r->print('<h3>'.$lt{'head'}.'</h3>');
-    foreach (keys %env) {
-        if ($_ =~ m/^form\.modify_(\w+)$/) {
+    foreach my $envkey (keys(%env)) {
+        if ($envkey =~ m/^form\.modify_(\d+)$/) {
             $adds{$1} = $1;
             $removals{$1} = $1;
             $modtotal ++;
-        } elsif ($_ =~ m/^form\.cancel_(\d+)$/) {
+        } elsif ($envkey =~ m/^form\.cancel_(\d+)$/) {
             $cancels{$1} = $1;
             unless ( defined($removals{$1}) ) {
                 $removals{$1} = $1;
                 $canceltotal ++;
             }
-        } elsif ($_ =~ m/^form\.add_(\d+)$/) {
+        } elsif ($envkey =~ m/^form\.add_(\d+)$/) {
             $adds{$1} = $1;
             $addtotal ++;
-        }
+        } 
     }
 
-    foreach (keys %removals) {
-        my $hashkey = $env{'form.key_'.$_};
+    foreach my $key (keys(%removals)) {
+        my $hashkey = $env{'form.key_'.$key};
         &Apache::lonnet::del('comm_block',["$hashkey"],
                          $env{'course.'.$env{'request.course.id'}.'.domain'},
                          $env{'course.'.$env{'request.course.id'}.'.num'}
                          );
     }
-    foreach (keys %adds) {
-        unless ( defined($cancels{$_}) ) {
-            my ($newstart,$newend) = &get_dates_from_form($_);
+    foreach my $key (keys(%adds)) {
+        unless ( defined($cancels{$key}) ) {
+            my ($newstart,$newend) = &get_dates_from_form($key);
             my $newkey = $newstart.'____'.$newend;
-            $blocking{$newkey} = $env{'user.name'}.'@'.$env{'user.domain'}.':'.$env{'form.title_'.$_};
+            my $blocktypes = &get_block_choices($key);
+            $blocking{$newkey} = {
+                          setter => $env{'user.name'}.':'.$env{'user.domain'},
+                          event  => &escape($env{'form.title_'.$key}),
+                          blocks => $blocktypes,
+                        };
         }
     }
     if ($addtotal + $modtotal > 0) {
@@ -1210,13 +1751,13 @@ sub blockstore {
     if ($chgestotal > 0) {
         $r->print($lt{'tfcm'}.'<ul>');
         if ($canceltotal > 0) {
-            $r->print('<li>'.$canceltotal.' '.$lt{'cbps'},' '.$lt{'werm'}.'</li>');
+            $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] removed.',$canceltotal).'</li>');
         }
         if ($modtotal > 0) {
-            $r->print('<li>'.$modtotal.' '.$lt{'cbps'},' '.$lt{'wemo'}.'</li>');
+            $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] modified.',$modtotal).'</li>');
         }
         if ($addtotal > 0) {
-            $r->print('<li>'.$addtotal.' '.$lt{'cbps'},' '.$lt{'wead'}.'</li>');
+            $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] added.',$addtotal).'</li>');
         }
         $r->print('</ul>');
     } else {
@@ -1240,70 +1781,84 @@ sub get_blockdates {
                          $env{'course.'.$env{'request.course.id'}.'.domain'},
                          $env{'course.'.$env{'request.course.id'}.'.num'}
                          );
-    $$blockcount = keys %{$records};
-                                                                                                             
-    foreach (keys %{$records}) {
-        if ($_ eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-            $$blockcount = 0;
-            last;
+    $$blockcount = keys(%{$records});
+
+    if ((keys(%{$records}))[0] =~ /^error: 2 /) {
+	$records = {};
+	$$blockcount = 0;
+    }
+}
+
+sub get_block_choices {
+    my $item = shift;
+    my $blocklist;
+    my ($typeorder,$types) = &blocktype_text();
+    foreach my $type (@{$typeorder}) {
+        if ($env{'form.'.$type.'_'.$item}) {
+            $blocklist->{$type} = 'on'; 
+        } else {
+            $blocklist->{$type} = 'off';
         }
     }
+    return $blocklist;
 }
 
 sub display_blocker_status {
     my ($r,$records,$ltext) = @_;
     my $parmcount = 0;
-    my @bgcols = ("#eeeeee","#dddddd");
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
+  
     my %lt = &Apache::lonlocal::texthash(
         'modi' => 'Modify',
         'canc' => 'Cancel',
     );
+    my ($typeorder,$types) = &blocktype_text();
+    $r->print(&Apache::loncommon::start_data_table());
     $r->print(<<"END");
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'setb'}</b></td>
-        <td><b>$$ltext{'even'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
+  <tr>
+    <th>$ltext->{'dura'}</th>
+    <th>$ltext->{'setb'}</th>
+    <th>$ltext->{'even'}</th>
+    <th>$ltext->{'blck'}</th>
+    <th>$ltext->{'actn'}?</th>
+  </tr>
 END
-    foreach (sort keys %{$records}) {
-        my $iter = $parmcount%2;
+    foreach my $record (sort(keys(%{$records}))) {
         my $onchange = 'onFocus="javascript:window.document.forms['.
                        "'blockform'].elements['modify_".$parmcount."'].".
                        'checked=true;"';
-        my ($start,$end) = split/____/,$_;
+        my ($start,$end) = split(/____/,$record);
         my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
         my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-        my ($setter,$title) = split/:/,$$records{$_};
-        my ($setuname,$setudom) = split/@/,$setter;
-        my $settername = &Apache::loncommon::plainname($setuname,$setudom);
+	
+	my ($setuname,$setudom,$title,$blocks) = 
+	    &Apache::loncommon::parse_block_record($$records{$record});
+	$title = &HTML::Entities::encode($title,'"<>&');
+        my $settername = 
+           &Apache::loncommon::aboutmewrapper(
+                           &Apache::loncommon::plainname($setuname,$setudom),
+                           $setuname,$setudom);
+        $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-       <tr bgcolor="$bgcols[$iter]">
-        <td>$$ltext{'star'}:&nbsp;$startform<br/>$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
+        <td>$ltext->{'star'}:&nbsp;$startform<br/>$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
         <td>$settername</td>
-        <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$_" /></td>
+        <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>
+        <td>
+END
+        foreach my $block (@{$typeorder}) {
+            my $blockstatus = '';
+            if ($blocks->{$block} eq 'on') {
+                $blockstatus = 'checked="true"';
+            }
+            $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+        }
+        $r->print(<<"END");
+        </td>      
         <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>
-       </tr>
 END
-        $parmcount ++;
+        $r->print(&Apache::loncommon::end_data_table_row());
+        $parmcount++;
     }
     $r->print(<<"END");
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
 </table>
 <br />
 <br />
@@ -1320,158 +1875,68 @@ sub display_addblocker_table {
                    'checked=true;"';
     my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
     my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         'addb' => 'Add block',
         'exam' => 'e.g., Exam 1',
         'addn' => 'Add new communication blocking periods'
     );
+    my ($typeorder,$types) = &blocktype_text();
     $r->print(<<"END");
 <h4>$lt{'addn'}</h4> 
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="#CCCCFF">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'even'} $lt{'exam'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
-       <tr bgcolor="#eeeeee">
-        <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
-        <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
-        <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
 END
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(<<"END");
+   <tr>
+     <th>$ltext->{'dura'}</th>
+     <th>$ltext->{'even'} $lt{'exam'}</th>
+     <th>$ltext->{'blck'}</th>
+     <th>$ltext->{'actn'}?</th>
+   </tr>
+END
+    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(<<"END");
+     <td>$ltext->{'star'}:&nbsp;$startform<br />$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
+     <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+     <td>
+END
+    foreach my $block (@{$typeorder}) {
+        $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+     }
+     $r->print(<<"END");
+     </td> 
+     <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+END
+    $r->print(&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::end_data_table());
     return;
 }
 
-sub blockcheck {
-    my ($setters,$startblock,$endblock) = @_;
-    # Retrieve active student roles and active course coordinator/instructor roles
-    my @livecses = ();
-    my @staffcses = ();
-    $$startblock = 0;
-    $$endblock = 0;
-    foreach (keys %env) {
-        if ($_ =~ m-^user\.role\.(st|cc|in)\./(.+)$-) {
-            my $role = $1;
-            my $cse = $2;
-            $cse =~ s|/|_|;
-            if ($env{$_} =~ m/^(\d*)\.(\d*)$/) {
-                unless (($2 > 0 && $2 < time) || ($1 > time)) {
-                    if ($role eq 'st') {
-                        push @livecses, $cse;
-                    } else {
-                        unless (grep/^$cse$/,@staffcses) {
-                            push @staffcses, $cse;
-                        }
-                    }
-                }
-            }
-        } elsif ($_ =~ m-user\.role\.cr/(\w+)/(\w+)/([^/]+)\./(.+)$- ) { 
-            my $rolepriv = $env{'user.role..rolesdef_'.$3};
-        }
-    }
-    # Retrieve blocking times and identity of blocker for active courses for students.
-    if (@livecses > 0) {
-        foreach my $cse (@livecses) {
-            my ($cdom,$crs) = split/_/,$cse;
-            if ( (grep/^$cse$/,@staffcses) && ($env{'request.role'} !~ m-^st\./$cdom/$crs$-) ) {
-                next;
-            } else {
-                %{$$setters{$cse}} = ();
-                @{$$setters{$cse}{'staff'}} = ();
-                @{$$setters{$cse}{'times'}} = ();
-                my %records = &Apache::lonnet::dump('comm_block',$cdom,$crs);
-                foreach (keys %records) {
-                    if ($_ =~ m/^(\d+)____(\d+)$/) {
-                        if ($1 <= time && $2 >= time) {
-                            my ($staff,$title) = split/:/,$records{$_};
-                            push @{$$setters{$cse}{'staff'}}, $staff;
-                            push @{$$setters{$cse}{'times'}}, $_;
-                            if ( ($$startblock == 0) || ($$startblock > $1) ) {
-                                $$startblock = $1;
-                            }
-                            if ( ($$endblock == 0) || ($$endblock < $2) ) {
-                                $$endblock = $2;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-sub build_block_table {
-    my ($r,$startblock,$endblock,$setters) = @_;
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
-    my %lt = &Apache::lonlocal::texthash(
-        'cacb' => 'Currently active communication blocks',
-        'cour' => 'Course',
-        'dura' => 'Duration',
-        'blse' => 'Block set by'
-    ); 
-    $r->print(<<"END");
-<br /<br />$lt{'cacb'}:<br /><br />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$lt{'cour'}</b></td>
-        <td><b>$lt{'dura'}</b></td>
-        <td><b>$lt{'blse'}</b></td>
-       </tr>
-END
-    foreach (keys %{$setters}) {
-        my %courseinfo=&Apache::lonnet::coursedescription($_);
-        for (my $i=0; $i<@{$$setters{$_}{staff}}; $i++) {
-            my ($uname,$udom) = split/\@/,$$setters{$_}{staff}[$i];
-            my $fullname = &Apache::loncommon::plainname($uname,$udom);
-            my ($openblock,$closeblock) = split/____/,$$setters{$_}{times}[$i];
-            $openblock = &Apache::lonlocal::locallocaltime($openblock);
-            $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
-            $r->print('<tr><td>'.$courseinfo{'description'}.'</td>'.
-                      '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                      '<td>'.$fullname.' ('.$uname.'@'.$udom.
-                      ')</td></tr>');
-        }
-    }
-    $r->print('</table></td></tr></table></td></tr></table>');
+sub blocktype_text {
+    my %types = &Apache::lonlocal::texthash(
+        'com' => 'Messaging',
+        'chat' => 'Chat',
+        'boards' => 'Discussion',
+        'port' => 'Portfolio',
+        'groups' => 'Groups',
+        'blogs' => 'Blogs',
+    );
+    my $typeorder = ['com','chat','boards','port','groups','blogs'];
+    return ($typeorder,\%types);
 }
 
 # ----------------------------------------------------------- Display a message
 
 sub displaymessage {
-    my ($r,$msgid,$folder)=@_;
+    my ($r,$msgid,$folder,$msgstatus)=@_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my %blocked = ();
     my %setters = ();
-    my $startblock = 0;
-    my $endblock = 0;
     my $numblocked = 0;
+    my $crstype = &Apache::loncommon::course_type();
+
 # info to generate "next" and "previous" buttons and check if message is blocked
-    &blockcheck(\%setters,\$startblock,\$endblock);
-    my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+    my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
+    my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     if ( $blocked{$msgid} eq 'ON' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));
         $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
@@ -1484,7 +1949,7 @@ sub displaymessage {
 
     my $counter=0;
     $r->print('<pre>');
-    my $escmsgid=&Apache::lonnet::escape($msgid);
+    my $escmsgid=&escape($msgid);
     foreach (@messages) {
 	if ($_->[5] eq $escmsgid){
 	    last;
@@ -1494,20 +1959,19 @@ sub displaymessage {
     $r->print('</pre>');
     my $number_of_messages = scalar(@messages); #subtract 1 for last index
 # start output
-    &printheader($r,'/adm/email?display='.&Apache::lonnet::escape($msgid),'Display a Message','',$content{'baseurl'});
+    &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='.&Apache::lonnet::escape($msgid).$sqs.
+	      '<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
 	      '"><b>'.&mt('Reply').'</b></a></td>'.
-	      '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
+	      '<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
 	      '"><b>'.&mt('Forward').'</b></a></td>'.
-	      '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
+	      '<td><a href="/adm/email?markunread='.&escape($msgid).$sqs.
 	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-	      '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
+	      '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.
 	      '"><b>'.&mt('Delete').'</b></a></td>'.
 	      '<td><a href="/adm/email?'.$sqs.
-	      ($env{'form.dismode'} eq 'new'?'&folder=new':'').
 	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
     if ($counter > 0){
 	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
@@ -1550,8 +2014,8 @@ sub displaymessage {
 	      $content{'sendername'}.' at '.
 	      $content{'senderdomain'}.') ':'<br /><b>'.&mt('To').':</b> '.
               $tolist).
-	      ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
-	       ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
+	      ($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>':'').
@@ -1603,13 +2067,12 @@ sub header {
     
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
-	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
+	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
     $r->print(&Apache::loncommon::start_page('Communication and Messages',
-					     $extra));
+ 					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-	      (undef,($title?$title:'Communication and Messages')));
-
+     		(($title?$title:'Communication and Messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -1628,27 +2091,27 @@ sub storecomment {
     my ($r)=@_;
     my $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'});
     my $cleanmsgtxt='';
-    foreach (split(/[\n\r]/,$msgtxt)) {
-	unless ($_=~/^\s*(\>|\&gt\;)/) {
-	    $cleanmsgtxt.=$_."\n";
+    foreach my $line (split(/[\n\r]/,$msgtxt)) {
+	unless ($line=~/^\s*(\>|\&gt\;)/) {
+	    $cleanmsgtxt.=$line."\n";
 	}
     }
-    my $key=&Apache::lonnet::escape($env{'form.baseurl'}).'___'.time;
+    my $key=&escape($env{'form.baseurl'}).'___'.time;
     &Apache::lonnet::put('nohist_stored_comments',{ $key => $cleanmsgtxt });
 }
 
 sub storedcommentlisting {
     my ($r)=@_;
     my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
-       '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($env{'form.showcommentbaseurl'})));
+       '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
     $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef,
 					     {'onlybody' => 1}));
     if ((keys %msgs)[0]=~/^error\:/) {
 	$r->print(&mt('No stored comments yet.'));
     } else {
 	my $found=0;
-	foreach (sort keys %msgs) {
-	    $r->print("\n".$msgs{$_}."<hr />");
+	foreach my $key (sort(keys(%msgs))) {
+	    $r->print("\n".$msgs{$key}."<hr />");
 	    $found=1;
 	}
 	unless ($found) {
@@ -1665,8 +2128,22 @@ sub sendoffmail {
     my $sendstatus='';
     my %specialmsg_status;
     my $numspecial = 0;
+    my ($cdom,$cnum,$group);
+    if (exists($env{'form.group'})) {
+        $group = $env{'form.group'};
+    }
+    if (exists($env{'request.course.id'})) {
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    }
     if ($env{'form.send'}) {
-	&printheader($r,'','Messages being sent.');
+        if (!$env{'form.multiforward'}) { 
+            if ($group eq '') {
+	        &printheader($r,'','Messages being sent.');
+            } else {
+                $r->print(&groupmail_header('sending',$group));
+            }
+        }
 	$r->rflush();
 	my %content=();
 	undef %content;
@@ -1684,29 +2161,48 @@ sub sendoffmail {
 	    %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1);
 	    &statuschange($msgid,'replied',$folder);
 	}
-	my %toaddr=();
-	undef %toaddr;
-	if ($env{'form.sendmode'} eq 'group') {
-	    foreach (keys %env) {
-		if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-		    $toaddr{$1}='';
+
+	my @to =
+	    &Apache::loncommon::get_env_multiple('form.selectedusers_forminput');
+	my $mode = $env{'form.sendmode'};
+
+	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') {
-	    foreach (split(/[\n\r\f]+/,$env{'form.upfile'})) {
-		my ($rec,$txt)=split(/\s*\:\s*/,$_);
+	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
+                my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/);
 		if ($txt) {
-		    $rec=~s/\@/\:/;
+                    $rec =~ s/^\s+//;
+                    $rec =~ s/\s+$//;
 		    $toaddr{$rec}.=$txt."\n";
 		}
 	    }
 	} else {
-	    $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+	    if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) {
+		$toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+	    }
 	}
 	if ($env{'form.additionalrec'}) {
-	    foreach (split(/\,/,$env{'form.additionalrec'})) {
-		my ($auname,$audom)=split(/\@/,$_);
-		$toaddr{$auname.':'.$audom}='';
+	    foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {
+		my ($auname,$audom)=split(/:/,$rec);
+		if (($auname ne "") && ($audom ne "")) {
+		    $toaddr{$auname.':'.$audom}='';
+		}
 	    }
 	}
 
@@ -1726,33 +2222,43 @@ sub sendoffmail {
             $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
         }
 	
-	foreach (keys %toaddr) {
-	    my ($recuname,$recdomain)=split(/\:/,$_);
+	foreach my $address (sort(keys(%toaddr))) {
+	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
-	    if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
-	    my $thismsg;
+	    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.': ');
-		$thismsg=&Apache::lonmsg::user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt,
-				$env{'form.sendbck'},$env{'form.permanent'},
-                                                             \$sentmessage{$_});
+		$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});
 	    } else {
-		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
-		$thismsg=&Apache::lonmsg::user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt,
-					  $content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});
+		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
+		@thismsg=
+		    &Apache::lonmsg::user_normal_msg($recuname,$recdomain,
+						     $msgsubj,$msgtxt,
+						     $content{'citation'},
+						     undef,undef,
+						     $env{'form.permanent'},
+						     \$sentmessage{$address});
             }
 	    if (($env{'request.course.id'}) && (($msgtype eq 'critical') || 
                                          ($env{'form.sendmode'} eq 'group'))) {
-	        $specialmsg_status{$recuname.':'.$recdomain}  = $thismsg;
-                if ($thismsg eq 'ok') {
-                    $numspecial ++;
-                }
+	        $specialmsg_status{$recuname.':'.$recdomain} =
+		    join(' ',@thismsg);
+		foreach my $result (@thismsg) {
+		    if ($result eq 'ok') {
+			$numspecial++;
+		    }
+		}
 	    }
-	    $r->print($thismsg.'<br />');
-	    $sendstatus.=' '.$thismsg;
+	    $sendstatus.=' '.join(' ',@thismsg);
 	}
         if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group')
                                               || ($msgtype eq 'critical'))) {
@@ -1763,22 +2269,21 @@ sub sendoffmail {
                 $subj_prefix = 'Broadcast.';
             }
             my ($specialmsgid,$specialresult);
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my $course_str = &Apache::lonnet::escape('['.$cnum.':'.$cdom.']');
+            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);
-                $specialmsgid = &Apache::lonnet::unescape($specialmsgid);
+                $specialmsgid = &unescape($specialmsgid);
             }
             if ($specialresult eq 'ok') {
                 my $record_sent;
-                my @recusers = ();
-                my @recudoms = ();
-                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = 
-                            split(/\:/,&Apache::lonnet::unescape($specialmsgid));
+                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.']';
@@ -1790,15 +2295,15 @@ sub sendoffmail {
                         &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;
+                        my ($uname,$udom) = split(/:/,$recipient);
                         push(@recusers,$uname);
                         push(@recudoms,$udom);
                     }
                 }
                 if (@recusers) {
                     my $specialmessage;
-                    my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.
-                                                                       $msgsubj;
+                    my $sentsubj = 
+			$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj;
                     $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
                     my $sentmsgid = 
 			&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname,
@@ -1815,17 +2320,24 @@ sub sendoffmail {
     } else {
 	&printheader($r,'','No messages sent.'); 
     }
-    if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	$r->print('<br /><span class="LC_success">'.&mt('Completed.').'</span>');
-	if ($env{'form.displayedcrit'}) {
-	    &discrit($r);
-	} 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').'</p>');
+    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><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;
 }
 
 # ===================================================================== Handler
@@ -1845,7 +2357,8 @@ sub handler {
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','block','folder','startdis','interdis',
-	 'showcommentbaseurl','dismode']);
+	 'showcommentbaseurl','dismode','group','subject','text','ref',
+         'msgstatus']);
     $sqs='&sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
@@ -1867,7 +2380,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs.='&folder='.&Apache::lonnet::escape($folder);
+	$sqs.='&folder='.&escape($folder);
     }
 # ------------------------------------------------------------ Get Display Mode
 
@@ -1875,13 +2388,15 @@ sub handler {
     unless ($dismode) { 
 	$dismode=''; 
     } else {
-	$sqs.='&dismode='.&Apache::lonnet::escape($dismode);
+	$sqs.='&amp;dismode='.&escape($dismode);
     }
 
 # --------------------------------------------------------------------- Display
-
+    my $msgstatus = $env{'form.msgstatus'};
     $startdis=$env{'form.startdis'};
-    $startdis--;
+    if ($startdis ne '') {
+        $startdis--;
+    }
     unless ($startdis) { $startdis=0; }
 
     $interdis=$env{'form.interdis'};
@@ -1906,24 +2421,28 @@ sub handler {
 # --------------------------------------------------------------- Render Output
 
     if ($env{'form.display'}) {
-	&displaymessage($r,$env{'form.display'},$folder);
+	&displaymessage($r,$env{'form.display'},$folder,$msgstatus);
     } elsif ($env{'form.replyto'}) {
 	&compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
     } elsif ($env{'form.confirm'}) {
 	&printheader($r,'','Confirmed Receipt');
-	foreach (keys %env) {
-	    if ($_=~/^form\.rec\_(.*)$/) {
+	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 ($_=~/^form\.reprec\_(.*)$/) {
+	    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;
 	    }
 	}
-	&discrit($r);
+	if (!$replying) {
+	    &discrit($r);
+	}
     } elsif ($env{'form.critical'}) {
 	&printheader($r,'','Displaying Critical Messages');
 	&discrit($r);
@@ -1939,47 +2458,82 @@ sub handler {
 		      '<p class="LC_error">'.$msg."</p>\n");
 	}
 	&Apache::loncommunicate::menu($r);
-	&disall($r,($folder?$folder:$dismode));
-    } elsif ($env{'form.markedmove'}) {
-	my ($total,$failed,@failed_msg)=(0,0);
-	foreach my $key (keys(%env)) {
-	    if ($key=~/^form\.delmark_(.*)$/) {
-		my ($result,$msg) =
-		    &movemsg(&Apache::lonnet::unescape($1),$folder,
-			     $env{'form.movetofolder'});
-		if ($result) {
+	&disall($r,($folder?$folder:$dismode),$msgstatus);
+    } elsif ($env{'form.markedaction'} eq 'markedforward') {
+        my $total = 0;
+        my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
+        foreach my $msgid (@to_forward) {
+            &statuschange(&unescape($msgid),'forwarded',$folder);
+            $total ++;
+        }
+        if ($total > 0) {
+            &compout($r,undef,undef,undef,undef,$folder,$dismode,$total);
+        }
+    } elsif ($env{'form.markedaction'} eq 'markedread') {
+        my $total = 0;
+        my @to_markread = &Apache::loncommon::get_env_multiple('form.delmark');
+        foreach my $msgid (@to_markread) {
+            &statuschange(&unescape($msgid),'read',$folder);
+            $total ++;
+        }
+        &printheader($r,'','Marked Messages Read');
+        $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+        &Apache::loncommunicate::menu($r);
+        &disall($r,($folder?$folder:$dismode),$msgstatus);
+    } elsif ($env{'form.markedaction'} eq 'markedunread') {
+        my $total = 0;
+        my @to_markunread = &Apache::loncommon::get_env_multiple('form.delmark');
+        foreach my $msgid (@to_markunread) {
+            &statuschange(&unescape($msgid),'new',$folder);
+            $total ++;
+        }
+        &printheader($r,'','Marked Messages Unread');
+        $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+        &Apache::loncommunicate::menu($r);
+        &disall($r,($folder?$folder:$dismode),$msgstatus);
+    } elsif ($env{'form.markedaction'} eq 'markedmove') {
+        my $destfolder = $env{'form.movetofolder'};
+        my %gotfolders = &Apache::lonmsg::get_user_folders();
+        &printheader($r,'','Moved Messages');
+        if (!defined($gotfolders{$destfolder})) {
+            $r->print(&mt('Destination folder [_1] is not a valid folder',
+                      $destfolder));
+        } else {
+	    my ($total,$failed,@failed_msg)=(0,0);
+            my @to_move = &Apache::loncommon::get_env_multiple('form.delmark');
+            foreach my $msgid (@to_move) {
+	        my ($result,$msg) = &movemsg(&unescape($msgid),$folder,
+			                     $env{'form.movetofolder'});
+	        if ($result) {
 		    $total++;
-		} else {
+	        } else {
 		    $failed++;
 		    push(@failed_msg,$msg);
-		}
+	        }
 	    }
-	}
-	&printheader($r,'','Moved Messages');
-	if ($failed) {
-	    $r->print('<p class="LC_error">
+	    if ($failed) {
+	        $r->print('<p class="LC_error">
                           '.&mt('Failed to move [_1] message(s)',$failed).
 		      '</p>');
-	    $r->print('<p class="LC_error">'.
-		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
-		      "</p>\n");
-	}
-	$r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+	        $r->print('<p class="LC_error">'.
+	   	          join("</p>\n<p class=\"LC_error\">",@failed_msg).
+		          "</p>\n");
+	    }
+	    $r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+        }
 	&Apache::loncommunicate::menu($r);
-	&disall($r,($folder?$folder:$dismode));
-    } elsif ($env{'form.markeddel'}) {
+	&disall($r,($folder?$folder:$dismode),$msgstatus);
+    } elsif ($env{'form.markedaction'} eq 'markeddel') {
 	my ($total,$failed,@failed_msg)=(0,0);
-	foreach my $key (keys(%env)) {
-	    if ($key=~/^form\.delmark_(.*)$/) {
-		my ($result,$msg) = 
-		    &statuschange(&Apache::lonnet::unescape($1),'deleted',
-				  $folder);
-		if ($result) {
-		    $total++;
-		} else {
-		    $failed++;
-		    push(@failed_msg,$msg);
-		}
+        my @to_delete = &Apache::loncommon::get_env_multiple('form.delmark');
+        foreach my $msgid (@to_delete) {
+	    my ($result,$msg) = &statuschange(&unescape($msgid),'deleted', 
+				              $folder);
+	    if ($result) {
+	        $total++;
+	    } else {
+	        $failed++;
+		push(@failed_msg,$msg);
 	    }
 	}
 	&printheader($r,'','Deleted Messages');
@@ -1993,12 +2547,12 @@ sub handler {
 	}
 	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,($folder?$folder:$dismode));
+	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {
 	&printheader($r,'','Marked Message as Unread');
 	&statuschange($env{'form.markunread'},'new');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,($folder?$folder:$dismode));
+	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.compose'}) {
 	&compout($r,'','',$env{'form.compose'});
     } elsif ($env{'form.recordftf'}) {
@@ -2006,29 +2560,119 @@ sub handler {
     } elsif ($env{'form.block'}) {
         &examblock($r,$env{'form.block'});
     } elsif ($env{'form.sendmail'}) {
-	&sendoffmail($r,$folder);
+        if ($env{'form.multiforward'}) {
+            &printheader($r,'','Messages being sent.');
+            my $fixed_subj = $env{'form.subject'};
+            my $suffix=&Apache::lonmsg::foldersuffix($folder);
+            my (%sendresult,%forwardok,%forwardfail,$fwdcount);
+            my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
+            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);
+                if ($env{'form.showorigsubj'}) {
+                    $env{'form.subject'} = $fixed_subj.$content{'subject'};
+                } else {
+                    $env{'form.subject'} = '';
+                }
+                my $uname = $content{'sendername'};
+                my $udom = $content{'senderdomain'};
+                &statuschange($msgid,'forwarded',$folder);
+                if ($env{'form.showorigsender'}) {
+                    $env{'form.message'} = $env{'form.msgheader'}.' '.
+                        &Apache::loncommon::plainname($uname,$udom).' ('.
+                                           $uname.':'.$udom.')';
+                }
+                $env{'form.message'} .= "\n\n-- Forwarded message --\n\n".
+                                        $content{'message'};
+                $fwdcount ++;
+                $r->print($fwdcount.': '); 
+                $sendresult{$msgid} = &sendoffmail($r,$folder);
+                $r->print('<br />');
+            }
+            foreach my $key (keys(%sendresult)) {
+                if ($sendresult{$key} =~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+                    $forwardok{$key} = $sendresult{$key};
+                } else {
+                    $forwardfail{$key} = $sendresult{$key}; 
+                }
+            }
+            if (keys(%forwardok) > 0) {
+                my $count = keys(%forwardok);
+                $r->print('<br /><span class="LC_success">'.
+                          &mt('[quant,_1,message] forwarded.',$count).
+                          '</span>');
+            }
+            if (keys(%forwardfail) > 0) {
+                my $count = keys(%forwardfail);
+                $r->print('<p><span class="LC_error">'.
+                          &mt('Could not forward [quant,_1,message].',$count).
+                          '</span> ');
+                foreach my $key (keys(%forwardfail)) {
+                    $r->print(&mt('Could not deliver forwarded message.').'</span> '.
+                              &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').<br /><br />');
+                }
+            }
+            &Apache::loncommunicate::menu($r);
+        } else {
+	    &sendoffmail($r,$folder);
+        }
 	if ($env{'form.storebasecomment'}) {
 	    &storecomment($r);
-	}
+        }
 	if (($env{'form.rsspost'}) && ($env{'request.course.id'})) {
-	    &Apache::lonrss::addentry($env{'course.'.$env{'request.course.id'}.'.num'},
+	        &Apache::lonrss::addentry($env{'course.'.$env{'request.course.id'}.'.num'},
 				      $env{'course.'.$env{'request.course.id'}.'.domain'},
 				      'Course_Announcements',
 				      $env{'form.subject'},
 				      $env{'form.message'},'/adm/communicate','public');
 	}
-	&disall($r,($folder?$folder:$dismode));
+	if ((!exists($env{'form.group'})) && (!$env{'form.displayedcrit'})) {
+	    &disall($r,($folder?$folder:$dismode),$msgstatus);
+	}
     } elsif ($env{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
-	&makefolder($env{'form.newfolder'});
-	&Apache::loncommunicate::menu($r);
-	&disall($r,$env{'form.newfolder'});
+        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 />');
+        } else {
+            $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
+                      $warning);
+            $showfolder = $folder;
+        }
+        &Apache::loncommunicate::menu($r);
+	&disall($r,$showfolder,$msgstatus);
     } elsif ($env{'form.showcommentbaseurl'}) {
 	&storedcommentlisting($r);
+    } elsif ($env{'form.folderaction'} eq 'delete') {
+        &printheader($r,'','Deleted Folder');
+        my $showfolder = '';
+        my $delresult = &deletefolder($folder);
+        if ($delresult eq 'ok') {
+            $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+        } else {
+            $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+            $showfolder = $folder;
+        }
+        &Apache::loncommunicate::menu($r);
+        &disall($r,$showfolder,$msgstatus);
+    } elsif ($env{'form.folderaction'} eq 'rename') {
+        &printheader($r,'','Renamed Folder');
+        my $showfolder = $env{'form.renamed'};
+        my $renresult = &renamefolder($folder);
+        if ($renresult eq 'ok') {
+            $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+        } else {
+            $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+            $showfolder = $folder;
+        }
+        &Apache::loncommunicate::menu($r);
+        &disall($r,$showfolder,$msgstatus);
     } else {
 	&printheader($r,'','Display All Messages');
-	&Apache::loncommunicate::menu($r); 
-	&disall($r,($folder?$folder:$dismode));
+	&Apache::loncommunicate::menu($r);
+	&disall($r,($folder?$folder:$dismode),$msgstatus);
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -2045,9 +2689,3 @@ sub handler {
 
 __END__
 
-
-
-
-
-
-