lib/PublicInbox/NNTP.pm | 24 +++++++++---------------

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 71b774d224bc03396e2ec582448fb6cddac36e76..e5bb683acb2f221b186028cc1f0f44f83cf5cb67 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -374,18 +374,16 @@ 	my $o = 'HEAD:' . mid2path($mid);
 	my $bytes;
 	my $s = eval { Email::MIME->new($ng->gcf->cat_file($o, \$bytes)) };
 	return $err unless $s;
+	my $lines;
 	if ($set_headers) {
 		$s->header_set('Newsgroups', $ng->{name});
-		$s->header_set('Lines', $s->body =~ tr!\n!\n!);
 		$s->header_set('Xref', xref($ng, $n));
+		$lines = $s->body =~ tr!\n!\n!;
 
 		# must be last
-		if ($set_headers == 2) {
-			$s->header_set('Bytes', $bytes);
-			$s->body_set('');
-		}
+		$s->body_set('') if ($set_headers == 2);
 	}
-	[ $n, $mid, $s ];
+	[ $n, $mid, $s, $bytes, $lines ];
 }
 
 sub simple_body_write ($$) {
@@ -399,13 +397,6 @@ 	do_more($self, "\r\n") unless $body =~ /\r\n\z/s;
 	'.'
 }
 
-sub header_str ($) {
-	my ($s) = @_;
-	my $h = $s->header_obj;
-	$h->header_set('Bytes');
-	$h->as_string
-}
-
 sub set_art {
 	my ($self, $art) = @_;
 	$self->{article} = $art if defined $art && $art =~ /\A\d+\z/;
@@ -418,7 +409,7 @@ 	return $r unless ref $r;
 	my ($n, $mid, $s) = @$r;
 	set_art($self, $art);
 	more($self, "220 $n <$mid> article retrieved - head and body follow");
-	do_more($self, header_str($s));
+	do_more($self, $s->header_obj->as_string);
 	do_more($self, "\r\n");
 	simple_body_write($self, $s);
 }
@@ -430,7 +421,7 @@ 	return $r unless ref $r;
 	my ($n, $mid, $s) = @$r;
 	set_art($self, $art);
 	more($self, "221 $n <$mid> article retrieved - head follows");
-	do_more($self, header_str($s));
+	do_more($self, $s->header_obj->as_string);
 	'.'
 }
 
@@ -486,6 +477,9 @@ }
 
 sub xhdr ($$) {
 	my ($r, $header) = @_;
+	$header = lc $header;
+	return $r->[3] if ($header eq 'bytes');
+	return $r->[4] if ($header eq 'lines');
 	$r = $r->[2]->header_obj->header($header);
 	defined $r or return;
 	$r =~ s/[\r\n\t]+/ /sg;