--- loncom/interface/lonmsgdisplay.pm	2008/12/05 19:38:32	1.100
+++ loncom/interface/lonmsgdisplay.pm	2009/04/25 20:22:07	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.100 2008/12/05 19:38:32 schafran Exp $
+# $Id: lonmsgdisplay.pm,v 1.122 2009/04/25 20:22:07 www 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',
@@ -353,7 +356,7 @@ sub makefolder {
         }
     } else {
         $outcome = 
-	    &mt('Error - could not obtain lock on e-mail folders record.');
+	    &mt('Error - could not obtain lock on message folders record.');
     }
     return ($outcome,$warning);
 }
@@ -555,17 +558,16 @@ sub discourse {
 }
 
 sub disgroup {
-    my ($cdom,$cnum,$group,$access_status) = @_;
-    my $result;
+    my ($r,$cdom,$cnum,$group,$access_status) = @_;
+    my $hasfloat;
     #  Needs to be in a course
     if (!($env{'request.course.fn'})) {
-        $result = &mt('Error: you must have a course role selected to be able to send a broadcast 
-e-mail to a group in the course.');
-        return $result;
+        $r->print('<span class="LC_error">'.&mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.').'</span>');
+        return;
     }
     if ($cdom eq '' || $cnum eq '') {
-        $result = &mt('Error: could not determine domain or number of course');
-        return $result;
+        $r->print('<span class="LC_error">'.&mt('Error: could not determine domain or number of course').'</span>');
+        return;
     }
     my ($memberinfo,$numitems) =
                  &Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]);
@@ -578,10 +580,15 @@ e-mail to a group in the course.');
         push(@statustypes,('future','previous'));
     }
     if (keys(%{$memberinfo}) == 0) {
-        $result = &mt('As this group has no members, there are no '.
-                      'recipients to select.');
-        return $result;
+        $r->print('<span class="LC_warning">'.
+                  &mt('As this group has no members, there are no recipients to select').
+                  '</span>');
+        return;
     } else {
+        $hasfloat = 1;
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('<div class="LC_left_float">');
+        }
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -607,7 +614,7 @@ e-mail to a group in the course.');
                 push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user);
             }
         }
-        $result .= &group_check_uncheck();
+        $r->print(&group_check_uncheck());
         foreach my $status (@statustypes)  {
             if (ref($numitems) eq 'HASH') {
                 if ((defined($$numitems{$status})) && ($$numitems{$status})) {
@@ -615,46 +622,49 @@ e-mail to a group in the course.');
                     if (ref($access_status) eq 'HASH') {
                         $access_status->{$status} = $$numitems{$status};
                     }
-                    $result.='<fieldset><legend><b>'.$lt{$status}.
-                             '</b></legend><form name="'.$formname.'">'.
-                             '<span class="LC_nobreak">'.
-                             '<input type="button" value="'.&mt('Check All').'" '.
-                             'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
-                             '&nbsp;&nbsp;'.
-                             '<input type="button" value="'.&mt('Uncheck All').'" '.
-                             'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
-                             '</span>';
+                    $r->print('<fieldset><legend><b>'.$lt{$status}.
+                              '</b></legend><form name="'.$formname.'">'.
+                              '<span class="LC_nobreak">'.
+                              '<input type="button" value="'.&mt('Check All').'" '.
+                              'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
+                              '&nbsp;&nbsp;'.
+                              '<input type="button" value="'.&mt('Uncheck All').'" '.
+                              'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
+                              '</span>');
                     if ($status eq 'active') {
-                        $result .= '&nbsp;&nbsp;&nbsp;<select name="groupmail">'.
-                                   '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
-                                   '<option value="cc">'.&mt('Cc').'</option>'.
-                               '</select>';
+                        $r->print(('&nbsp;'x3).'<select name="groupmail">'.
+                                 '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
+                                 '<option value="cc">'.&mt('Cc').'</option>'.
+                               '</select>');
                     }
-                    $result .= '<br />'.&Apache::loncommon::start_data_table().
+                    $r->print('<br />'.&Apache::loncommon::start_data_table().
                                &Apache::loncommon::start_data_table_header_row().
-                               "<th>$lt{'name'}</a></th>".
-                               "<th>$lt{'usnm'}</a></th>".
-                               "<th>$lt{'doma'}</a></th>".
-                               &Apache::loncommon::end_data_table_header_row();
+                               "<th>$lt{'name'}</th>".
+                               "<th>$lt{'usnm'}</th>".
+                               "<th>$lt{'doma'}</th>".
+                               &Apache::loncommon::end_data_table_header_row());
                     foreach my $key (sort(keys(%{$Sortby{$status}}))) {
                         foreach my $user (@{$Sortby{$status}{$key}}) {
-                            $result .=
-                                &Apache::loncommon::start_data_table_row().
-                                '<td><input type="checkbox" '.
+                            $r->print(&Apache::loncommon::start_data_table_row().
+                                '<td><span class="LC_nobreak"><input type="checkbox" '.
                                 'name="selectedusers_forminput" value="'.
                                 $user.':'.$status.'" />'.
-                                $$memberinfo{$user}{'fullname'}.'</td>'.
+                                $$memberinfo{$user}{'fullname'}.'</span></td>'.
                                 '<td>'.$$memberinfo{$user}{'uname'}.'</td>'.
                                 '<td>'.$$memberinfo{$user}{'udom'}.'</td>'.
-                                &Apache::loncommon::end_data_table_row();
+                                &Apache::loncommon::end_data_table_row());
                         }
                     }
-                    $result .= &Apache::loncommon::end_data_table().'</form></fieldset><br />';
+                    $r->print(&Apache::loncommon::end_data_table().'</form>'.
+                              '</fieldset><br />');
                 }
             }
         }
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div>');
+        }
     }
