lib/PublicInbox/ExtMsg.pm | 26 +++++++++++++++++++++-----

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index f3076a3476daef7022f66408a8b9cc6f4b1a0352..c71510f548191b966cfb4835256764f4ceeae7f3 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -84,17 +84,33 @@ 	# fall back to partial MID matching
 	my $n_partial = 0;
 	my @partial;
 
-	eval { require PublicInbox::Msgmap };
-	my $have_mm = $@ ? 0 : 1;
-	if ($have_mm) {
+	if (my $mm = $cur->mm) {
+		my $tmp_mid = $mid;
+		my $res = $mm->mid_prefixes($tmp_mid, 100);
+		if ($res && scalar(@$res)) {
+			$n_partial += scalar(@$res);
+			push @partial, [ $cur, $res ];
+		# fixup common errors:
+		} elsif ($tmp_mid =~ s,/[tTf],,) {
+			$res = $mm->mid_prefixes($tmp_mid, 100);
+			if ($res && scalar(@$res)) {
+				$n_partial += scalar(@$res);
+				push @partial, [ $cur, $res ];
+			}
+		}
+	}
+
+	# can't find a partial match in current inbox, try the others:
+	if (!$n_partial && length($mid) >= 16) {
 		my $tmp_mid = $mid;
 again:
-		unshift @ibx, $cur;
 		foreach my $ibx (@ibx) {
 			my $mm = $ibx->mm or next;
-			if (my $res = $mm->mid_prefixes($tmp_mid)) {
+			my $res = $mm->mid_prefixes($tmp_mid, 100);
+			if ($res && scalar(@$res)) {
 				$n_partial += scalar(@$res);
 				push @partial, [ $ibx, $res ];
+				last if $n_partial >= 100;
 			}
 		}
 		# fixup common errors: