--- trunk/templates/macros.tt2	2004/05/09 11:41:23	36
+++ trunk/templates/macros.tt2	2004/05/09 23:18:12	37
@@ -7,8 +7,8 @@
 		my $s = $search;
 
 		# remove re: fdw: [list] preffixes from e-mail
-		while (	$s =~ s/^\s*\[(?:re|fwd|fw):\s+(.+)\]\s*$/$1/ig ||
-			$s =~ s/^\s*(?:re|fwd|fw):\s+(.+?)\s*$/$1/ig ||
+		while (	$s =~ s/^\s*\[(?:re|fwd|fw)(?:\[\d+\])*:\s+(.+)\]\s*$/$1/ig ||
+			$s =~ s/^\s*(?:re|fwd|fw)(?:\[\d+\])*:\s+(.+?)\s*$/$1/ig ||
 			$s =~ s/^\[\S+\]\s*//ig ||
 			$s =~ s/^\[[^@]+@[\w\.]+\s*:\s+(.+)\s*\]\s*$/$1/g ||
 			$s =~ s/\(fwd\)\s*$//ig ||