X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_mailbox.php;h=2e92dd275c86b3f6c061c75694f7de0be4686f70;hp=0cae70822d952b131522e978cc4b2f8cb5550e50;hb=92fa9f52e412d8978ce09438c0792d2d29f03bb6;hpb=9a11873e3c2dd4af4c32dc1e442959b8721a50ad

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 0cae7082..2e92dd27 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -136,14 +136,13 @@ function isSpecialMailbox( $box ) {
            $move_to_trash, $move_to_sent, $save_as_draft;
 
     $ret = ( (strtolower($box) == 'inbox') ||
-             ( $move_to_trash && isBoxBelow( $box, $trash_folder ) ) ||
-             ( $move_to_sent && isBoxBelow( $box, $sent_folder )) ||
+             ( $move_to_trash && $trash_folder && isBoxBelow( $box, $trash_folder )) ||
+             ( $move_to_sent  && $sent_folder  && isBoxBelow( $box, $sent_folder  )) ||
              ($save_as_draft && $box == $draft_folder ) );
 
     if ( !$ret ) {
         $ret = do_hook_function( 'special_mailbox', $box );
     }
-
     return $ret;
 }