--- loncom/interface/lonmsgdisplay.pm	2010/08/20 19:12:22	1.124.4.11
+++ loncom/interface/lonmsgdisplay.pm	2013/09/04 14:21:30	1.169
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.11 2010/08/20 19:12:22 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.169 2013/09/04 14:21:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,11 +110,11 @@ use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonselstudent();
 use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 # Querystring component with sorting type
-my $sqs;
-my $startdis;
+my $sqs='';
+my $startdis='';
 
 # ============================================================ List all folders
 
@@ -128,11 +128,8 @@ sub folderlist {
                 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',
+                fmnb => 'Folder may not be renamed as it is a folder provided by the system.',
+                asth => 'Requested name already in use for a system-provided or user-defined folder.',
 
     );
 
@@ -182,7 +179,7 @@ function folder_choice(targetform,caller
         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'}");
+                    alert("'"+permfolders_vals[i]+"' -- $lt{'fmnb'}");
                     return;
                 }
             }
@@ -191,7 +188,7 @@ function folder_choice(targetform,caller
                 targetform.renamed.value=foldername;
                 for (var i=0; i<allfolders.length; i++) {
                     if (allfolders[i] == foldername) {
-                        alert("$lt{'thfm'} '"+foldername+"' $lt{'asth'}");
+                        alert("'"+foldername+"' $lt{'asth'}");
                         return;
                     }
                 }
@@ -207,7 +204,7 @@ function folder_choice(targetform,caller
         if (newname) {
             for (var i=0; i<allfolders.length; i++) {
                 if (allfolders[i] == newname) {
-                    alert("$lt{'tnfm'} '"+newname+"' $lt{'asth'}");
+                    alert("'"+newname+"' -- $lt{'asth'}");
                     return;
                 }
             }
@@ -222,39 +219,40 @@ function folder_choice(targetform,caller
 
     $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">
+   <div class="LC_columnSection"><fieldset>
+   <legend>'.&mt('Folder Actions').'</legend>
+   <table border="0" cellspacing="2" cellpadding="8">
     <tr>
-     <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
-         &Apache::loncommon::select_form($folder,'folder',%formhash).'
+     <td><b>'.$lt{'fold'}.'</b><br />'."\n".
+         &Apache::loncommon::select_form($folder,'folder',\%formhash).'
      </td>
-     <td align="center"><b>'.$lt{'show'}.'</b><br />'."\n".
+     <td><b>'.$lt{'show'}.'</b><br />'."\n".
          &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
-					 %show).'
+					 \%show).'
+     </td>
+     <td><b>'.$lt{'status'}.'</b><br />'."\n".
+       &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
      </td>
-     <td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".
-       &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
+     <td style="padding-right: 40px;">
+         <b>'.$lt{'actn'}.'</b><br />'."\n".'
+         <span class="LC_nobreak">'.
+         &Apache::loncommon::select_form('view','folderaction',\%actions).
+         ' <input type="button" value="'.$lt{'go'}.
+         '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
+         </span>
      </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 style="border-left: 1px solid;padding-left: 40px;">
+         <b>'.&mt('New Folder').'</b><br />'."\n".'
+         <span class="LC_nobreak">
+         <input type="text" size="15" name="newfolder" value="" />
+         <input type="button" value="'.$lt{'go'}.
+         '" onclick="javascript:folder_choice(this.form,'."'new'".');" />
+         </span>
      </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('New Folder').
-    '" onclick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
-    '<td align="center"><b>'.&mt('Name').'</b><br />'.
-    '<input type="text" size="15" name="newfolder" value="" />
-    </td></tr></table>
-  </td>
- </tr>
-</table>'."\n".
+   </fieldset></div>
+'."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
     '<input type="hidden" name="renamed" value="" />'.
         ($folder=~/^critical/?'</form>':'');
@@ -295,14 +293,27 @@ sub scrollbuttons {
     } else {
         $status = $statushash{$msgstatus};
     }
-    return
-   '<b>'.&mt('Page').'</b>: '. 
-   '<input type="submit" name="firstview" value="|&lt;" />'.
-   '<input type="submit" name="prevview" value="&lt;" />'.
-   '<input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> of '.$maxdis.
-   '<input type="submit" name="nextview" value="&gt;" />'.
-   '<input type="submit" name="lastview" value="&gt;|" /><br />'.
-   &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
+    my $output = '<b>'.&mt('Page:').'</b> ';
+    if ($maxdis == 1) {
+        # No buttons if only one page is displayed
+        $output .= '1/1';
+    } else {
+        $output .=
+           '<input type="submit" name="firstview" value="|&lt;" />'.
+           '<input type="submit" name="prevview" value="&lt;" />'.
+           ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
+           '<input type="submit" name="nextview" value="&gt;" />'.
+           '<input type="submit" name="lastview" value="&gt;|" />';
+    }
+    $output .=
+        '<p>'
+       .'<b>'.&mt($status.' messages:').'</b> '
+       .&mt('showing messages [_1] through [_2] of [_3].',
+            $first,$finish,$total)
+       .'</p>'
+       .'</form>';
+
+    return $output;
 }
 # =============================================================== Status Change
 
@@ -369,7 +380,7 @@ sub deletefolder {
     my ($folder)=@_;
     my %permfolders = &get_permanent_folders();
     if (defined($permfolders{$folder})) {
-        return &mt('The folder "[_1]" may not be deleted',$folder); 
+        return &mt('The folder "[_1]" may not be deleted.',$folder); 
     }
     my %userfolders = &Apache::lonmsg::get_user_folders();
     if (!defined($userfolders{$folder})) {
@@ -525,20 +536,20 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1,"selectedusers",1,'email')
        ) {
-        my $bcc_curr_hdr;
-        if ($crstype eq 'Community') {
-            $bcc_curr_hdr = &mt('Bcc: community participants with current access');
-        } else {
-            $bcc_curr_hdr = &mt('Bcc: course members with current access');
-        }
-        $result .= '<fieldset id="LC_activeusers"><legend>'
-                   .'<b>'.$bcc_curr_hdr.'</b>'
-                   .'</legend>'
-                   .'<form name="activeusers">';
-        $result .= $tmptext.'</form></fieldset><br />';
-        if (ref($statushash) eq 'HASH') {
-            $statushash->{'active'} = 1;
-        }
+       my $bcc_curr_hdr;
+       if ($crstype eq 'Community') {
+           $bcc_curr_hdr = &mt('Bcc: community participants with current access');
+       } else {
+           $bcc_curr_hdr = &mt('Bcc: course members with current access');
+       }
+       $result .= '<fieldset id="LC_activeusers"><legend>'
+                 .$bcc_curr_hdr
+                 .'</legend>'
+                 .'<form name="activeusers" action="">';
+       $result .= $tmptext.'</form></fieldset><br />';
+       if (ref($statushash) eq 'HASH') {
+           $statushash->{'active'} = 1;
+       }
     }
     if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
                                                                "previoususers",
@@ -546,20 +557,21 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-        my $bcc_prev_hdr;
-        if ($crstype eq 'Community') {
-            $bcc_prev_hdr = &mt('Bcc: community participants with expired access');
-        } else {
-            $bcc_prev_hdr = &mt('Bcc: course members with expired access');
-        }
-        $result .= '<fieldset id="LC_previoususers"><legend>'
-                   .'<b>'.$bcc_prev_hdr.'</b>'
-                   .'</legend>'
-                   .'<form name="previoususers">';
+       my $bcc_prev_hdr;
+       if ($crstype eq 'Community') {
+           $bcc_prev_hdr = &mt('Bcc: community participants with expired access');
+       } else {
+           $bcc_prev_hdr = &mt('Bcc: course members with expired access');
+       }
+       $result .= '<fieldset id="LC_previoususers"><legend>'
+                 .$bcc_prev_hdr
+                 .'</legend>'
+                 .'<form name="previoususers" action="">';
        $result .= $tmptext.'</form></fieldset><br />';
        if (ref($statushash) eq 'HASH') {
            $statushash->{'previous'} = 1;
        }
+
     }
     if ($tmptext = &Apache::lonselstudent::render_student_list($future_members,
                                                                "futureusers",
@@ -567,20 +579,22 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-        my $bcc_future_hdr;
-        if ($crstype eq 'Community') {
-            $bcc_future_hdr = &mt('Bcc: community participants with future access');
-        } else {
-            $bcc_future_hdr = &mt('Bcc: course members with future access');
-        }
-        $result .= '<fieldset id="LC_futureusers"><legend>'
-                   .'<b>'.$bcc_future_hdr.'</b>'
-                   .'</legend>'
-                   .'<form name="futureusers">';
+       my $bcc_future_hdr;
+       if ($crstype eq 'Community') {
+           $bcc_future_hdr = &mt('Bcc: community participants with future access');
+       } else {
+           $bcc_future_hdr = &mt('Bcc: course members with future access');
+       }
+
+       $result .= '<fieldset id="LC_futureusers"><legend>'
+                 .$bcc_future_hdr
+                 .'</legend>'
+                 .'<form name="futureusers" action="">';
        $result .= $tmptext.'</form></fieldset>';
        if (ref($statushash) eq 'HASH') {
            $statushash->{'future'} = 1;
        }
+
     }
     return $result;
 }
