import im-150im-150

2 files changed, 10 insertions, 7 deletions

diff --git a/img/dist/IM/dot.im/Config b/img/dist/IM/dot.im/Config
index ab8b609a..2977a02d 100644
--- a/img/dist/IM/dot.im/Config
+++ b/img/dist/IM/dot.im/Config
@@ -147,6 +147,7 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #NamazuV2=yes			# use Namazu version 2 (1.9.x or late)
 #NamazuDir=Namazu		# relative to ~/
 #NamazuLockDir=nmzlock		# lock directory (relative to ~/.im/)
+#MknmzOptions=--decode-base64	# additional options for mknmz
 #MknmzIncludeFile=~/Namazu/mknmz-inc.pl	# mknmz -I <file>
 #MknmzIgnoreFoldersRegex=\+(attach|draft|trash|queue|postq|schedule)
 
diff --git a/img/dist/IM/dot.im/get.sbr.refile b/img/dist/IM/dot.im/get.sbr.refile
index b814889c..6382d3c9 100644
--- a/img/dist/IM/dot.im/get.sbr.refile
+++ b/img/dist/IM/dot.im/get.sbr.refile
@@ -46,19 +46,21 @@ sub get_sub ($$$) {
 	    $/ = $tmp_str;
 
 	    $new_folder = $folder;
-	    if ($header =~ /(^|\n)X-Bogosity: Yes/) {
+	    if ($header =~ /(^|\n)X-Bogosity: Yes/i) {
 		$new_folder = '+spam';
-	    } elsif ($header =~ /(^|\n)X-Spam-Flag: Yes/) {
+	    } elsif ($header =~ /(^|\n)X-Spam-Flag: Yes/i) {
 		$new_folder = '+spam';
-	    } elsif ($header =~ /(^|\n)X-Spam: yes/) {
+	    } elsif ($header =~ /(^|\n)X-Spam: yes/i) {
 		$new_folder = '+spam';
-#	    } elsif ($header =~ /(^|\n)X-ML-Name: mew-dist/) {
+#	    } elsif ($header =~ /(^|\n)X-ML-Name: mew-dist/i) {
 #		$new_folder = '+mew-dist';
 	    }
 	    if ($new_folder ne $folder) {
-		$new_file = &message_name($new_folder, 'new') || die $!;
-		&im_notice("refiling $folder/$msg to $new_folder.\n");
-		&im_rename($file, $new_file) || die $!;
+		if (&create_folder($new_folder) == 0) {
+		    $new_file = &message_name($new_folder, 'new') || die $!;
+		    &im_notice("refiling $folder/$msg to $new_folder.\n");
+		    &im_rename($file, $new_file) || die $!;
+		}
 	    }
 	    close(MSG);
 	}