--- trunk/httpd.pl	2004/05/11 15:36:51	43
+++ trunk/httpd.pl	2004/05/11 16:05:31	44
@@ -271,7 +271,8 @@
 	$text =~ s/(\s*--+\s*Forwarded\s+message.+\s*--+.*)$//si;
 
 	# remove signature
-	$text =~ s/[\n\r]+--\s*[\n\r]+.*$//s;
+	$text =~ s/(?:^|[\n\r]+)*--\s*[\n\r]+.*$//s;
+	$text =~ s/(?:^|[\n\r]+)*_____+[\n\r]+.*$//s;
 
 	# compress cr/lf
 	$text =~ s/[\n\r]+/\n/gs;
@@ -303,6 +304,8 @@
 	# remove signature
 	if ($text =~ s/([\n\r]+)(--\s*[\n\r]+.*)$//s) {
 		$sig = "$1#-#signature##$2##signature#-#";
+	} elsif ($text =~s/(^|[\n\r]+)*(_____+[\n\r]+.*)$//s) {
+		$sig = "$1#-#signature##$2##signature#-#";
 	}
 
 	# find quoted text