@@ -614,9 +628,7 @@ sub disgroup {
         return;
     } else {
         $hasfloat = 1;
-        unless($env{'environment.wysiwygeditor'} eq 'on') {
-            $r->print('<div class="LC_left_float">');
-        }
+        $r->print('<div class="LC_left_float">');
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -650,8 +662,9 @@ sub disgroup {
                     if (ref($access_status) eq 'HASH') {
                         $access_status->{$status} = $$numitems{$status};
                     }
-                    $r->print('<fieldset><legend><b>'.$lt{$status}.
-                              '</b></legend><form name="'.$formname.'">'.
+                    $r->print('<fieldset>'.
+                              '<legend>'.$lt{$status}.'</legend>'.
+                              '<form name="'.$formname.'" action="">'.
                               '<span class="LC_nobreak">'.
                               '<input type="button" value="'.&mt('Check All').'" '.
                               'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
@@ -688,9 +701,7 @@ sub disgroup {
                 }
             }
         }
-        unless($env{'environment.wysiwygeditor'} eq 'on') {
-            $r->print('</div>');
-        }
+        $r->print('</div>');
     }
     return $hasfloat;
 }
@@ -698,7 +709,7 @@ sub disgroup {
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
-/ <![CDATA[
+// <![CDATA[
 function toggleAll(form,action) {
     if (typeof(form.selectedusers_forminput.length)=="undefined") {
          if (action == 'check') {
@@ -751,7 +762,7 @@ sub groupmail_header {
             $brtitle = 'View community groups';  
         } else {
             $brtitle = 'View course groups';
-        }
+        }  
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/coursegroups",
               text=>"Groups",
@@ -805,6 +816,15 @@ sub discrit {
     foreach my $key (sort(keys(%what))) {
         my %content=&Apache::lonmsg::unpackagemsg($what{$key});
         next if ($content{'senderdomain'} eq '');
+        my $description;
+        if ($content{'courseid'} ne '') {
+            if ($content{'courseid'} =~ m{/^$match_domain\_$match_courseid$}) {
+                my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'},{'one_time' => 1});
+                if ($courseinfo{'description'} ne '') {
+                    $description = $courseinfo{'description'};
+                }
+            }
+        }
         $result .= &Apache::lonhtmlcommon::start_pick_box()
                   .&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value')
                   .'<b>'.&Apache::loncommon::aboutmewrapper(
@@ -816,8 +836,13 @@ sub discrit {
                   .&Apache::lonhtmlcommon::row_closure(1)
                   .&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value')
                   .$content{'subject'}
-                  .&Apache::lonhtmlcommon::row_closure(1)
-                  .&Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
+                  .&Apache::lonhtmlcommon::row_closure(1);
+        if ($description ne '') {
+            $result .= &Apache::lonhtmlcommon::row_title(&mt('Course'),undef,'LC_oddrow_value')
+                      .$description
+                      .&Apache::lonhtmlcommon::row_closure(1);
+        }
+        $result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
                   .'<pre>'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'</pre>'
                   .&Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
@@ -854,8 +879,9 @@ sub discrit {
             '<p class="LC_info">'.
             &mt('You have no critical messages.').
             '</p>'.
-            '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
-            '<a href="/adm/email">'.&mt('Communicate').'</a>';
+            &Apache::lonhtmlcommon::actionbox(
+                ['<a href="/adm/roles">'.&mt('Select a course').'</a>',
+                 '<a href="/adm/email">'.&mt('Communicate').'</a>']);
     } else {
         $r->print($header);
     }
@@ -972,10 +998,15 @@ 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'};
+                if ($fromcid =~ m{/^$match_domain\_$match_courseid$}) {
+                    my %courseinfo=&Apache::lonnet::coursedescription($fromcid,
+                                                                      {'one_time' => 1});
+                    $description = $courseinfo{'description'};
+                }
+            }
+            if ($description ne '') {
+                $$descriptions{$fromcid} = $description;
             }
-            $$descriptions{$fromcid} = $description;
         }
         return $description;
     }
@@ -1014,7 +1045,7 @@ sub disfolder {
     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.',
+                      nome => 'No messages have been selected to apply this action to.',
                       chec => 'Check the checkbox for at least one message.',  
     );
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
@@ -1056,14 +1087,13 @@ ENDDISHEADER
     my $fsqs='&amp;folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
-
     if ($totalnumber < 1) {
         $r->print('<p class="LC_info">');
         if ($msgstatus eq '') {
             $r->print(&mt('There are no messages in this folder.'));
         } elsif ($msgstatus eq 'replied') {
             $r->print(&mt('You have not replied to any messages in this folder.'));
-        } else { 
+        } else {
             $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.'));
         }
         $r->print('</p>');
@@ -1086,7 +1116,9 @@ ENDDISHEADER
     if ($lastdis>$#temp) { $lastdis=$#temp; }
     $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="1">&nbsp;</th><th>');
+	      &Apache::loncommon::start_data_table().
+          &Apache::loncommon::start_data_table_row().
+          '<th colspan="1">&nbsp;</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
@@ -1116,7 +1148,7 @@ ENDDISHEADER
     } else {
         $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
     }
-    $r->print('</th><th>');
+    $r->print('</th><th colspan="2">');
     if ($env{'form.sortedby'} eq "revstatus") {
 	$r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
@@ -1130,17 +1162,19 @@ ENDDISHEADER
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
 		@{$temp[$n]};
-	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+        if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+            my $class_msgstatus = '';
             $count ++;
-	    if ($status eq 'new') {
-		$r->print('<tr class="LC_mail_new">');
-	    } elsif ($status eq 'read') {
-		$r->print('<tr class="LC_mail_read">');
-	    } elsif ($status eq 'replied') {
-		$r->print('<tr class="LC_mail_replied">'); 
-	    } else {
-		$r->print('<tr class="LC_mail_other">');
-	    }
+            if ($status eq 'new') {
+                $class_msgstatus = 'LC_mail_new';
+            } elsif ($status eq 'read') {
+                $class_msgstatus = 'LC_mail_read';
+            } elsif ($status eq 'replied') {
+                $class_msgstatus = 'LC_mail_replied'; 
+            } else {
+                $class_msgstatus = 'LC_mail_other';
+            }
+            $r->print(&Apache::loncommon::start_data_table_row($class_msgstatus));
 	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
 	    if ($folder eq 'sent') {
                 if (defined($recv_name) && defined($recv_domain)) {
@@ -1172,6 +1206,7 @@ ENDDISHEADER
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
                           $item.(($status eq 'new')?'</b>':'').'</a></td>');
             }
+            # Description and Status
             my $showstatus;
             my %statushash = &get_msgstatus_types();
             if ($status eq '') {
@@ -1179,25 +1214,40 @@ ENDDISHEADER
             } 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') {
+            $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
+                      (($status eq 'new')?'</b>':'').
+                      '</td>');
+            $r->print('<td class="'.$class_msgstatus.'">&nbsp;&nbsp;</td>'.
+                      '<td>'.
+                      (($status eq 'new')?'<b>':'').&mt($showstatus).
+                      (($status eq 'new')?'</b>':'').
+                      '</td>');
+
+            $r->print(&Apache::loncommon::end_data_table_row());
+
+        } elsif ($status eq 'deleted') {
 # purge
-	    my ($result,$msg) = 
-		&movemsg(&unescape($origID),$folder,'trash');
-	    
-	}
+            my ($result,$msg) = 
+        	&movemsg(&unescape($origID),$folder,'trash');
+        }
     }   
-    $r->print("</table>\n");
-    $r->print('<table border="0" cellspacing="2" cellpadding="2">
+    $r->print(&Apache::loncommon::end_data_table());
+
+
+    # Bottom Functions
+    $r->print('
+<div class="LC_columnSection"><fieldset>
+<legend>'.&mt('Message Actions').'</legend>
+<table border="0" cellspacing="2" cellpadding="8">
  <tr>
-  <td>'.
-  '<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".
-  '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
-  '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".
-  '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
+  <td><b>'.&mt('Select Messages').'</b><br />
+   <span class="LC_nobreak">
+   <input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" />'."\n".
+  ' <input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
+  '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />
+  </span>
+  </td>'."\n".
+  '<td><b>'.&mt('Action').'</b><br />'."\n".
   '  <select name="checkedaction">'."\n");
 
     if ($folder ne 'trash') {
@@ -1219,19 +1269,21 @@ ENDDISHEADER
     $r->print("\n".'</select></td>'."\n");
 
     if (keys(%gotfolders) > 0) {
-        $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
+        $r->print('<td><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).
+        $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
                   '</td>');
     }
-    $r->print('<td>&nbsp;</td><td>&nbsp;&nbsp;'.
+    $r->print('<td style="vertical-align:bottom;">'.
               '<input type="button" name="go" value="'.&mt('Go').
               '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
-              '</tr></table>');
+              '</tr></table>'."\n".
+              '</fieldset></div>'."\n"
+    );
     my $postedstartdis=$startdis+1;
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {
@@ -1246,8 +1298,12 @@ sub blocked_in_folder {
     my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
     my $output = '<br /><br />'.
                   &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
-    $output .= &Apache::loncommon::build_block_table($startblock,$endblock,
-                                                     $setters);
+    #$output .= &Apache::loncommon::build_block_table($startblock,$endblock,
+    #                                                 $setters);
+    
+    my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+    $output .="<br /><br />".$blocktext;
+
     return $output;
 }
 
@@ -1293,7 +1349,8 @@ sub compout {
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
             $r->print(&mt('Each of the[_1] [quant,_2,message] [_3]you checked'
-                         .' will be forwarded to the recipient(s) you select below.','<b>',$multiforward,'</b>')
+                         .' will be forwarded to the recipient(s) you select below.'
+                         ,'<b>',$multiforward,'</b>')
                     .'<br />');
         } else {
             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
@@ -1357,12 +1414,14 @@ sub compout {
         if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
             &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
                                      '/'.$env{'request.course.sec'})) {
+
             my $rectxt;
             if (&Apache::loncommon::course_type() eq 'Community') {
                 $rectxt = &mt("Include in community's 'User records' for recipient(s)");
             } else {
                 $rectxt = &mt("Include in course's 'User records' for recipient(s)");
             }
+
             $dispcrit.='<label>'.
                        '<input type="checkbox" name="courserecord" value="1" /> '.
                        $rectxt.
@@ -1384,11 +1443,7 @@ sub compout {
         if ($group eq '') {
             my $studentsel = &discourse(\%access_status);
             if ($studentsel) {
-                if ($env{'environment.wysiwygeditor'} eq 'on') {
-                    $r->print($studentsel);
-                } else {
-                    $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
-                }
+                $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
                 $hasfloat = 1;
             }
         } else {
@@ -1412,9 +1467,12 @@ function courseRecipients() {
                     document.compemail.groupmail.value = document.$formname.groupmail[document.$formname.groupmail.selectedIndex].value;
 |;
                 }
+                #typeof(...forminput.length) returns 'undefined' if only one entry exists
                 $broadcast_js .= qq|
     if (typeof(document.$formname.selectedusers_forminput.length)=="undefined") {
-        document.compemail.courserecips.value += '_&&&_'+document.$formname.selectedusers_forminput.value;
+        if (document.$formname.selectedusers_forminput.checked) {
+            document.compemail.courserecips.value += '_&&&_'+document.$formname.selectedusers_forminput.value;
+        }
     } else {
         for (var i=0; i<document.$formname.selectedusers_forminput.length; i++) {
             if (document.$formname.selectedusers_forminput[i].checked) {
@@ -1484,11 +1542,7 @@ ENDREPSCRIPT
     if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
     if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
     if ($hasfloat) {
-        if ($env{'environment.wysiwygeditor'} eq 'on') {
-            $r->print($broadcast_js);
-        } else {
-            $r->print($broadcast_js.'<div class="LC_left_float">');
-        }
+        $r->print($broadcast_js.'<div class="LC_left_float">');
         $onsubmit = ' onsubmit="javascript:courseRecipients();" ';
     }
     $r->print(
@@ -1598,14 +1652,18 @@ ENDREPSCRIPT
         }
     }
     my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
-    my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'<br />';
+    my $textareaclass;
+    if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+        $r->print(&Apache::lonhtmlcommon::htmlareaselectactive());
+        $textareaclass = 'class="LC_richDefaultOff"';
+    }
     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>');
+        &mt("The subject in each forwarded message will be [_1]'Forwarding:'[_2] followed by the original subject.",'<i>','</i>').'</li><li>'.
+        &mt("The message itself will begin with a first line: [_1]'Forwarded message from'[_2] followed by the original sender's name.",'<i>','</i>').'</li></ul></td></tr>');
         $func1='Forward'; # do not translate here!
         $dissub = &mt('Forwarding').': ';
         $subj_size = '10';
@@ -1620,8 +1678,7 @@ ENDREPSCRIPT
 <tr><td align="left">'."\n".
 $latexHelp."<br />\n".
 &mt("Any new text to display before the text of the original messages:").'<br />'."\n".
-'<textarea name="message" id="message" cols="80" rows="5" wrap="hard"></textarea>'.
-$wysiwyglink);
+'<textarea name="message" id="message" cols="80" rows="5" wrap="hard" $textareaclass></textarea>');
         my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
         foreach my $msg (@to_forward) {
             $r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');
@@ -1641,8 +1698,9 @@ $wysiwyglink);
 $attachrow
 </table><br />
 $latexHelp<br />
-<textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
-</textarea>$wysiwyglink
+<textarea name="message" id="message" cols="80" rows="15" wrap="hard" $textareaclass>$dismsg
+</textarea>
+<br />
 $sendmode
 $dispcrit
 $disbase
@@ -1667,8 +1725,8 @@ ENDCOMP
 Subject: <input type="text" size="50" name="subject" />
 </p>
 <p>$lt{'gmt'}:<br />
-<textarea name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
-</textarea>$wysiwyglink</p>
+<textarea name="message" id="message" cols="60" rows="10" wrap="hard" $textareaclass>$dismsg
+</textarea></p>
 <p>
 $lt{'tff'}:
 ENDBLOCK
@@ -1680,7 +1738,7 @@ ENDBLOCK
 '</pre>
 </p>
 <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.'));
+'.&mt('The messages will be assembled from all lines with the respective [_1][_2]username:domain[_3], and appended to the general message text.','<br />','<tt>','</tt>'));
         $r->print(<<ENDUPLOAD);
 </p>
 <p>
@@ -1694,9 +1752,7 @@ ENDUPLOAD
     }
     $r->print('</form>');
     if ($hasfloat) {
-        unless($env{'environment.wysiwygeditor'} eq 'on') {
-            $r->print('</div><div class="LC_clear_float_footer"></div>');
-        }
+        $r->print('</div><div class="LC_clear_float_footer"></div>');
     }
     $r->print(&generate_preview_form);
 }
@@ -1743,7 +1799,7 @@ sub additional_rec_row {
     my $bcc = &mt('Bcc:');
     my $exmpl = &mt('username:domain,username:domain,...'); 
     my $output = <<"ENDADD";
-<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <tt>($exmpl)</tt>:</legend><table>
+<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend>$lt->{'ad'} <tt>($exmpl)</tt></legend><table>
 <tr><td>&nbsp;</td><td>$lt->{'to'}</td><td><input type="text" size="50" name="additionalrec_to" /></td></tr>
 <tr><td>&nbsp;</td><td>$cc</td><td><input type="text" size="50" name="additionalrec_cc" /></td></tr> 
 <tr><td>&nbsp;</td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
@@ -1821,8 +1877,10 @@ sub retrieve_instructor_comments {
 }
 
 sub disfacetoface {
-    my ($r,$user,$domain)=@_;
-    my $target=$env{'form.grade_target'};
+    my ($r,$user,$domain,$target)=@_;
+    if ($target eq '') {
+        $target=$env{'form.grade_target'};
+    }
     unless ($env{'request.course.id'}) { return; }
     if  (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
 	 && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
@@ -1834,13 +1892,13 @@ sub disfacetoface {
 			 $env{'course.'.$env{'request.course.id'}.'.domain'},
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
-    my $result='';
+    my $result='<div>';
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
-        if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
-            &Apache::lonfeedback::newline_to_br(\$content{'message'});
-        }
+    if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
+		&Apache::lonfeedback::newline_to_br(\$content{'message'});
+	}
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {
@@ -1900,9 +1958,11 @@ $content{'sendername'}.':'.
 	} else {
 	    $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\');
 	}
+    } elsif ($target ne 'tex') {
+       $r->print($result.'</div>');
     } else {
-       $r->print($result);
-    }
+		$r->print(&Apache::lonxml::xmlparse($r, 'tex', $result));
+	}
 }
 
 sub general_message {
@@ -1929,7 +1989,7 @@ sub facetoface {
     }
     my $crstype = &Apache::loncommon::course_type();
     my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
-                                        : 'faculty and staff';
+                                            : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
 		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
@@ -1986,7 +2046,7 @@ sub facetoface {
                  .&mt('Discussion and message records for [_1] ([_2])'
                      ,$aboutmelink
                      ,$env{'form.recuname'}.':'.$env{'form.recdomain'})
-                 .'<h2>'
+                 .'</h2>'
        );
         &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'});
 	$r->print(<<ENDRHEAD);
@@ -2005,317 +2065,6 @@ ENDBFORM
     }
 }
 
-# ----------------------------------------------------------- Blocking during exams
-
-sub examblock {
-    my ($r,$action) = @_;
-    unless ($env{'request.course.id'}) { return;}
-    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;
-    my $crstype = &Apache::loncommon::course_type();
-    if ($crstype eq 'Community') {
-        $usertype = 'members';
-    } else {
-	$usertype = 'students';
-    }
-    my $lctype = lc($crstype);
-    my %lt=&Apache::lonlocal::texthash(
-            'comb' => 'Communication Blocking',
-            'cbds' => 'Communication blocking during scheduled exams',
-            'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype 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 or community, 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 saved',
-             'stor' => 'Save',
-    );
-
-    my %ltext = &Apache::lonlocal::texthash(
-            'dura' => 'Duration',
-            'setb' => 'Set by',
-            'even' => 'Event',
-            'blck' => 'Blocked?',
-            'actn' => 'Action',
-            'star' => 'Start',
-            'endd' => 'End'
-    );
-
-    &printheader($r,'/adm/email?block=display',$lt{'comb'});
-    $r->print('<h3>'.$lt{'cbds'}.'</h3>');
-
-    if ($action eq 'store') {
-        &blockstore($r);
-    }
-
-    $r->print($lt{'desc'}.'<br /><br />
-               <form name="blockform" method="post" action="/adm/email?block=store">
-             ');
-
-    $r->print('<h4>'.$lt{'mecb'}.'</h4>');
-    my %records = ();
-    my $blockcount = 0;
-    my $parmcount = 0;
-    &get_blockdates(\%records,\$blockcount);
-    if ($blockcount > 0) {
-        $parmcount = &display_blocker_status($r,\%records,\%ltext);
-    } else {
-        $r->print($lt{'ncbc'}.'<br /><br />');
-    }
-    &display_addblocker_table($r,$parmcount,\%ltext);
-    my $end_page=&Apache::loncommon::end_page();
-    $r->print(<<"END");
-<br />
-<input type="hidden" name="blocktotal" value="$blockcount" />
-<input type ="submit" value="$lt{'stor'}" />
-</form>
-$end_page
-END
-    return;
-}
-
-sub blockstore {
-    my $r = shift;
-    my %lt=&Apache::lonlocal::texthash(
-            'tfcm' => 'The following changes were made',
-            'ncwm' => 'No changes were made.' 
-    );
-    my %adds = ();
-    my %removals = ();
-    my %cancels = ();
-    my $modtotal = 0;
-    my $canceltotal = 0;
-    my $addtotal = 0;
-    my %blocking = ();
-    $r->print('<h3>'.$lt{'head'}.'</h3>');
-    foreach my $envkey (keys(%env)) {
-        if ($envkey =~ m/^form\.modify_(\d+)$/) {
-            $adds{$1} = $1;
-            $removals{$1} = $1;
-            $modtotal ++;
-        } elsif ($envkey =~ m/^form\.cancel_(\d+)$/) {
-            $cancels{$1} = $1;
-            unless ( defined($removals{$1}) ) {
-                $removals{$1} = $1;
-                $canceltotal ++;
-            }
-        } elsif ($envkey =~ m/^form\.add_(\d+)$/) {
-            $adds{$1} = $1;
-            $addtotal ++;
-        } 
-    }
-
-    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 my $key (keys(%adds)) {
-        unless ( defined($cancels{$key}) ) {
-            my ($newstart,$newend) = &get_dates_from_form($key);
-            my $newkey = $newstart.'____'.$newend;
-            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) {
-        &Apache::lonnet::put('comm_block',\%blocking,
-                     $env{'course.'.$env{'request.course.id'}.'.domain'},
-                     $env{'course.'.$env{'request.course.id'}.'.num'}
-                     );
-    }
-    my $chgestotal = $canceltotal + $modtotal + $addtotal;
-    if ($chgestotal > 0) {
-        $r->print($lt{'tfcm'}.'<ul>');
-        if ($canceltotal > 0) {
-            $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] removed.',$canceltotal).'</li>');
-        }
-        if ($modtotal > 0) {
-            $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] modified.',$modtotal).'</li>');
-        }
-        if ($addtotal > 0) {
-            $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] added.',$addtotal).'</li>');
-        }
-        $r->print('</ul>');
-    } else {
-        $r->print($lt{'ncwm'});
-    }
-    $r->print('<br />');
-    return;
-}
-
-sub get_dates_from_form {
-    my $item = shift;
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$item);
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$item);
-    return ($startdate,$enddate);
-}
-
-sub get_blockdates {
-    my ($records,$blockcount) = @_;
-    $$blockcount = 0;
-    %{$records} = &Apache::lonnet::dump('comm_block',
-                         $env{'course.'.$env{'request.course.id'}.'.domain'},
-                         $env{'course.'.$env{'request.course.id'}.'.num'}
-                         );
-    $$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 %lt = &Apache::lonlocal::texthash(
-        'modi' => 'Modify',
-        'canc' => 'Cancel',
-    );
-    my ($typeorder,$types) = &blocktype_text();
-    $r->print(&Apache::loncommon::start_data_table());
-    $r->print(<<"END");
-  <tr>
-    <th>$ltext->{'dura'}</th>
-    <th>$ltext->{'setb'}</th>
-    <th>$ltext->{'even'}</th>
-    <th>$ltext->{'blck'}</th>
-    <th>$ltext->{'actn'}</th>
-  </tr>
-END
-    foreach my $record (sort(keys(%{$records}))) {
-        my $onchange = 'onFocus="javascript:window.document.forms['.
-                       "'blockform'].elements['modify_".$parmcount."'].".
-                       'checked=true;"';
-        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 ($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");
-        <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="$record" /></td>
-        <td>
-END
-        foreach my $block (@{$typeorder}) {
-            my $blockstatus = '';
-            if ($blocks->{$block} eq 'on') {
-                $blockstatus = 'checked="checked"';
-            }
-            $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
-        }
-        $r->print(<<"END");
-        </td>
-        <td><span class="LC_nobreak"><label>
-        <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
-        </label></span><br /><span class="LC_nobreak">
-        <label>
-        <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
-        </label></span>
-END
-        $r->print(&Apache::loncommon::end_data_table_row());
-        $parmcount++;
-    }
-    $r->print(<<"END");
-</table>
-<br />
-<br />
-END
-    return $parmcount;
-}
-
-sub display_addblocker_table {
-    my ($r,$parmcount,$ltext) = @_;
-    my $start = time;
-    my $end = $start + (60 * 60 * 2); #Default is an exam of 2 hours duration.
-    my $onchange = 'onFocus="javascript:window.document.forms['.
-                   "'blockform'].elements['add_".$parmcount."'].".
-                   '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 %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> 
-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('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
-     }
-     $r->print(<<"END");
-     </td>
-     <td><span class="LC_nobreak"><label>
-     <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
-     </label></span></td>
-END
-    $r->print(&Apache::loncommon::end_data_table_row());
-    $r->print(&Apache::loncommon::end_data_table());
-    return;
-}
-
-sub blocktype_text {
-    my %types = &Apache::lonlocal::texthash(
-        'com' => 'Messaging',
-        'chat' => 'Chat Room',
-        'boards' => 'Discussion',
-        'port' => 'Portfolio',
-        'groups' => 'Groups',
-        'blogs' => 'Blogs',
-    );
-    my $typeorder = ['com','chat','boards','port','groups','blogs'];
-    return ($typeorder,\%types);
-}
-
 # ----------------------------------------------------------- Display a message
 
 sub displaymessage {
@@ -2331,8 +2080,9 @@ sub displaymessage {
     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.'));
-        $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,\%setters));
+        #$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.'));
+        my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+        $r->print("<br />".$blocktext);
         return;
     }
     if ($msgstatus eq '') {
@@ -2367,11 +2117,6 @@ sub displaymessage {
     my $number_of_messages = scalar(@messages); #subtract 1 for last index
 # start output
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
-    my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-
-# Functions and Actions
-    my $li_start='<span class="LC_nobreak">&bull; ';
-    my $li_end='</span> ';
 
 # Prepare available functions
     my @functionlist;
@@ -2389,33 +2134,22 @@ sub displaymessage {
     push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
                   .&mt('Delete')
                   .'</a>');
-    push(@functionlist,'<a href="/adm/email?'.$sqs.'">'
-                  .&mt('Back to Folder Display')
-                  .'</a>');
+
+# Prepare available navigation
+    my @navigationlist;
     if ($counter > 0){
-        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+        push(@navigationlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
                           .&mt('Previous')
                           .'</a>');
     }
     if ($counter < $number_of_messages - 1){
-        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+        push(@navigationlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
                           .&mt('Next')
                           .'</a>');
     }
-# Print functions
-    my $legendtext='<span class="LC_mail_functions">'
-                   .&mt('Functions')
-                   .'</span>';
-    my $showfunctionlist = $li_start.join($li_end.$li_start,@functionlist).$li_end;
-    $r->print('<div class="LC_left_float">'
-             .'<fieldset>'
-             .'<legend>'
-             .$legendtext
-             .'</legend>'
-             .$showfunctionlist
-             .'</fieldset>'
-             .'</div>'
-    );
+    push(@navigationlist,'<a href="/adm/email?'.$sqs.'">'
+                  .&mt('Back to Folder Display')
+                  .'</a>');
 
 # Prepare available actions
     my $symb;
@@ -2424,8 +2158,8 @@ sub displaymessage {
     } elsif (defined($content{'baseurl'})) {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }
+    my @actionlist;
     if ($env{'user.adv'}) {
-        my @actionlist;
 
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
 		push(@actionlist,&Apache::loncommon::track_student_link(
@@ -2450,23 +2184,39 @@ sub displaymessage {
                                      ,$symb
                                      ,'check'));
 	}
+    }
 
-# Print actions
+# Print functionlist, navigationlist, and actionlist in page header
+        my $functions='<div class="LC_columnSection">';
+
+        # Functionlist
+        $functions.=&Apache::lonhtmlcommon::start_funclist();
+        foreach my $item (@functionlist) {
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+        }
+        $functions .= &Apache::lonhtmlcommon::end_funclist();
+
+        # Navigationlist
+        $functions.=&Apache::lonhtmlcommon::start_funclist(
+                    &mt('Navigation'));
+        foreach my $item (@navigationlist) {
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+        }
+        $functions .= &Apache::lonhtmlcommon::end_funclist();
+
+        # Actionlist
         if (@actionlist) {
-            my $showactionlist = $li_start.join($li_end.$li_start,@actionlist).$li_end;
-            $legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
-                           ,'<span class="LC_mail_functions">','</span>');
-            $r->print('<div class="LC_left_float">'
-                     .'<fieldset>'
-                     .'<legend>'
-                     .$legendtext
-                     .'</legend>'
-                     .$showactionlist
-                     .'</fieldset>'
-                     .'</div>'
-            );
+            $functions.=&Apache::lonhtmlcommon::start_funclist(
+                            &mt('Currently available actions (will open extra window)'));
+            foreach my $item (@actionlist) {
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+            }
+            $functions.=&Apache::lonhtmlcommon::end_funclist();
         }
-    }
+
+        $functions.='</div>';
+        $r->print(&Apache::loncommon::head_subbox($functions));
+
 
     my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
     if ($content{'recipid'}) {
@@ -2621,12 +2371,14 @@ sub displaymessage {
             }
             if ($content{'group'} ne '') {
                 if (&check_group_priv($content{'group'})) {
-                    $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
-                    if ($groupcclist) {
-                        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
-                                 .$groupcclist
-                                 .&Apache::lonhtmlcommon::row_closure()
-                        );
+                    if (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') { 
+                        $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
+                        if ($groupcclist) {
+                            $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
+                                     .$groupcclist
+                                     .&Apache::lonhtmlcommon::row_closure()
+                            );
+                        }
                     }
                 }
             }
