lib/PublicInbox/View.pm | 15 +++++++++------

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 0b47c899c03735208f56c491163b139975ee4846..9393d44334ab12d41ad24309d188587dfd41985c 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -119,8 +119,15 @@ 	foreach my $f (qw(To Cc)) {
 		my $dst = _hdr_names($hdr, $f);
 		push @tocc, "$f: $dst" if $dst ne '';
 	}
-	$rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC\n";
+	my $mapping = $ctx->{mapping};
+	$rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
+	my $upfx = $ctx->{-upfx};
+	$rv .= qq{ (<a\nhref="$upfx$mid_raw/">permalink</a> / };
+	$rv .= qq{<a\nhref="$upfx$mid_raw/raw">raw</a>)\n};
 	$rv .= '  '.join('; +', @tocc) . "\n" if @tocc;
+	if (!$mapping && $irt) {
+		$rv .= qq(In-Reply-To: &lt;<a\nhref="$upfx$irt/">$irt</a>&gt;\n)
+	}
 	$rv .= "\n";
 
 	# scan through all parts, looking for displayable text
@@ -173,11 +180,7 @@ 	}
 	if (my $next = $node->next) {
 		$rv .= $pad .  $mapping->{$next->messageid}->[1];
 	}
-	$rv .= "<a\nhref=#e$id\nid=m$id>.<a>\t\t\t";
-	$rv .= "(<a\nhref=#r$id\n>$s_s, $s_c</a> / ";
-	my $upfx = $ctx->{-upfx};
-	$rv .= qq{<a\nhref="$upfx$mid_raw/">permalink</a> / };
-	$rv .= qq{<a\nhref="$upfx$mid_raw/raw">raw</a>)\n};
+	$rv .= "<a\nhref=#e$id\nid=m$id>_<a> <a\nhref=#r$id\n>$s_s, $s_c</a>\n";
 }
 
 sub walk_thread {