--- loncom/interface/lonmsgdisplay.pm	2008/12/07 19:29:29	1.101
+++ loncom/interface/lonmsgdisplay.pm	2008/12/14 02:45:48	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.101 2008/12/07 19:29:29 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.104 2008/12/14 02:45:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -353,7 +353,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);
 }
@@ -559,8 +559,7 @@ sub disgroup {
     my $result;
     #  Needs to be in a course
     if (!($env{'request.course.fn'})) {
-        $result = &mt('Error: you must have a course role selected to be able to send a broadcast 
-e-mail to a group in the course.');
+        $result = &mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.');
         return $result;
     }
     if ($cdom eq '' || $cnum eq '') {
@@ -1108,10 +1107,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.'">'.
@@ -2312,11 +2311,11 @@ sub displaymessage {
               .$li_end;
     }
 # Print functions
-    $r->print('<div>'
+    $r->print('<div class="LC_left_float">'
              .'<fieldset>'
-             .'<legend>'
+             .'<legend><span class="LC_mail_functions">'
              .&mt('Functions')
-             .'</legend>'
+             .'</span></legend>'
              .$functionlist
              .'</fieldset>'
              .'</div>'
@@ -2353,10 +2352,10 @@ sub displaymessage {
 
 # Print actions
         if ($actionlist) {
-            $r->print('<div>'
+            $r->print('<div class="LC_left_float">'
                      .'<fieldset>'
                      .'<legend>'
-                     .&mt('Currently available actions (will open extra window):')
+                     .&mt('[_1]Currently available actions[_2] (will open extra window):','<span class="LC_mail_functions">','</span>')
                      .'</legend>'
                      .$actionlist
                      .'</fieldset>'
@@ -2400,8 +2399,9 @@ 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'}));
+	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
     }
 
     my $broadcast_link;
@@ -2414,7 +2414,7 @@ sub displaymessage {
 
     # 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'}