lib/PublicInbox/IMAP.pm | 22 +++++++++++-----------
 t/imapd.t               |  4 ++--

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index fe3c7d1a85bba20174642fb9399dce902bcdf0f8..d0683530988dfbe3ba921a2855fd9da4b17adfcf 100644
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -475,12 +475,12 @@ 	# wbuf may be populated by $cb, no need to rearm if so:
 	$self->requeue if $new_size == 1;
 }
 
-# my ($uid_base, $UID) = @_;
-sub fetch_msn_uid ($$) { '* '.($_[1] - $_[0]).' FETCH (UID '.$_[1] }
+# my ($msn, $UID) = @_;
+sub fetch_msn_uid ($$) { '* '.(${$_[0]}++).' FETCH (UID '.$_[1] }
 
 sub fetch_run_ops {
-	my ($self, $uid_base, $smsg, $bref, $ops, $partial) = @_;
-	$self->msg_more(fetch_msn_uid($uid_base, $smsg->{num}));
+	my ($self, $msn, $smsg, $bref, $ops, $partial) = @_;
+	$self->msg_more(fetch_msn_uid($msn, $smsg->{num}));
 	my ($eml, $k);
 	for (my $i = 0; $i < @$ops;) {
 		$k = $ops->[$i++];
@@ -492,7 +492,7 @@ }
 
 sub fetch_blob_cb { # called by git->cat_async via git_async_cat
 	my ($bref, $oid, $type, $size, $fetch_arg) = @_;
-	my ($self, undef, $msgs, undef, $ops, $partial) = @$fetch_arg;
+	my ($self, undef, $msgs, $range_info, $ops, $partial) = @$fetch_arg;
 	my $smsg = shift @$msgs or die 'BUG: no smsg';
 	if (!defined($oid)) {
 		# it's possible to have TOCTOU if an admin runs
@@ -501,7 +501,7 @@ 		return requeue_once($self);
 	} else {
 		$smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
 	}
-	fetch_run_ops($self, $self->{uid_base}, $smsg, $bref, $ops, $partial);
+	fetch_run_ops($self, $range_info->[3], $smsg, $bref, $ops, $partial);
 	requeue_once($self);
 }
 
@@ -601,7 +601,8 @@ 	} else {
 		return 'BAD fetch range';
 	}
 	uid_clamp($self, \$beg, \$end) if defined($range);
-	[ $beg, $end, $$range_csv ];
+	my $msn = $beg - $self->{uid_base};
+	[ $beg, $end, $$range_csv, \$msn ];
 }
 
 sub refill_range ($$$) {
@@ -638,8 +639,7 @@ 			$self->write(\"$tag $end\r\n");
 			return;
 		}
 	}
-	my $uid_base = $self->{uid_base};
-	fetch_run_ops($self, $uid_base, $_, undef, $ops) for @$msgs;
+	fetch_run_ops($self, $range_info->[3], $_, undef, $ops) for @$msgs;
 	@$msgs = ();
 	1; # more
 }
@@ -665,10 +665,10 @@ 			@$range_info = @$next_range;
 		}
 		# continue looping
 	}
-	my $uid_base = $self->{uid_base};
 	my ($i, $k);
+	my $msn = $range_info->[3];
 	for (@$uids) {
-		$self->msg_more(fetch_msn_uid($uid_base, $_));
+		$self->msg_more(fetch_msn_uid($msn, $_));
 		for ($i = 0; $i < @$ops;) {
 			$k = $ops->[$i++];
 			$ops->[$i++]->($self, $k);
diff --git a/t/imapd.t b/t/imapd.t
index c691e1a96a7026b3228cdcaaa2f1ebd466b22eb7..fdab074a249f292936bc952bfb473fd7601f3180 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -349,8 +349,8 @@ 	run_script(\@cmd, $env, $rdr) or BAIL_OUT('-learn rm');
 }
 my $r2 = $mic->fetch_hash('1:*', 'BODY.PEEK[]') or BAIL_OUT "FETCH $@";
 is(scalar keys %$r2, 2, 'did not get all 3 messages');
-is($r2->{2}->{'BODY[]'}, $ret->{2}->{RFC822}, 'message 2 unchanged');
-is($r2->{3}->{'BODY[]'}, $ret->{3}->{RFC822}, 'message 3 unchanged');
+is($r2->{1}->{'BODY[]'}, $ret->{2}->{RFC822}, 'message 2 unchanged');
+is($r2->{2}->{'BODY[]'}, $ret->{3}->{RFC822}, 'message 3 unchanged');
 $r2 = $mic->fetch_hash(2, 'BODY.PEEK[HEADER.FIELDS (message-id)]')
 			or BAIL_OUT "FETCH $@";
 is($r2->{2}->{'BODY[HEADER.FIELDS (MESSAGE-ID)]'},