lib/PublicInbox/WatchMaildir.pm | 6 ++----

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 7b9e891508aa069ce2981ffd4baa45ff102dc025..02e4b32f254a8933e81e60b2001b8cc5ebce63c8 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -175,10 +175,8 @@ 		if (my $watch_hdrs = $ibx->{-watchheaders}) {
 			my $ok;
 			my $hdr = $mime->header_obj;
 			for my $wh (@$watch_hdrs) {
-				my $v = $hdr->header_raw($wh->[0]);
-				next unless defined($v) && $v =~ $wh->[1];
-				$ok = 1;
-				last;
+				my @v = $hdr->header_raw($wh->[0]);
+				$ok = grep(/$wh->[1]/, @v) and last;
 			}
 			next unless $ok;
 		}