@@ -2634,14 +2386,22 @@ sub displaymessage {
     }
 
     # Course
-    if ($content{'courseid'}) {
-        $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
-                 .$courseinfo{'description'}
-        );
-        if ($content{'coursesec'}) {
-            $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+    if ($content{'courseid'} ne '') {
+        if ($content{'courseid'} =~ m{^$match_domain\_$match_courseid$}) {
+            my %courseinfo;
+            %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'},
+                                                           {'one_time' => 1});
+            my $description = $courseinfo{'description'};
+            if ($description ne '') {
+                $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
+                         .$description
+                );
+                if ($content{'coursesec'}) {
+                    $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+                }
+                $r->print(&Apache::lonhtmlcommon::row_closure());
+            }
         }
-        $r->print(&Apache::lonhtmlcommon::row_closure());
     }
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Time'))
              .$content{'time'}
@@ -3255,7 +3015,7 @@ sub sendoffmail {
                        '','','','',$recipid);
             }
         }
-        if (!$env{'form.multiforward'}) { 
+        if (!$env{'form.multiforward'}) {
             if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
                 my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.'));
                 $message = &Apache::loncommon::confirmwrapper($message);
@@ -3298,15 +3058,13 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf','sortedby','block','folder','startdis','interdis',
+         'recordftf','sortedby','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
          'msgstatus']);
     $sqs='&amp;sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
