- fixed bug when deleting last message, sends you to previous list

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e30254534dfc5a0a9f4b4adc8824238ceb11845c..ac5ba8e47e86dc2cb2626fb060a7ecbccd31f0e1 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -170,22 +170,26 @@
       global $folder_prefix, $sent_folder;
                global $imapServerAddress;
 
-      // do a check to see if the config stuff has already been included or not
-//      if (!isset($imapServerAddress))
-//         include("../config/config.php");
-
       // if cache isn't already set, do it now
       if (!session_is_registered("msgs"))
          session_register("msgs");
       if (!session_is_registered("msort"))
          session_register("msort");
 
+
       if ($startMessage + ($show_num - 1) < $numMessages) {
          $endMessage = $startMessage + ($show_num-1);
       } else {
          $endMessage = $numMessages;
       }
 
+      
+      if ($endMessage < $startMessage) {
+         $startMessage = $startMessage - $show_num;
+         if ($startMessage < 1)
+            $startMessage = 1;
+      }
+      
       $nextGroup = $startMessage + $show_num;
       $prevGroup = $startMessage - $show_num;
       $urlMailbox = urlencode($mailbox);