diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile
--- /server-root/ports/mail/mailscanner.orig/Makefile	Mon Nov  1 21:10:10 2004
+++ /server-root/ports/mail/mailscanner/Makefile	Wed Nov 10 08:30:33 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.35.9
+PORTVERSION=	4.35.11
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/distinfo /server-root/ports/mail/mailscanner/distinfo
--- /server-root/ports/mail/mailscanner.orig/distinfo	Mon Nov  1 21:10:10 2004
+++ /server-root/ports/mail/mailscanner/distinfo	Wed Nov 10 08:30:42 2004
@@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.35.9-1.tar.gz) = 4e3a0739cec1cc0bd94e24fb8ac558db
-SIZE (MailScanner-install-4.35.9-1.tar.gz) = 5480916
+MD5 (MailScanner-install-4.35.11-1.tar.gz) = 2ce8d93b6526c33791ad696a7e61cc7d
+SIZE (MailScanner-install-4.35.11-1.tar.gz) = 5508189
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:Message.pm /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:Message.pm
--- /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:Message.pm	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:Message.pm	Wed Nov 10 08:33:53 2004
@@ -0,0 +1,24 @@
+--- ../MailScanner-install-4.35.11.orig/lib/MailScanner/Message.pm	Wed Nov 10 08:31:01 2004
++++ lib/MailScanner/Message.pm	Wed Nov 10 08:33:19 2004
+@@ -4043,6 +4043,8 @@
+     $squashedtext =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; # Unescape
+     $squashedtext =~ s/\s+//g; # Remove any whitespace
+     $squashedtext =~ s/\\/\//g;
++    $squashedtext =~ s/(\<\/?[^>]*\>)*//ig; # Remove tags
++    #$squashedtext =~ s/^(\<\/?(br|p|ul)\>)*//ig; # Remove leading br, p, ul tags
+     #print STDERR "Text = \"$text\"\n";
+     #print STDERR "1SquashedText = \"$squashedtext\"\n";
+     #print STDERR "1LinkURL      = \"$DisarmLinkURL\"\n";
+@@ -4055,9 +4057,11 @@
+       $linkurl =~ s/\%a0//g;
+       $linkurl =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; # Unescape
+       $linkurl =~ s/\s+//; # Remove any whitespace
++      #$linkurl =~ s/(\<\/?[^>]*\>)*//ig; # Remove tags
++      #$linkurl =~ s/^(\<\/?(br|p|ul)\>)*//ig; # Remove leading br, p, ul tags
+       $linkurl =~ s/^(https?|ftp):\/\///;
+       $linkurl =~ s/\/.*$//; # Only compare up to the first '/' (hostname only)
+-      $linkurl =~ s/\<\/?(br|p)\>$//i; # Remove trailing <br> and <p> tags
++      $linkurl =~ s/(\<\/?(br|p|ul)\>)*$//ig; # Remove trailing br, p, ul tags
+       $linkurl =~ s/\/$//; # LinkURL is trimmed -- note
+       #print STDERR "2SquashedText = \"$squashedtext\"\n";
+       #print STDERR "2LinkURL      = \"$linkurl\"\n";