Index: MHonArc/lib/readmail.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/readmail.pl,v
retrieving revision 2.32
diff -u -r2.32 readmail.pl
--- MHonArc/lib/readmail.pl	4 Feb 2003 23:31:20 -0000	2.32
+++ MHonArc/lib/readmail.pl	31 Jul 2003 15:02:41 -0000
@@ -564,11 +564,8 @@
 
 	    ## Get boundary
 	    $boundary = "";
-	    if ($content =~ m/\bboundary\s*=\s*"([^"]*)"/i) {
+	    if ($content =~ m/\bboundary\s*=\s*["']?(.*?)["']?(?:;|$)/i) {
 		$boundary = $1;
-	    } else {
-		($boundary) = $content =~ m/\bboundary\s*=\s*(\S+)/i;
-		$boundary =~ s/;$//;  # chop ';' if grabbed
 	    }
 
 	    ## If boundary defined, split body into parts