--- loncom/interface/lonmsgdisplay.pm	2008/12/22 09:08:47	1.106
+++ loncom/interface/lonmsgdisplay.pm	2010/01/25 17:59:43	1.124.4.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.106 2008/12/22 09:08:47 riegler Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.4 2010/01/25 17:59:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,6 +136,9 @@ sub folderlist {
 
     );
 
+	# set se lastvisit for the new mail check in the toplevel menu
+	&Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
+
     my %actions = &Apache::lonlocal::texthash(
                                 view => 'View Folder',
                                 rename => 'Rename Folder',
@@ -170,6 +173,7 @@ sub folderlist {
 
     $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
     my $output = qq|<script type="text/javascript">
+// <![CDATA[
 function folder_choice(targetform,caller) {
     var permfolders_keys = new Array('$permlistkeys');
     var permfolders_vals = new Array('$permlistvals');
@@ -211,6 +215,7 @@ function folder_choice(targetform,caller
         }
     }
 }
+// ]]>
 </script>|;
     my %show = ('select_form_order' => [10,20,50,100,200],
 		map {$_=>$_} (10,20,50,100,200));
@@ -236,7 +241,7 @@ function folder_choice(targetform,caller
      <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
          &Apache::loncommon::select_form('view','folderaction',%actions).'
      </td><td><br />'.
-    '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
+    '<input type="button" value="'.$lt{'go'}.'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
      </td>
     </tr>
    </table>
@@ -244,7 +249,7 @@ function folder_choice(targetform,caller
   <td align="right">
    <table><tr><td><br />
     <input type="button" value="'.&mt('New Folder').
-    '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+    '" 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>
@@ -292,11 +297,11 @@ sub scrollbuttons {
     }
     return
    '<b>'.&mt('Page').'</b>: '. 
-   '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
-   '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
-   '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
-   '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
+   '<input type="submit" name="firstview" value="|&lt;" />'.
+   '<input type="submit" name="prevview" value="&lt;" />'.
+   '<input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> of '.$maxdis.
+   '<input type="submit" name="nextview" value="&gt;" />'.
+   '<input type="submit" name="lastview" value="&gt;|" /><br />'.
    &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
 }
 # =============================================================== Status Change
@@ -531,7 +536,7 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-       $result .= '<fieldset id="LC_previoususers"><legend><b>'.&mt('Bcc: course members with expired access').'</b></legend><form name="previoususers">';
+       $result .= '<fieldset id="LC_previoususers"><legend><b>'.&mt('Bcc: course members with expired access').'</b></legend><form name="futureusers">';
        $result .= $tmptext.'</form></fieldset><br />';
        if (ref($statushash) eq 'HASH') {
            $statushash->{'previous'} = 1;
@@ -583,7 +588,9 @@ sub disgroup {
         return;
     } else {
         $hasfloat = 1;
-        $r->print('<div class="LC_left_float">');
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('<div class="LC_left_float">');
+        }
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -651,10 +658,13 @@ sub disgroup {
                         }
                     }
                     $r->print(&Apache::loncommon::end_data_table().'</form>'.
-                              '</fieldset><br /></div>');
+                              '</fieldset><br />');
                 }
             }
         }
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div>');
+        }
     }
     return $hasfloat;
 }