-    return $result;
+    return $hasfloat;
 }
 
 sub group_check_uncheck {
@@ -831,6 +841,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,
@@ -1071,11 +1082,13 @@ ENDDISHEADER
     $r->print("</tr>\n");
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
+    my $count = 0;
     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') {
@@ -1107,11 +1120,10 @@ ENDDISHEADER
 		}
 	    }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
-            my $count = $n +1;
-	    $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
+	    $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
                       '<input type="checkbox" name="delmark"'. 
-                      ' value="'.$origID.'" /></nobr></td>');
+                      ' value="'.$origID.'" /></span></td>');
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
@@ -1178,7 +1190,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));
@@ -1317,16 +1329,17 @@ 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 {
             $can_grp_broadcast = &check_group_priv($group);
             if ($can_grp_broadcast) {
-                $r->print('<div class="LC_left_float">'.
-                          &disgroup($cdom,$cnum,$group,\%access_status).
-                         '</div>');
-                $hasfloat = 1;
+                $hasfloat = &disgroup($r,$cdom,$cnum,$group,\%access_status);
             }
         }
         if ($hasfloat) {
@@ -1412,7 +1425,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(
@@ -1521,7 +1538,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) {
@@ -1564,7 +1581,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
@@ -1618,7 +1635,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);
 }
@@ -1668,7 +1687,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;
 }
@@ -1814,7 +1833,7 @@ $content{'sendername'}.':'.
      }
     # Check to see if there were any messages.
     if ($result eq '') {
-        my $lctype = lc(&Apache::loncommon::course_type());
+        my $lctype = &mt(lc(&Apache::loncommon::course_type()));
 	if ($target ne 'tex') { 
 	    $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."</b></p>");
 	} else {
@@ -2134,7 +2153,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 />');
         }
