X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=18db9d38e12bdae939ce532c200eaffa5e73a4df;hb=HEAD;hp=2ef8ff2ba48da7e52d2aebbde3d035c001c23503;hpb=ab9c03ff4aa369b397dc1a8c8936153c8565fd05;p=public-inbox.git

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 2ef8ff2b..18db9d38 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -19,12 +19,10 @@ sub getline {
 	my $smsg = $ctx->{smsg} or return;
 	my $ibx = $ctx->{ibx};
 	my $eml = delete($ctx->{eml}) // $ibx->smsg_eml($smsg) // return;
-	my $n = $ctx->{smsg} = $ibx->over->next_by_mid(@{$ctx->{next_arg}});
-	$ctx->zmore(msg_hdr($ctx, $eml));
-	if ($n) {
-		$ctx->translate(msg_body($eml));
+	if (($ctx->{smsg} = $ibx->over->next_by_mid(@{$ctx->{next_arg}}))) {
+		$ctx->translate(msg_hdr($ctx, $eml), msg_body($eml));
 	} else { # last message
-		$ctx->zflush(msg_body($eml));
+		$ctx->zflush(msg_hdr($ctx, $eml), msg_body($eml));
 	}
 }
 
@@ -45,8 +43,7 @@ sub async_eml { # for async_blob_cb
 	# next message
 	$ctx->{smsg} = $ctx->{ibx}->over->next_by_mid(@{$ctx->{next_arg}});
 	local $ctx->{eml} = $eml; # for mbox_hdr
-	$ctx->zmore(msg_hdr($ctx, $eml));
-	$ctx->write(msg_body($eml));
+	$ctx->write(msg_hdr($ctx, $eml), msg_body($eml));
 }
 
 sub mbox_hdr ($) {