-    unless ($env{'form.block'}) {
-        &Apache::lonnet::put('email_status',{'recnewemail'=>0});
-    }
+    &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 
 # ----------------------------------------------------------------- Breadcrumbs
 
@@ -3395,7 +3153,7 @@ sub handler {
 	    &statuschange($env{'form.markdel'},'deleted',$folder);
 	if (!$result) {
             my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);
-            $message .= '<p class="LC_error">'.$msg.'</p>';
+            $message .= '<p class="LC_error" style="font-size: inherit;">'.$msg.'</p>';
             $message = &Apache::loncommon::confirmwrapper($message);
             $r->print($message);
 	}
@@ -3422,6 +3180,7 @@ sub handler {
         my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total));
         $message = &Apache::loncommon::confirmwrapper($message);
         $r->print($message);
+      # $r->print('<p>');
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3435,6 +3194,7 @@ sub handler {
         my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total));
         $message = &Apache::loncommon::confirmwrapper($message);
         $r->print($message);
+      # $r->print('<p>');
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3443,7 +3203,7 @@ sub handler {
         &printheader($r,'','Moved Messages');
         if (!defined($gotfolders{$destfolder})) {
             $r->print(&mt('Destination folder [_1] is not a valid folder',
-                      $destfolder));
+                          '<span class="LC_filename">'.$destfolder.'</span>'));
         } else {
 	    my ($total,$failed,@failed_msg)=(0,0);
             my @to_move = &Apache::loncommon::get_env_multiple('form.delmark');
@@ -3457,16 +3217,17 @@ sub handler {
 		    push(@failed_msg,$msg);
 	        }
 	    }