@@ -662,6 +672,7 @@ sub disgroup {
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
+/ <![CDATA[
 function toggleAll(form,action) {
     if (typeof(form.selectedusers_forminput.length)=="undefined") {
          if (action == 'check') {
@@ -679,6 +690,7 @@ function toggleAll(form,action) {
         }
     }
 }
+// ]]>
 </script>
     |;
 }
@@ -754,7 +766,7 @@ sub discrit {
                 .'<div class="LC_warning">'
                 .&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.')
                 .'</div><br />'
-                .'<form action="/adm/email" method="POST">'
+                .'<form action="/adm/email" method="post">'
                 .'<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
@@ -833,6 +845,7 @@ sub sortedmessages {
     }
 
     foreach my $msgid (@messages) {
+        next if ($msgid eq '');
 	my $esc_msgid=&escape($msgid);
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
 	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
@@ -972,6 +985,7 @@ sub disfolder {
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
+// <![CDATA[
     $jscript
 
     function validate_checkedaction() {
@@ -1000,11 +1014,11 @@ sub disfolder {
         }
         document.disall.submit();
     }
-
+// ]]>
 </script>
 ENDDISHEADER
 
-    my $fsqs='&folder='.$folder;
+    my $fsqs='&amp;folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
     if ($totalnumber < 1) {
@@ -1036,48 +1050,50 @@ ENDDISHEADER
     $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      '<table class="LC_mail_list"><tr><th colspan="1">&nbsp;</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
-	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
-	$r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
     }
     $r->print('<th>');
     if ($env{'form.sortedby'} eq "revuser") {
-	$r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
     } else {
-	$r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revdomain") {
-	$r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
     } else {
-	$r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revsubject") {
-	$r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
     } else {
-    	$r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
+    	$r->print('<a href = "/adm/email?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revcourse") {
-        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "/adm/email?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
     } else {
-        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revstatus") {
-	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
-     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
+     	$r->print('<a href = "/adm/email?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
+    my $count = $firstdis;
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
 		@{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+            $count ++;
 	    if ($status eq 'new') {
 		$r->print('<tr class="LC_mail_new">');
 	    } elsif ($status eq 'read') {
@@ -1109,7 +1125,6 @@ ENDDISHEADER
 		}
 	    }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
-            my $count = $n +1;
 	    $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
                       '<input type="checkbox" name="delmark"'. 
@@ -1117,7 +1132,7 @@ ENDDISHEADER
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
-                          $item.(($status eq 'new')?'</b>':'').'</td>');
+                          $item.(($status eq 'new')?'</b>':'').'</a></td>');
             }
             my $showstatus;
             my %statushash = &get_msgstatus_types();
@@ -1180,7 +1195,7 @@ ENDDISHEADER
               '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
               '</tr></table>');
     my $postedstartdis=$startdis+1;
-    $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></form>');
+    $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {
         $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
                                      \%setters));
@@ -1239,8 +1254,8 @@ sub compout {
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
-            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
-                         .' will be forwarded to the recipient(s) you select below.',$multiforward)
+            $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>')
                     .'<br />');
         } else {
             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
@@ -1319,7 +1334,11 @@ sub compout {
         if ($group eq '') {
             my $studentsel = &discourse(\%access_status);
             if ($studentsel) {
-                $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+                if ($env{'environment.wysiwygeditor'} eq 'on') {
+                    $r->print($studentsel);
+                } else {
+                    $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+                }
                 $hasfloat = 1;
             }
         } else {
@@ -1332,6 +1351,7 @@ sub compout {
             $sendmode = '<input type="hidden" name="sendmode" value="group" />'."\n";
             $broadcast_js = qq|
 <script type="text/javascript">
+// <![CDATA[
 function courseRecipients() {
 |;
         foreach my $type (keys(%access_status)) {
@@ -1358,6 +1378,7 @@ function courseRecipients() {
         $broadcast_js .= qq|
     return;
 }
+// ]]>
 </script>
 
 |;
@@ -1401,7 +1422,9 @@ function courseRecipients() {
         my $jscript = &Apache::loncommon::check_uncheck_jscript();
         $r->print(<<"ENDREPSCRIPT");
 <script type="text/javascript">
+// <![CDATA[
 $jscript
+// ]]>
 </script>
 ENDREPSCRIPT
     }
@@ -1411,7 +1434,11 @@ ENDREPSCRIPT
     if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
     if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
     if ($hasfloat) {
-        $r->print($broadcast_js.'<div class="LC_left_float">');
+        if ($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print($broadcast_js);
+        } else {
+            $r->print($broadcast_js.'<div class="LC_left_float">');
+        }
         $onsubmit = ' onsubmit="javascript:courseRecipients();" ';
     }
     $r->print(
@@ -1520,7 +1547,7 @@ ENDREPSCRIPT
             $r->print(&recipient_input_row($defdom,%lt));
         }
     }
-    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet();
+    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
     my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'<br />';
     my $subj_size;
     if ($multiforward) {
@@ -1563,7 +1590,7 @@ $wysiwyglink);
         $r->print(<<"ENDCOMP");
 $attachrow
 </table><br />
-$latexHelp
+$latexHelp<br />
 <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea>$wysiwyglink
 $sendmode
@@ -1617,7 +1644,9 @@ ENDUPLOAD
     }
     $r->print('</form>');
     if ($hasfloat) {
-        $r->print('</div><div class="LC_clear_float_footer"></div>');
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div><div class="LC_clear_float_footer"></div>');
+        }
     }
     $r->print(&generate_preview_form);
 }
@@ -1667,7 +1696,7 @@ sub additional_rec_row {
 <tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <tt>($exmpl)</tt>:</legend><table>
 <tr><td>&nbsp;</td><td>$lt->{'to'}</td><td><input type="text" size="50" name="additionalrec_to" /></td></tr>
 <tr><td>&nbsp;</td><td>$cc</td><td><input type="text" size="50" name="additionalrec_cc" /></td></tr> 
-<tr><td>&nbsp;</td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset>
+<tr><td>&nbsp;</td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
 ENDADD
     return $output;
 }
@@ -1847,7 +1876,7 @@ sub facetoface {
 	return;
     }
     my $crstype = &Apache::loncommon::course_type();
-    my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
+    my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
                                         : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
@@ -1870,21 +1899,23 @@ sub facetoface {
 				       'subm' => 'Retrieve discussion and message records',
 				       'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
 				       'post' => 'Post this Record');
-    $r->print(<<"ENDTREC");
-<h3>$lt{'head'}</h3>
-<form method="post" action="/adm/email" name="stdselect">
-<input type="hidden" name="recordftf" value="retrieve" />
-<table>
-<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$env{'form.recuname'}" /></td>
-<td rowspan="2">
-$stdbrws
-<input type="submit" value="$lt{'subm'}" /></td>
-</tr>
-<tr><td>$lt{'dom'}:</td>
-<td>$domform</td></tr>
-</table>
-</form>
-ENDTREC
+
+    $r->print('<h2>'.$lt{'head'}.'</h2>'
+             .'<form method="post" action="/adm/email" name="stdselect">'
+             .'<input type="hidden" name="recordftf" value="retrieve" />'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title($lt{'user'})
+             .'<input type="text" size="12" name="recuname" value="'.$env{'form.recuname'}.'" />'
+             .' '.$stdbrws
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title($lt{'dom'})
+             .$domform
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .'<br />'
+             .'<input type="submit" value="'.$lt{'subm'}.'" />'
+    );
+
     if (($stage ne 'query') &&
         ($env{'form.recdomain'}) && ($env{'form.recuname'})) {
         chomp($env{'form.newrecord'});
@@ -1893,8 +1924,17 @@ ENDTREC
 						      $env{'form.recuname'},
 						      $env{'form.recdomain'});
         }
-        $r->print('<h3>'.&Apache::loncommon::plainname($env{'form.recuname'},
-				     $env{'form.recdomain'}).'</h3>');
+        my $aboutmelink=&Apache::loncommon::aboutmewrapper(
+                            &Apache::loncommon::plainname($env{'form.recuname'}
+                                                         ,$env{'form.recdomain'})
+                           ,$env{'form.recuname'},$env{'form.recdomain'});
+        $r->print('<hr />'
+                 .'<h2>'
+                 .&mt('Discussion and message records for [_1] ([_2])'
+                     ,$aboutmelink
+                     ,$env{'form.recuname'}.':'.$env{'form.recdomain'})
+                 .'<h2>'
+       );
         &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'});
 	$r->print(<<ENDRHEAD);
 <form method="post" action="/adm/email">
@@ -1923,7 +1963,7 @@ sub examblock {
 	$r->print('Not allowed');
 	return;
     }
-    my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
+    my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
 	                                                          : 'students';
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
@@ -2125,7 +2165,7 @@ END
                            $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>$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>
@@ -2133,7 +2173,7 @@ END
         foreach my $block (@{$typeorder}) {
             my $blockstatus = '';
             if ($blocks->{$block} eq 'on') {
-                $blockstatus = 'checked="true"';
+                $blockstatus = 'checked="checked"';
             }
             $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
         }
@@ -2200,7 +2240,7 @@ END
 sub blocktype_text {
     my %types = &Apache::lonlocal::texthash(
         'com' => 'Messaging',
-        'chat' => 'Chat',
+        'chat' => 'Chat Room',
         'boards' => 'Discussion',
         'port' => 'Portfolio',
         'groups' => 'Groups',
@@ -2268,55 +2308,45 @@ sub displaymessage {
     my $li_end='</span> ';
 
 # Prepare available functions
-    my $functionlist='';
+    my @functionlist;
     if (!$content{'noreplies'}) {
-        $functionlist.=$li_start
-                     .'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
+        push(@functionlist,'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
                      .&mt('Reply')
-                     .'</a>'
-                     .$li_end;
+                     .'</a>');
     }
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
+    push(@functionlist,'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
                   .&mt('Forward')
-                  .'</a>'
-                  .$li_end;
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
                   .&mt('Mark Unread')
-                  .'</a>'
-                  .$li_end;
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
                   .&mt('Delete')
-                  .'</a>'
-                  .$li_end;
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?'.$sqs.'">'
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?'.$sqs.'">'
                   .&mt('Back to Folder Display')
-                  .'</a>'
-                  .$li_end;
+                  .'</a>');
     if ($counter > 0){
-        $functionlist.=$li_start
-              .'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
-              .&mt('Previous')
-              .'</a>'
-              .$li_end;
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+                          .&mt('Previous')
+                          .'</a>');
     }
     if ($counter < $number_of_messages - 1){
-        $functionlist.=$li_start
-              .'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
-              .&mt('Next')
-              .'</a>'
-              .$li_end;
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+                          .&mt('Next')
+                          .'</a>');
     }
 # Print functions
+    my $legendtext='<span class="LC_mail_functions">'
+                   .&mt('Functions')
+                   .'</span>';
+    my $showfunctionlist = $li_start.join($li_end.$li_start,@functionlist).$li_end;
     $r->print('<div class="LC_left_float">'
              .'<fieldset>'
-             .'<legend><span class="LC_mail_functions">'
-             .&mt('Functions')
-             .'</span></legend>'
-             .$functionlist
+             .'<legend>'
+             .$legendtext
+             .'</legend>'
+             .$showfunctionlist
              .'</fieldset>'
              .'</div>'
     );
@@ -2329,35 +2359,43 @@ sub displaymessage {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }
     if ($env{'user.adv'}) {
-        my $actionlist='';
+        my @actionlist;
 
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
-		$actionlist.=$li_start
-                            .&Apache::loncommon::track_student_link(
-                                 &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
-                            .$li_end;
+		push(@actionlist,&Apache::loncommon::track_student_link(
+                                      &mt('View recent activity')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
-	    $actionlist.=$li_start
-                        .&Apache::loncommon::pprmlink(
-                             &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                        .$li_end;
+	    push(@actionlist,&Apache::loncommon::pprmlink(
+                                  &mt('Set/Change parameters')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
-	    $actionlist.=$li_start
-                       .&Apache::loncommon::pgrdlink(
-                            &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                       .$li_end;
+	    push(@actionlist,&Apache::loncommon::pgrdlink(
+                                 &mt('Set/Change grades')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
 	}
 
 # Print actions
-        if ($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>'
-                     .&mt('[_1]Currently available actions[_2] (will open extra window):','<span class="LC_mail_functions">','</span>')
+                     .$legendtext
                      .'</legend>'
-                     .$actionlist
+                     .$showactionlist
                      .'</fieldset>'
                      .'</div>'
             );
@@ -2377,7 +2415,16 @@ sub displaymessage {
             $bcclist = join(', ',@{$recipients{'bcc'}});
         }
     }
-    if (!$tolist && ref($content{'recuser'}) eq 'ARRAY') {
+
+    my $broadcast_link;
+    if (($content{'courseid'}) && ($content{'recipid'} &&
+        (ref($recipients{'course_broadcast'}) eq 'ARRAY') ||
+        (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
+        (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
+        $broadcast_link = &recipients_link($r,\%content,\%recipients);
+    }
+
+    if (((!$tolist) && (!$broadcast_link)) && ref($content{'recuser'}) eq 'ARRAY') {
         my @recipients;
         for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
             $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
@@ -2404,14 +2451,6 @@ sub displaymessage {
 	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
     }
 
-    my $broadcast_link;
-    if (($content{'courseid'}) && ($content{'recipid'} && 
-        (ref($recipients{'course_broadcast'}) eq 'ARRAY') || 
-        (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
-        (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
-        $broadcast_link = &recipients_link($r,\%content,\%recipients);
-    }
-
     # Display LON-CAPA Message (Start)
     # Subject
     $r->print('</div>'
@@ -2422,10 +2461,12 @@ sub displaymessage {
     );
     if ($folder eq 'sent') {
         # To
-        $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
-                 .$tolist
-                 .&Apache::lonhtmlcommon::row_closure()
-        );
+        if ($tolist) {
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+                     .$tolist
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
+        }
         if ($cclist) {
             $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
                      .$cclist
@@ -2679,13 +2720,13 @@ sub recipients_link {
             $nothing=&Apache::lonhtmlcommon::javascript_nothing();
             $height = 400;
             $width = 600;
-            my $start_page =
-                    &Apache::loncommon::start_page('Broadcast List', undef,
-                                       {only_body => 1,
-                                        js_ready  => 1,});
-            my $end_page = &Apache::loncommon::end_page({js_ready => 1,});
-            my $body = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
-                       &Apache::loncommon::start_data_table();
+            $start_page =
+                &Apache::loncommon::start_page('Broadcast List', undef,
+                                               {only_body => 1,
+                                                js_ready  => 1,});
+            $end_page = &Apache::loncommon::end_page({js_ready => 1,});
+            $body = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
+                    &Apache::loncommon::start_data_table();
             my $cell = 0;
             $body .= &Apache::loncommon::start_data_table_row();
             foreach my $item (@{$recipients->{$show.'_broadcast'}}) {
@@ -2706,6 +2747,7 @@ sub recipients_link {
             $body =~ s{\n}{}g;
             $r->print(<<ENDJS);
 <script type="text/javascript">
+// <![CDATA[
 function showBroadcastList() {
     var caller = this;
     var newWindow = null;
@@ -2728,7 +2770,7 @@ function writeWin(caller) {
     caller.document.close();
     caller.focus();
 }
-
+// ]]>
 </script>
 
 ENDJS
@@ -2782,15 +2824,14 @@ sub displayresource {
 
 sub header {
     my ($r,$title,$baseurl)=@_;
-    
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
-    $r->print(&Apache::loncommon::start_page('Communication and Messages',
+    $r->print(&Apache::loncommon::start_page('Communication',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-     		(($title?$title:'Communication and Messages')));
+     		(($title?$title:'Send and Receive Messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -3150,8 +3191,9 @@ sub sendoffmail {
         }
         if (!$env{'form.multiforward'}) { 
             if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
-                          '</span>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.'));
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
 	        if ($env{'form.displayedcrit'}) {
 	            &discrit($r);
                 }
@@ -3161,8 +3203,10 @@ sub sendoffmail {
 	            &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 ([_1]).',$sendstatus).'</p>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1);
+                $message .= '<br />'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus);
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             }
         }
     }
@@ -3188,7 +3232,7 @@ sub handler {
          'recordftf','sortedby','block','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
          'msgstatus']);
-    $sqs='&sortedby='.$env{'form.sortedby'};
+    $sqs='&amp;sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
     unless ($env{'form.block'}) {
@@ -3209,7 +3253,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs.='&folder='.&escape($folder);
+	$sqs.='&amp;folder='.&escape($folder);
     }
 # ------------------------------------------------------------ Get Display Mode
 
@@ -3241,7 +3285,7 @@ sub handler {
 	$startdis++;
     }
     my $postedstartdis=$startdis+1;
-    $sqs.='&startdis='.$postedstartdis;
+    $sqs.='&amp;startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output
 
@@ -3281,9 +3325,10 @@ sub handler {
 	my ($result,$msg) = 
 	    &statuschange($env{'form.markdel'},'deleted',$folder);
 	if (!$result) {
-	    $r->print('<p class="LC_error">'.
-		      &mt('Failed to delete the message.').'</p>'.
-		      '<p class="LC_error">'.$msg."</p>\n");
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);
+            $message .= '<p class="LC_error">'.$msg.'</p>';
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
 	}
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3305,7 +3350,9 @@ sub handler {
             $total ++;
         }
         &printheader($r,'','Marked Messages Read');
-        $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3316,7 +3363,9 @@ sub handler {
             $total ++;
         }
         &printheader($r,'','Marked Messages Unread');
-        $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3339,15 +3388,16 @@ sub handler {
 		    push(@failed_msg,$msg);
 	        }
 	    }
-	    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>');
+            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).
+		            "</p>\n";
+            }
+            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         }
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3365,15 +3415,16 @@ sub handler {
 	    }
 	}
 	&printheader($r,'','Deleted Messages');
+        my $message;
 	if ($failed) {
-	    $r->print('<p class="LC_error">
-                          '.&mt('Failed to delete [_1] message(s)',$failed).
-		      '</p>');
-	    $r->print('<p class="LC_error">'.
+            $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).
-		      "</p>\n");
+		      "</p>\n";
 	}
-	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
+        $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {
@@ -3429,19 +3480,19 @@ sub handler {
             }
             if (keys(%forwardok) > 0) {
                 my $count = keys(%forwardok);
-                $r->print('<br /><span class="LC_success">'.
-                          &mt('[quant,_1,message] forwarded.',$count).
-                          '</span>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('[quant,_1,message] forwarded.',$count));
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             }
             if (keys(%forwardfail) > 0) {
                 my $count = keys(%forwardfail);
-                $r->print('<p><span class="LC_error">'.
-                          &mt('Could not forward [quant,_1,message].',$count).
-                          '</span> ');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
                 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 />');
+                    $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
+                                &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
                 }
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             }
             &Apache::loncommunicate::menu($r);
         } else {
@@ -3465,10 +3516,13 @@ sub handler {
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" created.',$showfolder));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         } else {
-            $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
-                      $warning);
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Creation failed.').' '.$makeresult.'<br />'.$warning,1);
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3480,10 +3534,14 @@ sub handler {
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" deleted.',$folder));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $env{'form.folder'} = '';
         } else {
-            $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Deletion failed.').' '.$delresult,1);
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3493,9 +3551,13 @@ sub handler {
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         } else {
-            $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Renaming failed.').' '.$renresult,1);
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);