@@ -2201,7 +2220,7 @@ END
 sub blocktype_text {
     my %types = &Apache::lonlocal::texthash(
         'com' => 'Messaging',
-        'chat' => 'Chat',
+        'chat' => 'Chat Room',
         'boards' => 'Discussion',
         'port' => 'Portfolio',
         'groups' => 'Groups',
@@ -2263,29 +2282,51 @@ sub displaymessage {
 # start output
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
     my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-# Functions
-    $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>');
+
+# Prepare available functions
+    my @functionlist;
     if (!$content{'noreplies'}) {
-        $r->print('<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
-	          '"><b>'.&mt('Reply').'</b></a></td>');
-    }
-    $r->print('<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Forward').'</b></a></td>'.
-	      '<td><a href="/adm/email?markunread='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-	      '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Delete').'</b></a></td>'.
-	      '<td><a href="/adm/email?'.$sqs.
-	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
+        push(@functionlist,'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
+                     .&mt('Reply')
+                     .'</a>');
+    }
+    push(@functionlist,'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
+                  .&mt('Forward')
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
+                  .&mt('Mark Unread')
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
+                  .&mt('Delete')
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?'.$sqs.'">'
+                  .&mt('Back to Folder Display')
+                  .'</a>');
     if ($counter > 0){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
-		  '"><b>'.&mt('Previous').'</b></a></td>');
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+                          .&mt('Previous')
+                          .'</a>');
     }
     if ($counter < $number_of_messages - 1){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
-		  '"><b>'.&mt('Next').'</b></a></td>');
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+                          .&mt('Next')
+                          .'</a>');
+    }
+# Print functions
+    my $legendtext='<span class="LC_mail_functions">'
+                   .&mt('Functions')
+                   .'</span>';
+    $r->print('<div class="LC_left_float">'
+                     .&Apache::lontemplate::start_functionslist($legendtext)
+    );
+    foreach my $item (@functionlist) {
+        $r->print(&Apache::lontemplate::item_functionslist($item));
     }
-    $r->print('</tr></table>');
+    $r->print(&Apache::lontemplate::end_functionslist()
+             .'</div>'
+    );
+
+# Prepare available actions
     my $symb;
     if (defined($content{'symb'})) {
         $symb = $content{'symb'};
@@ -2293,34 +2334,48 @@ 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.='<td><b>'
-                            .&Apache::loncommon::track_student_link(
-                                 &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
-                            .'</b></td>';
+		push(@actionlist,&Apache::loncommon::track_student_link(
+                                      &mt('View recent activity')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
-	    $actionlist.='<td><b>'
-                        .&Apache::loncommon::pprmlink(
-                             &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                        .'</b></td>';
+	    push(@actionlist,&Apache::loncommon::pprmlink(
+                                  &mt('Set/Change parameters')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
-	    $actionlist.='<td><b>'
-                       .&Apache::loncommon::pgrdlink(
-                            &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                       .'</b></td>';
-	}
-        if ($actionlist) {
-            $r->print('<table border="2" width="100%">'
-                     .'<tr bgcolor="#FFAAAA"><td>'
-                     .&mt('Currently available actions (will open extra window):')
-                     .'</td>'
-                     .$actionlist
-                     .'</tr></table>');
+	    push(@actionlist,&Apache::loncommon::pgrdlink(
+                                 &mt('Set/Change grades')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
+	}
+
+# Print actions
+        if (@actionlist) {
+            $legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
+                           ,'<span class="LC_mail_functions">','</span>');
+            $r->print('<div class="LC_left_float">'
+                     .&Apache::lontemplate::start_functionslist($legendtext)
+            );
+            foreach my $item (@actionlist) {
+                $r->print(&Apache::lontemplate::item_functionslist($item));
+            }
+            $r->print(&Apache::lontemplate::end_functionslist()
+                     .'</div>'
+            );
         }
     }
+
     my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
     if ($content{'recipid'}) {
         $tonum = &retrieve_recips('display',\%content,\%recipients);
@@ -2334,7 +2389,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(
@@ -2356,21 +2420,14 @@ sub displaymessage {
     if (defined($content{'baseurl'})) {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }
+    $r->print('<div class="LC_clear_float_footer">');
     if ($from_student && $see_anonymous ) {
-	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
-    }
-
-    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);
+	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
     }
 
     # Display LON-CAPA Message (Start)
     # Subject
-    $r->print('<br />'
+    $r->print('</div>'
              .&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
              .$content{'subject'}
@@ -2378,10 +2435,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
@@ -2635,13 +2694,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'}}) {
@@ -2738,15 +2797,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
@@ -3117,7 +3175,7 @@ sub sendoffmail {
 	            &Apache::loncommunicate::menu($r);
 	        }
             } else {
-	        $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+	        $r->print('<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'<br /> '.
 		          &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
             }
         }
@@ -3421,7 +3479,7 @@ sub handler {
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+            $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
         } else {
             $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
                       $warning);
@@ -3436,7 +3494,7 @@ sub handler {
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+            $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
             $env{'form.folder'} = '';
         } else {
             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
@@ -3449,7 +3507,7 @@ sub handler {
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+            $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
         } else {
             $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
             $showfolder = $folder;