--- ../old/neomail.template	Sat Feb  8 12:56:23 2003
+++ neomail.template	Sat Feb  8 12:56:55 2003
@@ -196,9 +196,10 @@
    my $isvalid = 0;
    @validfolders = @{&getfolders()};
    if (param("folder")) {
-      $folder = param("folder");
+      my $basketcase=param("folder");
       foreach my $checkfolder (@validfolders) {
-         if ($folder eq $checkfolder) {
+         if ($basketcase eq $checkfolder) {
+            $folder = $checkfolder;
             $isvalid = 1;
             last;
          }
@@ -397,6 +398,7 @@
    opendir (FOLDERDIR, "$folderdir") or
       neomailerror("$lang_err{'couldnt_open'} $folderdir!");
    while (defined($filename = readdir(FOLDERDIR))) {
+      $filename =~ /^(.*)$/; $filename = $1; # untaint folder name
       next if ( ($filename =~ /\.db$/) ||
                 ($filename =~ /\.dir$/) ||
                 ($filename =~ /\.pag$/) ); # Skip DBM files