--- trunk/httpd.pl	2004/05/06 19:46:58	14
+++ trunk/httpd.pl	2004/05/06 23:06:08	16
@@ -81,6 +81,8 @@
 
 		if ($param->{'search_val'} && $param->{'search_fld'} && !$param->{'search'}) {
 			$param->{'search'} = $param->{'search_fld'}.":".$param->{'search_val'};
+		} elsif ($param->{'search'}) {
+			($param->{'search_fld'}, $param->{'search_val'}) = split(/:/,$param->{'search'},2);
 		}
 
 		my $tpl_var = {
@@ -146,9 +148,10 @@
 sub subject_search_filter {
 	my $s = shift;
 	# remove re: fdw: [list] preffixes from e-mail
-	while (	$s =~ s/^\s*\[(?:re|fwd):\s+(.+)\]\s*$/$1/ig ||
-		$s =~ s/^\s*(?:re|fwd):\s+(.+?)\s*$/$1/ig ||
-		$s =~ s/^\[\w+\]\s*//ig
+	while (	$s =~ s/^\s*\[(?:re|fwd|fw):\s+(.+)\]\s*$/$1/ig ||
+		$s =~ s/^\s*(?:re|fwd|fw):\s+(.+?)\s*$/$1/ig ||
+		$s =~ s/^\[\S+\]\s*//ig ||
+		$s =~ s/^\[[^@]+@\w+\.\w+\s*:\s+(.+)\s*\]\s*$/$1/g
 	) { };
 	return $s;
 }