* split uses regexps. explode does not.

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index ed3bf981cea18c8d67dc06888251f373d531cdf2..5014a54ec6d98958ccac0ccdf4b37a40d954a882 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -236,13 +236,14 @@
             $end = $startMessage + $show_num - 1;
             if ($numMessages < $show_num)
                 $end_loop = $numMessages;
-            else
+            elseif ($end > $numMessages)
+               $end_loop = $numMessages - $startMessage + 1;
+           else
                 $end_loop = $show_num;
          } else {
             $end = $numMessages;
             $end_loop = $end;
          }
-         if ($end > $numMessages) $end = $numMessages;
          while ($j < $end_loop) {
             if (isset($date[$j])) {
                 $date[$j] = ereg_replace('  ', ' ', $date[$j]);
@@ -584,7 +585,7 @@
                break;
                
             case 4: # subject
-               echo '   <TD WIDTH=%><B>'. _("Subject") ."</B>\n";
+               echo '   <TD><B>'. _("Subject") ."</B>\n";
                if ($sort == 4)
                  echo "   <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
                elseif ($sort == 5)