-            my $message;
+            my $message = '';
             if ($failed) {
-                $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);
-                $message .= '<p class="LC_error">'.
-		            join("</p>\n<p class=\"LC_error\">",@failed_msg).
+                $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);
+                $message .= '<p class="LC_error" style="font-size: inherit;">'.
+		            join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
 		            "</p>\n";
             }
             $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));
             $message = &Apache::loncommon::confirmwrapper($message);
             $r->print($message);
+          # $r->print('<p>');
         }
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3484,16 +3245,17 @@ sub handler {
 	    }
 	}
 	&printheader($r,'','Deleted Messages');
-        my $message;
+        my $message = '';
 	if ($failed) {
-            $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
-            $message .= '<p class="LC_error">'.
-		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
+            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
+            $message .= '<p class="LC_error" style="font-size: inherit;">'.
+		      join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
 		      "</p>\n";
 	}
         $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
         $message = &Apache::loncommon::confirmwrapper($message);
         $r->print($message);
+      # $r->print('<p>');
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {
@@ -3505,8 +3267,6 @@ sub handler {
 	&compout($r,'','',$env{'form.compose'});
     } elsif ($env{'form.recordftf'}) {
 	&facetoface($r,$env{'form.recordftf'});
-    } elsif ($env{'form.block'}) {
-        &examblock($r,$env{'form.block'});
     } elsif ($env{'form.sendmail'}) {
         if ($env{'form.multiforward'}) {
             &printheader($r,'','Messages being sent.');