--- loncom/interface/lonmsgdisplay.pm	2009/02/04 20:14:45	1.111
+++ loncom/interface/lonmsgdisplay.pm	2009/02/14 00:27:08	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.111 2009/02/04 20:14:45 weissno Exp $
+# $Id: lonmsgdisplay.pm,v 1.114 2009/02/14 00:27:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -838,6 +838,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,
@@ -1078,11 +1079,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') {
@@ -1114,7 +1117,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"'. 
@@ -1240,7 +1242,7 @@ sub compout {
     } elsif ($multiforward) {
         &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/email?folder=".&escape($folder),
-          text=>"Display all Messages"});
+          text=>"Display All Messages"});
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
@@ -3483,7 +3485,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);
@@ -3498,7 +3500,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 />');
@@ -3511,7 +3513,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;
@@ -3519,7 +3521,7 @@ sub handler {
         &Apache::loncommunicate::menu($r);
         &disall($r,$showfolder,$msgstatus);
     } else {
-	&printheader($r,'','Display all Messages');
+	&printheader($r,'','Display All Messages');
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
     }