bugfixes from andrea dahl

[squirrelmail.git] / src / folders.php

diff --git a/src/folders.php b/src/folders.php
index bdb1bb55e830415ac5ae808bdf19e25979fa8549..847466448c9420f757c8e54998e4b471aa33b882 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -122,6 +122,8 @@
          $count_special_folders++;
       else if ($boxes[$p]["unformatted"] == $trash_folder && $trash_folder)                                                                  
          $count_special_folders++;
+      else if ($boxes[$p]["unformatted"] == $sent_folder && $sent_folder)
+         $count_special_folders++;
    }   
 
    if ($count_special_folders < count($boxes)) {
@@ -232,7 +234,8 @@
                        {       
             $box = $boxes[$i]["unformatted-dm"];
             $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
+            if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
+               echo "<OPTION VALUE=\"$box\">$box2\n";
          }
       }
       echo "</SELECT></TT>\n";