X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=db2bd20f3a8e9b8920bb6042ffbeb4c51a97d122;hb=2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03;hp=2ca7f95ceb8c77caea34323c749632b724a8e082;hpb=4c2c2325d2948ec5340e2fcafbee798cf568f5fd;p=public-inbox.git

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 2ca7f95c..db2bd20f 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -8,497 +8,535 @@ use strict;
 use warnings;
 use URI::Escape qw/uri_escape_utf8/;
 use Date::Parse qw/str2time/;
-use Encode qw/find_encoding/;
 use Encode::MIME::Header;
-use Email::MIME::ContentType qw/parse_content_type/;
-use PublicInbox::Hval;
-use PublicInbox::MID qw/mid_clean id_compress mid2path/;
-use Digest::SHA qw/sha1_hex/;
-my $SALT = rand;
-my $MBOX_TITLE = 'title="download thread as gzipped mbox"';
+use Plack::Util;
+use PublicInbox::Hval qw/ascii_html/;
+use PublicInbox::Linkify;
+use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
+use PublicInbox::MsgIter;
+use PublicInbox::Address;
+use PublicInbox::WwwStream;
 require POSIX;
 
-# TODO: make these constants tunable
-use constant MAX_INLINE_QUOTED => 12; # half an 80x24 terminal
-use constant MAX_TRUNC_LEN => 72;
-use constant T_ANCHOR => '#u';
 use constant INDENT => '  ';
+use constant TCHILD => '` ';
+sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
 
-*ascii_html = *PublicInbox::Hval::ascii_html;
-
-my $enc_utf8 = find_encoding('UTF-8');
-
-# public functions:
+# public functions: (unstable)
 sub msg_html {
-	my ($ctx, $mime, $full_pfx, $footer) = @_;
-	if (defined $footer) {
-		$footer = "\n" . $footer;
-	} else {
-		$footer = '';
-	}
-	headers_to_html_header($mime, $full_pfx, $ctx) .
-		multipart_text_as_html($mime, $full_pfx) .
-		'</pre><hr />' . PublicInbox::Hval::PRE .
-		html_footer($mime, 1, $full_pfx, $ctx) .
-		$footer .
-		'</pre></body></html>';
+	my ($ctx, $mime, $footer) = @_;
+	my $hdr = $mime->header_obj;
+	my $tip = _msg_html_prepare($hdr, $ctx);
+	PublicInbox::WwwStream->new($ctx, sub {
+		my ($nr, undef) = @_;
+		if ($nr == 1) {
+			$tip . multipart_text_as_html($mime, '') .
+				'</pre><hr />'
+		} elsif ($nr == 2) {
+			# fake an EOF if generating the footer fails;
+			# we want to at least show the message if something
+			# here crashes:
+			eval {
+				'<pre>' . html_footer($hdr, 1, $ctx) .
+				'</pre>' . msg_reply($ctx, $hdr)
+			};
+		} else {
+			undef
+		}
+	});
 }
 
-sub feed_entry {
-	my ($class, $mime, $full_pfx) = @_;
+# /$INBOX/$MESSAGE_ID/#R
+sub msg_reply {
+	my ($ctx, $hdr) = @_;
+	my $se_url =
+	 'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
+
+	my ($arg, $link) = mailto_arg_link($hdr);
+	push @$arg, '/path/to/YOUR_REPLY';
 
-	PublicInbox::Hval::PRE .
-		multipart_text_as_html($mime, $full_pfx) . '</pre>';
+	"<pre\nid=R>".
+	"You may reply publically to <a\nhref=#t>this message</a> via\n".
+	"plain-text email using any one of the following methods:\n\n" .
+	"* Save the following mbox file, import it into your mail client,\n" .
+	"  and reply-to-all from there: <a\nhref=raw>mbox</a>\n\n" .
+	"* Reply to all the recipients using the <b>--to</b>, <b>--cc</b>,\n" .
+	"  and <b>--in-reply-to</b> switches of git-send-email(1):\n\n" .
+	"  git send-email \\\n    " .
+	join(" \\\n    ", @$arg ). "\n\n" .
+	qq(  <a\nhref="$se_url">$se_url</a>\n\n) .
+	"* If your mail client supports setting the <b>In-Reply-To</b>" .
+	" header\n  via mailto: links, try the " .
+	qq(<a\nhref="$link">mailto: link</a>\n) .
+	'</pre>';
 }
 
 sub in_reply_to {
-	my ($header_obj) = @_;
-	my $irt = $header_obj->header('In-Reply-To');
+	my ($hdr) = @_;
+	my $irt = $hdr->header_raw('In-Reply-To');
 
 	return mid_clean($irt) if (defined $irt);
 
-	my $refs = $header_obj->header('References');
+	my $refs = $hdr->header_raw('References');
 	if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
 		return $1;
 	}
 	undef;
 }
 
+sub _hdr_names ($$) {
+	my ($hdr, $field) = @_;
+	my $val = $hdr->header($field) or return '';
+	ascii_html(join(', ', PublicInbox::Address::names($val)));
+}
+
+sub nr_to_s ($$$) {
+	my ($nr, $singular, $plural) = @_;
+	return "0 $plural" if $nr == 0;
+	$nr == 1 ? "$nr $singular" : "$nr $plural";
+}
+
 # this is already inside a <pre>
 sub index_entry {
-	my ($fh, $mime, $level, $state) = @_;
-	my $midx = $state->{anchor_idx}++;
-	my $ctx = $state->{ctx};
+	my ($mime, $ctx, $more) = @_;
 	my $srch = $ctx->{srch};
-	my ($prev, $next) = ($midx - 1, $midx + 1);
-	my $part_nr = 0;
-	my $enc = enc_for($mime->header("Content-Type"));
-	my $subj = $mime->header('Subject');
-	my $header_obj = $mime->header_obj;
-
-	my $mid_raw = mid_clean($header_obj->header('Message-ID'));
-	my $id = anchor_for($mid_raw);
-	my $seen = $state->{seen};
-	$seen->{$id} = "#$id"; # save the anchor for children, later
+	my $hdr = $mime->header_obj;
+	my $subj = $hdr->header('Subject');
 
+	my $mid_raw = mid_clean(mid_mime($mime));
+	my $id = id_compress($mid_raw, 1);
+	my $id_m = 'm'.$id;
 	my $mid = PublicInbox::Hval->new_msgid($mid_raw);
-	my $from = PublicInbox::Hval->new_oneline($mime->header('From'))->raw;
-	my @from = Email::Address->parse($from);
-	$from = $from[0]->name;
-
-	$from = PublicInbox::Hval->new_oneline($from)->as_html;
-	$subj = PublicInbox::Hval->new_oneline($subj)->as_html;
-	my $root_anchor = $state->{root_anchor} || '';
-	my $path = $root_anchor ? '../../' : '';
-	my $href = $mid->as_href;
-	my $irt = in_reply_to($header_obj);
-	my $parent_anchor = $seen->{anchor_for($irt)} if defined $irt;
 
-	if ($srch) {
-		my $t = $ctx->{flat} ? 'T' : 't';
-		$subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
-	}
-	if ($root_anchor eq $id) {
-		$subj = "<u\nid=\"u\">$subj</u>";
-	}
+	my $root_anchor = $ctx->{root_anchor} || '';
+	my $irt = in_reply_to($hdr);
 
-	my $ts = _msg_date($mime);
-	my $rv = "<table\nsummary=l$level><tr>";
-	if ($level) {
-		$rv .= '<td><pre>' . (INDENT x $level) . '</pre></td>';
-	}
-	$rv .= "<td\nid=s$midx>" . PublicInbox::Hval::PRE;
-	$rv .= "<b\nid=\"$id\">$subj</b>\n";
-	$rv .= "- $from @ $ts UTC - ";
-	$rv .= "<a\nhref=\"#s$next\">next</a>";
-	if ($prev >= 0) {
-		$rv .= "/<a\nhref=\"#s$prev\">prev</a>";
+	my $rv = '<b>'.ascii_html($subj).'</b>';
+	$rv = "<u\nid=u>$rv</u>" if $root_anchor eq $id_m;
+	$rv .= "\n";
+	$rv .= _th_index_lite($mid_raw, $irt, $id, $ctx);
+	my @tocc;
+	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";
+	my $upfx = $ctx->{-upfx};
+	my $mhref = $upfx . $mid->as_href . '/';
+	$rv .= qq{ (<a\nhref="$mhref/">permalink</a> / };
+	$rv .= qq{<a\nhref="$mhref/raw">raw</a>)\n};
+	$rv .= '  '.join('; +', @tocc) . "\n" if @tocc;
+
+	my $mapping = $ctx->{mapping};
+	if (!$mapping && $irt) {
+		my $mirt = PublicInbox::Hval->msgid($irt);
+		my $href = $upfx . $mirt->as_href . '/';
+		my $html = $mirt->as_html;
+		$rv .= qq(In-Reply-To: &lt;<a\nhref="$href/">$html</a>&gt;\n)
 	}
-	$fh->write($rv .= "\n\n");
-
-	my ($fhref, $more_ref);
-	my $mhref = "${path}$href/";
-	my $more = 'permalink';
+	$rv .= "\n";
 
-	# show full message if it's our root message
-	my $neq = $root_anchor ne $id;
-	if ($neq || ($neq && $level != 0 && !$ctx->{flat})) {
-		$fhref = "${path}$href/f/";
-		$more_ref = \$more;
-	}
 	# scan through all parts, looking for displayable text
-	$mime->walk_parts(sub {
-		index_walk($fh, $_[0], $enc, \$part_nr, $fhref, $more_ref);
-	});
-	$mime->body_set('');
-
-	my $txt = "${path}$href/raw";
-	$rv = "\n<a\nhref=\"$mhref\">$more</a> <a\nhref=\"$txt\">raw</a> ";
-	$rv .= html_footer($mime, 0, undef, $ctx);
-
-	if (defined $irt) {
-		unless (defined $parent_anchor) {
-			my $v = PublicInbox::Hval->new_msgid($irt, 1);
-			$v = $v->as_href;
-			$parent_anchor = "${path}$v/";
-		}
-		$rv .= " <a\nhref=\"$parent_anchor\">parent</a>";
-	}
-	if (my $pct = $state->{pct}) {
-		$rv .= " [$pct->{$mid_raw}%]";
-	} elsif ($srch) {
+	msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) });
+
+	# add the footer
+	$rv .= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
+		"<a\nhref=\"$mhref\">permalink</a>" .
+		" / <a\nhref=\"${mhref}raw\">raw</a>" .
+		" / <a\nhref=\"${mhref}#R\">reply</a>";
+	if (my $pct = $ctx->{pct}) { # used by SearchView.pm
+		$rv .= " [relevance $pct->{$mid_raw}%]";
+	} elsif ($mapping) {
+		my $threaded = 'threaded';
+		my $flat = 'flat';
+		my $end = '';
 		if ($ctx->{flat}) {
-			$rv .= " [<a\nhref=\"${path}$href/t/#u\">threaded</a>" .
-				"|<b>flat</b>]";
+			$flat = "<b>$flat</b>";
 		} else {
-			$rv .= " [<b>threaded</b>|" .
-				"<a\nhref=\"${path}$href/T/#u\">flat</a>]";
+			$threaded = "<b>$threaded</b>";
 		}
+		$rv .= " / [<a\nhref=\"${mhref}T/#u\">$flat</a>";
+		$rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
+		$rv .= " / <a\nhref=#r$id>$ctx->{s_nr}</a>";
 	}
 
-	$fh->write($rv .= '</pre></td></tr></table>');
+	$rv .= $more ? "\n\n" : "\n";
 }
 
-sub thread_html {
-	my ($ctx, $foot, $srch) = @_;
-	sub { emit_thread_html($_[0], $ctx, $foot, $srch) }
+sub pad_link ($$;$) {
+	my ($mid, $level, $s) = @_;
+	$s ||= '...';
+	my $id = id_compress($mid, 1);
+	(' 'x19).indent_for($level).th_pfx($level)."<a\nhref=#r$id>($s)</a>\n";
 }
 
-# only private functions below.
+sub _th_index_lite {
+	my ($mid_raw, $irt, $id, $ctx) = @_;
+	my $rv = '';
+	my $mapping = $ctx->{mapping} or return $rv;
+	my $pad = '  ';
+	# map = [children, attr, node, idx, level]
+	my $map = $mapping->{$mid_raw};
+	my $nr_c = scalar @{$map->[0]};
+	my $nr_s = 0;
+	my $level = $map->[4];
+	my $idx = $map->[3];
+	if (defined $irt) {
+		my $irt_map = $mapping->{$irt};
+		my $siblings = $irt_map->[0];
+		$nr_s = scalar(@$siblings) - 1;
+		$rv .= $pad . $irt_map->[1];
+		if ($idx > 0) {
+			my $prev = $siblings->[$idx - 1];
+			my $pmid = $prev->messageid;
+			if ($idx > 2) {
+				my $s = ($idx - 1). ' preceding siblings ...';
+				$rv .= pad_link($pmid, $level, $s);
+			} elsif ($idx == 2) {
+				my $ppmid = $siblings->[0]->messageid;
+				$rv .= $pad . $mapping->{$ppmid}->[1];
+			}
+			$rv .= $pad . $mapping->{$pmid}->[1];
+		}
+	}
+	my $s_s = nr_to_s($nr_s, 'sibling', 'siblings');
+	my $s_c = nr_to_s($nr_c, 'reply', 'replies');
+	my $this = $map->[1];
+	$this =~ s!\n\z!</b>\n!s;
+	$this =~ s!<a\nhref.*</a> !!s; # no point in duplicating subject
+	$rv .= "<b>@ $this";
+	my $node = $map->[2];
+	if (my $child = $node->child) {
+		my $cmid = $child->messageid;
+		$rv .= $pad . $mapping->{$cmid}->[1];
+		if ($nr_c > 2) {
+			my $s = ($nr_c - 1). ' more replies';
+			$rv .= pad_link($cmid, $level + 1, $s);
+		} elsif (my $cn = $child->next) {
+			$rv .= $pad . $mapping->{$cn->messageid}->[1];
+		}
+	}
+	if (my $next = $node->next) {
+		my $nmid = $next->messageid;
+		$rv .= $pad . $mapping->{$nmid}->[1];
+		my $nnext = $nr_s - $idx;
+		if ($nnext > 2) {
+			my $s = ($nnext - 1).' subsequent siblings';
+			$rv .= pad_link($nmid, $level, $s);
+		} elsif (my $nn = $next->next) {
+			$rv .= $pad . $mapping->{$nn->messageid}->[1];
+		}
+	}
+	$rv .= "<a\nhref=#e$id\nid=m$id>_</a> ";
+	$rv .= "<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
+}
+
+sub walk_thread {
+	my ($th, $ctx, $cb) = @_;
+	my @q = map { (0, $_) } $th->rootset;
+	while (@q) {
+		my $level = shift @q;
+		my $node = shift @q or next;
+		$cb->($ctx, $level, $node);
+		unshift @q, $level+1, $node->child, $level, $node->next;
+	}
+}
+
+sub pre_thread  {
+	my ($ctx, $level, $node) = @_;
+	my $mapping = $ctx->{mapping};
+	my $idx = -1;
+	if (my $parent = $node->parent) {
+		my $m = $mapping->{$parent->messageid}->[0];
+		$idx = scalar @$m;
+		push @$m, $node;
+	}
+	$mapping->{$node->messageid} = [ [], '', $node, $idx, $level ];
+	skel_dump($ctx, $level, $node);
+}
+
+sub thread_index_entry {
+	my ($ctx, $level, $mime) = @_;
+	my ($beg, $end) = thread_adj_level($ctx, $level);
+	$beg . '<pre>' . index_entry($mime, $ctx, 0) . '</pre>' . $end;
+}
+
+sub stream_thread ($$) {
+	my ($th, $ctx) = @_;
+	my $inbox = $ctx->{-inbox};
+	my $mime;
+	my @q = map { (0, $_) } $th->rootset;
+	my $level;
+	while (@q) {
+		$level = shift @q;
+		my $node = shift @q or next;
+		unshift @q, $level+1, $node->child, $level, $node->next;
+		$mime = $inbox->msg_by_mid($node->messageid) and last;
+	}
+	return missing_thread($ctx) unless $mime;
+
+	$mime = Email::MIME->new($mime);
+	$ctx->{-title_html} = ascii_html($mime->header('Subject'));
+	$ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
+	my $body = PublicInbox::WwwStream->new($ctx, sub {
+		return unless $ctx;
+		while (@q) {
+			$level = shift @q;
+			my $node = shift @q or next;
+			unshift @q, $level+1, $node->child, $level, $node->next;
+			my $mid = $node->messageid;
+			if ($mime = $inbox->msg_by_mid($mid)) {
+				$mime = Email::MIME->new($mime);
+				return thread_index_entry($ctx, $level, $mime);
+			} else {
+				return ghost_index_entry($ctx, $level, $mid);
+			}
+		}
+		my $ret = join('', thread_adj_level($ctx, 0));
+		$ret .= ${$ctx->{dst}}; # skel
+		$ctx = undef;
+		$ret;
+	});
+	[ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
+}
 
-sub emit_thread_html {
-	my ($cb, $ctx, $foot, $srch) = @_;
+sub thread_html {
+	my ($ctx) = @_;
 	my $mid = $ctx->{mid};
-	my $res = $srch->get_thread($mid);
-	my $msgs = load_results($res);
-	my $nr = scalar @$msgs;
-	return missing_thread($cb, $ctx) if $nr == 0;
-	my $flat = $ctx->{flat};
-	my $orig_cb = $cb;
-	my $seen = {};
-	my $state = {
-		ctx => $ctx,
-		seen => $seen,
-		root_anchor => anchor_for($mid),
-		anchor_idx => 0,
-	};
-
-	require PublicInbox::Git;
-	my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
-	if ($flat) {
-		pre_anchor_entry($seen, $_) for (@$msgs);
-		__thread_entry(\$cb, $git, $state, $_, 0) for (@$msgs);
-	} else {
-		my $th = thread_results($msgs);
-		thread_entry(\$cb, $git, $state, $_, 0) for $th->rootset;
-	}
-	$git = undef;
-	Email::Address->purge_cache;
-
-	# there could be a race due to a message being deleted in git
-	# but still being in the Xapian index:
-	return missing_thread($cb, $ctx) if ($orig_cb eq $cb);
-
-	my $final_anchor = $state->{anchor_idx};
-	my $next = "<a\nid=\"s$final_anchor\">";
-	$next .= $final_anchor == 1 ? 'only message in' : 'end of';
-	$next .= " thread</a>, back to <a\nhref=\"../../\">index</a>";
-	$next .= "\ndownload thread: ";
-	$next .= "<a\n$MBOX_TITLE\nhref=\"../t.mbox.gz\">mbox.gz</a>";
-	$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>";
-	$cb->write("<hr />" . PublicInbox::Hval::PRE . $next . "\n\n".
-		$foot .  "</pre></body></html>");
-	$cb->close;
-}
-
-sub index_walk {
-	my ($fh, $part, $enc, $part_nr, $fhref, $more) = @_;
-	my $s = add_text_body($enc, $part, $part_nr, $fhref);
-
-	if ($more) {
-		my $m = 0;
-		# drop the remainder of git patches, they're usually better
-		# to review when the full message is viewed
-		$s =~ s!^---+\n.*\z!!ms and $m = 1;
-
-		# Drop signatures
-		$s =~ s/^-- \n.*\z//ms and $m = 1;
-		$$more = "<b>More...</b>\n\n$$more" if $m;
-	}
-
-	# kill any leading or trailing whitespace lines
-	$s =~ s/^\s*$//sgm;
-	$s =~ s/\s+\z//s;
-
-	if ($s ne '') {
-		# kill per-line trailing whitespace
-		$s =~ s/[ \t]+$//sgm;
-		$s .= "\n" unless $s =~ /\n\z/s;
-	}
-	$fh->write($s);
-}
-
-sub enc_for {
-	my ($ct, $default) = @_;
-	$default ||= $enc_utf8;
-	defined $ct or return $default;
-	my $ct_parsed = parse_content_type($ct);
-	if ($ct_parsed) {
-		if (my $charset = $ct_parsed->{attributes}->{charset}) {
-			my $enc = find_encoding($charset);
-			return $enc if $enc;
+	my $sres = $ctx->{srch}->get_thread($mid, { asc => 1 });
+	my $msgs = load_results($sres);
+	my $nr = $sres->{total};
+	return missing_thread($ctx) if $nr == 0;
+	my $skel = '<hr /><pre>';
+	$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
+	$skel .= ", back to <a\nhref=\"../../\">index</a>";
+	$skel .= "\n<a\nid=t>$nr+ messages in thread:</a> (download: ";
+	$skel .= "<a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
+	$skel .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>)\n";
+	$ctx->{-upfx} = '../../';
+	$ctx->{cur_level} = 0;
+	$ctx->{dst} = \$skel;
+	$ctx->{prev_attr} = '';
+	$ctx->{prev_level} = 0;
+	$ctx->{root_anchor} = anchor_for($mid);
+	$ctx->{seen} = {};
+	$ctx->{mapping} = {};
+	$ctx->{s_nr} = "$nr+ messages in thread";
+
+	my $th = thread_results($msgs);
+	walk_thread($th, $ctx, *pre_thread);
+	$skel .= '</pre>';
+	return stream_thread($th, $ctx) unless $ctx->{flat};
+
+	# flat display: lazy load the full message from mini_mime:
+	my $inbox = $ctx->{-inbox};
+	my $mime;
+	while ($mime = shift @$msgs) {
+		$mime = $inbox->msg_by_mid(mid_clean(mid_mime($mime))) and last;
+	}
+	return missing_thread($ctx) unless $mime;
+	$mime = Email::MIME->new($mime);
+	$ctx->{-title_html} = ascii_html($mime->header('Subject'));
+	$ctx->{-html_tip} = '<pre>'.index_entry($mime, $ctx, scalar @$msgs);
+	$mime = undef;
+	my $body = PublicInbox::WwwStream->new($ctx, sub {
+		return unless $msgs;
+		while ($mime = shift @$msgs) {
+			$mid = mid_clean(mid_mime($mime));
+			$mime = $inbox->msg_by_mid($mid) and last;
 		}
-	}
-	$default;
+		if ($mime) {
+			$mime = Email::MIME->new($mime);
+			return index_entry($mime, $ctx, scalar @$msgs);
+		}
+		$msgs = undef;
+		'</pre>'.$skel;
+	});
+	[ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub multipart_text_as_html {
-	my ($mime, $full_pfx, $srch) = @_;
+	my ($mime, $upfx) = @_;
 	my $rv = "";
-	my $part_nr = 0;
-	my $enc = enc_for($mime->header("Content-Type"));
 
 	# scan through all parts, looking for displayable text
-	$mime->walk_parts(sub {
-		my ($part) = @_;
-		$rv .= add_text_body($enc, $part, \$part_nr, $full_pfx, 1);
+	msg_iter($mime, sub {
+		my ($p) = @_;
+		$rv .= add_text_body($upfx, $p);
 	});
-	$mime->body_set('');
 	$rv;
 }
 
-sub add_filename_line {
-	my ($enc, $fn) = @_;
-	my $len = 72;
-	my $pad = "-";
-	$fn = $enc->decode($fn);
-	$len -= length($fn);
-	$pad x= ($len/2) if ($len > 0);
-	"$pad " . ascii_html($fn) . " $pad\n";
-}
-
-my $LINK_RE = qr!\b((?:ftp|https?|nntp)://
-		 [\@:\w\.-]+/
-		 ?[\@\w\+\&\?\.\%\;/#=-]*)!x;
-
-sub linkify_1 {
-	my ($link_map, $s) = @_;
-	$s =~ s!$LINK_RE!
-		my $url = $1;
-		# salt this, as this could be exploited to show
-		# links in the HTML which don't show up in the raw mail.
-		my $key = sha1_hex($url . $SALT);
-		$link_map->{$key} = $url;
-		'PI-LINK-'. $key;
-	!ge;
-	$s;
-}
-
-sub linkify_2 {
-	my ($link_map, $s) = @_;
-
-	# Added "PI-LINK-" prefix to avoid false-positives on git commits
-	$s =~ s!\bPI-LINK-([a-f0-9]{40})\b!
-		my $key = $1;
-		my $url = $link_map->{$key};
-		if (defined $url) {
-			$url = ascii_html($url);
-			"<a\nhref=\"$url\">$url</a>";
-		} else {
-			# false positive or somebody tried to mess with us
-			$key;
-		}
-	!ge;
-	$s;
-}
-
 sub flush_quote {
-	my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_;
-
-	if ($full_pfx) {
-		if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) {
-			# show quote inline
-			my %l;
-			my $rv = join('', map { linkify_1(\%l, $_) } @$quot);
-			@$quot = ();
-			$rv = ascii_html($rv);
-			return linkify_2(\%l, $rv);
-		}
-
-		# show a short snippet of quoted text and link to full version:
-		@$quot = map { s/^(?:>\s*)+//gm; $_ } @$quot;
-		my $cur = join(' ', @$quot);
-		@$quot = split(/\s+/, $cur);
-		$cur = '';
-		do {
-			my $tmp = shift(@$quot);
-			my $len = length($tmp) + length($cur);
-			if ($len > MAX_TRUNC_LEN) {
-				@$quot = ();
-			} else {
-				$cur .= $tmp . ' ';
-			}
-		} while (@$quot && length($cur) < MAX_TRUNC_LEN);
-		@$quot = ();
-		$cur =~ s/ \z/ .../s;
-		$cur = ascii_html($cur);
-		my $nr = ++$$n;
-		"&gt; [<a\nhref=\"$full_pfx#q${part_nr}_$nr\">$cur</a>]\n";
+	my ($s, $l, $quot) = @_;
+
+	# show everything in the full version with anchor from
+	# short version (see above)
+	my $rv = $l->linkify_1(join('', @$quot));
+	@$quot = ();
+
+	# we use a <span> here to allow users to specify their own
+	# color for quoted text
+	$rv = $l->linkify_2(ascii_html($rv));
+	$$s .= qq(<span\nclass="q">) . $rv . '</span>'
+}
+
+sub attach_link ($$$$) {
+	my ($upfx, $ct, $p, $fn) = @_;
+	my ($part, $depth, @idx) = @$p;
+	my $nl = $idx[-1] > 1 ? "\n" : '';
+	my $idx = join('.', @idx);
+	my $size = bytes::length($part->body);
+	$ct ||= 'text/plain';
+	$ct =~ s/;.*//; # no attributes
+	$ct = ascii_html($ct);
+	my $desc = $part->header('Content-Description');
+	$desc = $fn unless defined $desc;
+	$desc = '' unless defined $desc;
+	my $sfn;
+	if (defined $fn && $fn =~ /\A[[:alnum:]][\w\.-]+[[:alnum:]]\z/) {
+		$sfn = $fn;
+	} elsif ($ct eq 'text/plain') {
+		$sfn = 'a.txt';
 	} else {
-		# show everything in the full version with anchor from
-		# short version (see above)
-		my %l;
-		my $rv .= join('', map { linkify_1(\%l, $_) } @$quot);
-		@$quot = ();
-		$rv = ascii_html($rv);
-		return linkify_2(\%l, $rv) unless $do_anchor;
-		my $nr = ++$$n;
-		"<a\nid=q${part_nr}_$nr></a>" . linkify_2(\%l, $rv);
+		$sfn = 'a.bin';
 	}
+	my @ret = qq($nl<a\nhref="$upfx$idx-$sfn">[-- Attachment #$idx: );
+	my $ts = "Type: $ct, Size: $size bytes";
+	push(@ret, ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]");
+	join('', @ret, "</a>\n");
 }
 
 sub add_text_body {
-	my ($enc_msg, $part, $part_nr, $full_pfx, $do_anchor) = @_;
-	return '' if $part->subparts;
-
+	my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
+	my ($part, $depth, @idx) = @$p;
 	my $ct = $part->content_type;
-	# account for filter bugs...
+	my $fn = $part->filename;
+
 	if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
-		$part->body_set('');
-		return '';
-	}
-	my $enc = enc_for($ct, $enc_msg);
-	my $n = 0;
-	my $nr = 0;
-	my $s = $part->body;
-	$part->body_set('');
-	$s = $enc->decode($s);
+		return attach_link($upfx, $ct, $p, $fn);
+	}
+
+	my $s = eval { $part->body_str };
+
+	# badly-encoded message? tell the world about it!
+	return attach_link($upfx, $ct, $p, $fn) if $@;
+
 	my @lines = split(/^/m, $s);
 	$s = '';
-
-	if ($$part_nr > 0) {
-		my $fn = $part->filename;
-		defined($fn) or $fn = "part #" . ($$part_nr + 1);
-		$s .= add_filename_line($enc, $fn);
+	if (defined($fn) || $depth > 0) {
+		$s .= attach_link($upfx, $ct, $p, $fn);
+		$s .= "\n";
 	}
-
 	my @quot;
+	my $l = PublicInbox::Linkify->new;
 	while (defined(my $cur = shift @lines)) {
 		if ($cur !~ /^>/) {
 			# show the previously buffered quote inline
-			if (scalar @quot) {
-				$s .= flush_quote(\@quot, \$n, $$part_nr,
-						  $full_pfx, 0, $do_anchor);
-			}
+			flush_quote(\$s, $l, \@quot) if @quot;
 
 			# regular line, OK
-			my %l;
-			$cur = linkify_1(\%l, $cur);
+			$cur = $l->linkify_1($cur);
 			$cur = ascii_html($cur);
-			$s .= linkify_2(\%l, $cur);
+			$s .= $l->linkify_2($cur);
 		} else {
 			push @quot, $cur;
 		}
 	}
-	if (scalar @quot) {
-		$s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1,
-				  $do_anchor);
+
+	my $end = "\n";
+	if (@quot) {
+		$end = '';
+		flush_quote(\$s, $l, \@quot);
 	}
-	$s .= "\n" unless $s =~ /\n\z/s;
-	++$$part_nr;
-	$s;
+	$s =~ s/[ \t]+$//sgm; # kill per-line trailing whitespace
+	$s =~ s/\A\n+//s; # kill leading blank lines
+	$s =~ s/\s+\z//s; # kill all trailing spaces
+	$s .= $end;
 }
 
-sub headers_to_html_header {
-	my ($mime, $full_pfx, $ctx) = @_;
+sub _msg_html_prepare {
+	my ($hdr, $ctx) = @_;
 	my $srch = $ctx->{srch} if $ctx;
-	my $rv = "";
+	my $atom = '';
+	my $rv = "<pre\nid=b>"; # anchor for body start
+
+	if ($srch) {
+		$ctx->{-upfx} = '../';
+	}
 	my @title;
-	my $header_obj = $mime->header_obj;
-	my $mid = $header_obj->header('Message-ID');
+	my $mid = $hdr->header_raw('Message-ID');
 	$mid = PublicInbox::Hval->new_msgid($mid);
 	foreach my $h (qw(From To Cc Subject Date)) {
-		my $v = $header_obj->header($h);
+		my $v = $hdr->header($h);
 		defined($v) && ($v ne '') or next;
-		$v = PublicInbox::Hval->new_oneline($v);
+		$v = PublicInbox::Hval->new($v);
 
 		if ($h eq 'From') {
-			my @from = Email::Address->parse($v->raw);
-			$title[1] = ascii_html($from[0]->name);
+			my @n = PublicInbox::Address::names($v->raw);
+			$title[1] = ascii_html(join(', ', @n));
 		} elsif ($h eq 'Subject') {
 			$title[0] = $v->as_html;
 			if ($srch) {
-				my $p = $full_pfx ? '' : '../';
-				$rv .= "$h: <a\nid=\"t\"\nhref=\"${p}t/#u\">";
+				$rv .= qq($h: <a\nhref="#r"\nid=t>);
 				$rv .= $v->as_html . "</a>\n";
 				next;
 			}
 		}
-		$rv .= "$h: " . $v->as_html . "\n";
+		$v = $v->as_html;
+		$v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To');
+		$rv .= "$h: $v\n";
 
 	}
+	$title[0] ||= '(no subject)';
+	$ctx->{-title_html} = join(' - ', @title);
 	$rv .= 'Message-ID: &lt;' . $mid->as_html . '&gt; ';
-	my $upfx = $full_pfx ? '' : '../';
-	$rv .= "(<a\nhref=\"${upfx}raw\">raw</a>)\n";
-	my $atom;
-	if ($srch) {
-		if ($header_obj->header('In-Reply-To') ||
-		    $header_obj->header('References')) {
-			$rv .= "<a\nhref=\"${upfx}t/#u\">" .
-				"References: [expand]</a>\n";
-		}
-
-		$atom = qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
-			qq!href="${upfx}t.atom"\ntype="application/atom+xml"/>!;
-	} else {
-		$rv .= _parent_headers_nosrch($header_obj);
-		$atom = '';
-	}
+	$rv .= "(<a\nhref=\"raw\">raw</a>)\n";
+	$rv .= _parent_headers($hdr, $srch);
 	$rv .= "\n";
-
-	("<html><head><title>".  join(' - ', @title) .
-	 "</title>$atom</head><body>" . PublicInbox::Hval::PRE . $rv);
 }
 
-sub thread_inline {
-	my ($dst, $ctx, $cur, $full_pfx) = @_;
+sub thread_skel {
+	my ($dst, $ctx, $hdr, $tpfx) = @_;
 	my $srch = $ctx->{srch};
-	my $mid = mid_clean($cur->header('Message-ID'));
-	my $res = $srch->get_thread($mid);
-	my $nr = $res->{total};
-	my $upfx = $full_pfx ? '' : '../';
-	my $expand = "(<a\nhref=\"${upfx}t/#u\">expand</a> " .
-			"/ <a\nhref=\"${upfx}t.mbox.gz\">mbox.gz</a>)";
-
+	my $mid = mid_clean($hdr->header_raw('Message-ID'));
+	my $sres = $srch->get_thread($mid);
+	my $nr = $sres->{total};
+	my $expand = qq(<a\nhref="${tpfx}T/#u">expand</a> ) .
+			qq(/ <a\nhref="${tpfx}t.mbox.gz">mbox.gz</a> ) .
+			qq(/ <a\nhref="${tpfx}t.atom">Atom feed</a>);
+
+	my $parent = in_reply_to($hdr);
 	if ($nr <= 1) {
-		$$dst .= "\n[no followups, yet] $expand\n";
-		return (undef, in_reply_to($cur));
+		if (defined $parent) {
+			$$dst .= "($expand)\n ";
+			$$dst .= ghost_parent("$tpfx../", $parent) . "\n";
+		} else {
+			$$dst .= "[no followups, yet] ($expand)\n";
+		}
+		$ctx->{next_msg} = undef;
+		$ctx->{parent_msg} = $parent;
+		return;
 	}
 
-	$$dst .= "\n\n~$nr messages in thread: $expand\n";
+	$$dst .= "$nr+ messages in thread ($expand";
+	$$dst .= qq! / <a\nhref="#b">[top]</a>)\n!;
 
-	my $subj = $srch->subject_path($cur->header('Subject'));
-	my $parent = in_reply_to($cur);
-	my $state = {
-		seen => { $subj => 1 },
-		srch => $srch,
-		cur => $mid,
-		parent_cmp => defined $parent ? $parent : '',
-		parent => $parent,
-		prev_attr => '',
-		prev_level => 0,
-	};
-	for (thread_results(load_results($res))->rootset) {
-		inline_dump($dst, $state, $upfx, $_, 0);
-	}
-	($state->{next_msg}, $state->{parent});
+	my $subj = $srch->subject_path($hdr->header('Subject'));
+	$ctx->{seen} = { $subj => 1 };
+	$ctx->{cur} = $mid;
+	$ctx->{prev_attr} = '';
+	$ctx->{prev_level} = 0;
+	$ctx->{dst} = $dst;
+	walk_thread(thread_results(load_results($sres)), $ctx, *skel_dump);
+	$ctx->{parent_msg} = $parent;
 }
 
-sub _parent_headers_nosrch {
-	my ($header_obj) = @_;
+sub _parent_headers {
+	my ($hdr, $srch) = @_;
 	my $rv = '';
 
-	my $irt = in_reply_to($header_obj);
+	my $irt = in_reply_to($hdr);
 	if (defined $irt) {
 		my $v = PublicInbox::Hval->new_msgid($irt, 1);
 		my $html = $v->as_html;
@@ -507,7 +545,11 @@ sub _parent_headers_nosrch {
 		$rv .= "<a\nhref=\"../$href/\">$html</a>&gt;\n";
 	}
 
-	my $refs = $header_obj->header('References');
+	# do not display References: if search is present,
+	# we show the thread skeleton at the bottom, instead.
+	return $rv if $srch;
+
+	my $refs = $hdr->header_raw('References');
 	if ($refs) {
 		# avoid redundant URLs wasting bandwidth
 		my %seen;
@@ -521,68 +563,88 @@ sub _parent_headers_nosrch {
 		}
 
 		if (@refs) {
-			$rv .= 'References: '. join(' ', @refs) . "\n";
+			$rv .= 'References: '. join("\n\t", @refs) . "\n";
 		}
 	}
 	$rv;
 }
 
-sub html_footer {
-	my ($mime, $standalone, $full_pfx, $ctx) = @_;
+sub squote_maybe ($) {
+	my ($val) = @_;
+	if ($val =~ m{([^\w@\./,\%\+\-])}) {
+		$val =~ s/(['!])/'\\$1'/g; # '!' for csh
+		return "'$val'";
+	}
+	$val;
+}
+
+sub mailto_arg_link {
+	my ($hdr) = @_;
 	my %cc; # everyone else
 	my $to; # this is the From address
 
 	foreach my $h (qw(From To Cc)) {
-		my $v = $mime->header($h);
+		my $v = $hdr->header($h);
 		defined($v) && ($v ne '') or next;
-		my @addrs = Email::Address->parse($v);
-		foreach my $recip (@addrs) {
-			my $address = $recip->address;
+		my @addrs = PublicInbox::Address::emails($v);
+		foreach my $address (@addrs) {
 			my $dst = lc($address);
 			$cc{$dst} ||= $address;
 			$to ||= $dst;
 		}
 	}
-	Email::Address->purge_cache if $standalone;
+	my @arg;
 
-	my $subj = $mime->header('Subject') || '';
+	my $subj = $hdr->header('Subject') || '';
 	$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
-	my $mid = $mime->header('Message-ID');
+	my $mid = $hdr->header_raw('Message-ID');
+	push @arg, '--in-reply-to='.ascii_html(squote_maybe(mid_clean($mid)));
 	my $irt = uri_escape_utf8($mid);
 	delete $cc{$to};
+	push @arg, '--to=' . ascii_html($to);
 	$to = uri_escape_utf8($to);
 	$subj = uri_escape_utf8($subj);
-
-	my $cc = uri_escape_utf8(join(',', sort values %cc));
+	my $cc = join(',', sort values %cc);
+	push @arg, '--cc=' . ascii_html($cc);
+	$cc = uri_escape_utf8($cc);
 	my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
 	$href =~ s/%20/+/g;
 
+	(\@arg, ascii_html($href));
+}
+
+sub html_footer {
+	my ($hdr, $standalone, $ctx, $rhref) = @_;
+
 	my $srch = $ctx->{srch} if $ctx;
-	my $upfx = $full_pfx ? '../' : '../../';
+	my $upfx = '../';
+	my $tpfx = '';
 	my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
-
-	if ($srch && $standalone) {
-		$idx .= qq{ / follow: <a\nhref="t.atom">Atom feed</a>};
-	}
+	my $irt = '';
 	if ($idx && $srch) {
-		my ($next, $p) = thread_inline(\$idx, $ctx, $mime, $full_pfx);
-		if (defined $p) {
-			$p = PublicInbox::Hval->new_oneline($p);
+		$idx .= "\n";
+		thread_skel(\$idx, $ctx, $hdr, $tpfx);
+		my $p = $ctx->{parent_msg};
+		my $next = $ctx->{next_msg};
+		if ($p) {
+			$p = PublicInbox::Hval->new_msgid($p);
 			$p = $p->as_href;
-			$irt = "<a\nhref=\"$upfx$p/\">parent</a> ";
+			$irt = "<a\nhref=\"$upfx$p/\"\nrel=prev>parent</a> ";
 		} else {
 			$irt = ' ' x length('parent ');
 		}
 		if ($next) {
-			$irt .= "<a\nhref=\"$upfx$next/\">next</a> ";
+			my $n = PublicInbox::Hval->new_msgid($next)->as_href;
+			$irt .= "<a\nhref=\"$upfx$n/\"\nrel=next>next</a> ";
 		} else {
-			$irt .= '     ';
+			$irt .= ' ' x length('next ');
 		}
 	} else {
 		$irt = '';
 	}
-
-	"$irt<a\nhref=\"" . ascii_html($href) . '">reply</a>' . $idx;
+	$rhref ||= '#R';
+	$irt .= qq(<a\nhref="$rhref">reply</a>);
+	$irt .= $idx;
 }
 
 sub linkify_ref_nosrch {
@@ -594,29 +656,7 @@ sub linkify_ref_nosrch {
 
 sub anchor_for {
 	my ($msgid) = @_;
-	my $id = $msgid;
-	if ($id !~ /\A[a-f0-9]{40}\z/) {
-		$id = id_compress(mid_clean($id), 1);
-	}
-	'm' . $id;
-}
-
-sub thread_html_head {
-	my ($cb, $header, $state) = @_;
-	$$cb = $$cb->([200, ['Content-Type'=> 'text/html; charset=UTF-8']]);
-
-	my $s = PublicInbox::Hval->new_oneline($header->header('Subject'));
-	$s = $s->as_html;
-	$$cb->write("<html><head><title>$s</title>".
-		qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
-		qq!href="../t.atom"\ntype="application/atom+xml"/>! .
-		"</head><body>");
-}
-
-sub pre_anchor_entry {
-	my ($seen, $mime) = @_;
-	my $id = anchor_for($mime->header('Message-ID'));
-	$seen->{$id} = "#$id"; # save the anchor for children, later
+	'm' . id_compress($msgid, 1);
 }
 
 sub ghost_parent {
@@ -630,168 +670,136 @@ sub ghost_parent {
 	qq{[parent not found: &lt;<a\nhref="$upfx$href/">$html</a>&gt;]};
 }
 
-sub ghost_table {
-	my ($upfx, $mid, $level) = @_;
-	"<table\nsummary=ghost><tr><td>" .
-		(INDENT x $level) . "</td><td>" .
-		PublicInbox::Hval::PRE . ghost_parent($upfx, $mid) .
-		'</pre></td></table>';
-}
-
-sub __thread_entry {
-	my ($cb, $git, $state, $mime, $level) = @_;
-
-	# lazy load the full message from mini_mime:
-	$mime = eval {
-		my $path = mid2path(mid_clean($mime->header('Message-ID')));
-		Email::MIME->new($git->cat_file('HEAD:'.$path));
-	} or return;
-
-	if ($state->{anchor_idx} == 0) {
-		thread_html_head($cb, $mime, $state);
-	}
-
-	if (my $ghost = delete $state->{ghost}) {
-		# n.b. ghost messages may only be parents, not children
-		foreach my $g (@$ghost) {
-			$$cb->write(ghost_table('../../', @$g));
-		}
-	}
-	index_entry($$cb, $mime, $level, $state);
-	1;
-}
-
-sub __ghost_entry {
-	my ($state, $node, $level) = @_;
-	my $ghost = $state->{ghost} ||= [];
-	push @$ghost, [ $node->messageid, $level ];
-}
-
-sub thread_entry {
-	my ($cb, $git, $state, $node, $level) = @_;
-	return unless $node;
-	if (my $mime = $node->message) {
-		unless (__thread_entry($cb, $git, $state, $mime, $level)) {
-			__ghost_entry($state, $node, $level);
-		}
-	} else {
-		__ghost_entry($state, $node, $level);
-	}
-
-	thread_entry($cb, $git, $state, $node->child, $level + 1);
-	thread_entry($cb, $git, $state, $node->next, $level);
+sub indent_for {
+	my ($level) = @_;
+	INDENT x ($level - 1);
 }
 
 sub load_results {
-	my ($res) = @_;
+	my ($sres) = @_;
 
-	[ map { $_->mini_mime } @{delete $res->{msgs}} ];
+	[ map { $_->mini_mime } @{delete $sres->{msgs}} ];
 }
 
 sub msg_timestamp {
-	my ($mime) = @_;
-	my $ts = eval { str2time($mime->header('Date')) };
+	my ($hdr) = @_;
+	my $ts = eval { str2time($hdr->header('Date')) };
 	defined($ts) ? $ts : 0;
 }
 
 sub thread_results {
-	my ($msgs, $nosubject) = @_;
+	my ($msgs) = @_;
 	require PublicInbox::Thread;
 	my $th = PublicInbox::Thread->new(@$msgs);
-	no warnings 'once';
-	$Mail::Thread::nosubject = $nosubject;
 	$th->thread;
 	$th->order(*sort_ts);
 	$th
 }
 
 sub missing_thread {
-	my ($cb, $ctx) = @_;
+	my ($ctx) = @_;
 	require PublicInbox::ExtMsg;
-
-	$cb->(PublicInbox::ExtMsg::ext_msg($ctx))
+	PublicInbox::ExtMsg::ext_msg($ctx);
 }
 
 sub _msg_date {
-	my ($mime) = @_;
-	my $ts = $mime->header('X-PI-TS') || msg_timestamp($mime);
+	my ($hdr) = @_;
+	my $ts = $hdr->header('X-PI-TS') || msg_timestamp($hdr);
 	fmt_ts($ts);
 }
 
 sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
 
-sub _inline_header {
-	my ($dst, $state, $upfx, $mime, $level) = @_;
-	my $pfx = INDENT x ($level - 1);
-	my $dot = $level == 0 ? '' : '` ';
-
-	my $cur = $state->{cur};
-	my $mid = mid_clean($mime->header('Message-ID'));
-	my $f = $mime->header('X-PI-From');
-	my $d = _msg_date($mime);
-	$f = PublicInbox::Hval->new($f)->as_html;
-	$d = PublicInbox::Hval->new($d)->as_html;
-	my $attr = "$f @ $d";
-	$state->{first_level} ||= $level;
-	if ($attr ne $state->{prev_attr} || $state->{prev_level} > $level) {
-		$state->{prev_attr} = $attr;
-		$attr = ' - ' . $attr;
-		$attr .= ' UTC' if $level >= $state->{first_level};
+sub _skel_header {
+	my ($ctx, $hdr, $level) = @_;
+
+	my $dst = $ctx->{dst};
+	my $cur = $ctx->{cur};
+	my $mid = mid_clean($hdr->header_raw('Message-ID'));
+	my $f = ascii_html($hdr->header('X-PI-From'));
+	my $d = _msg_date($hdr) . ' ' . indent_for($level) . th_pfx($level);
+	my $attr = $f;
+	$ctx->{first_level} ||= $level;
+
+	if ($attr ne $ctx->{prev_attr} || $ctx->{prev_level} > $level) {
+		$ctx->{prev_attr} = $attr;
 	} else {
 		$attr = '';
 	}
-	$state->{prev_level} = $level;
+	$ctx->{prev_level} = $level;
 
 	if ($cur) {
 		if ($cur eq $mid) {
-			delete $state->{cur};
-			$$dst .= "$pfx$dot<b><a\nid=\"r\"\nhref=\"#t\">".
-				 "[this message]</a></b>$attr\n";
-
+			delete $ctx->{cur};
+			$$dst .= $d;
+			$$dst .= "<b><a\nid=r\nhref=\"#t\">".
+				 "$attr [this message]</a></b>\n";
 			return;
 		}
 	} else {
-		$state->{next_msg} ||= $mid;
+		$ctx->{next_msg} ||= $mid;
 	}
 
 	# Subject is never undef, this mail was loaded from
 	# our Xapian which would've resulted in '' if it were
 	# really missing (and Filter rejects empty subjects)
-	my $s = $mime->header('Subject');
-	my $h = $state->{srch}->subject_path($s);
-	if ($state->{seen}->{$h}) {
+	my $s = $hdr->header('Subject');
+	my $h = $ctx->{srch}->subject_path($s);
+	if ($ctx->{seen}->{$h}) {
 		$s = undef;
 	} else {
-		$state->{seen}->{$h} = 1;
+		$ctx->{seen}->{$h} = 1;
 		$s = PublicInbox::Hval->new($s);
 		$s = $s->as_html;
 	}
 	my $m = PublicInbox::Hval->new_msgid($mid);
-	$m = $upfx . '../' . $m->as_href . '/';
-	if (defined $s) {
-		$$dst .= "$pfx$dot<a\nhref=\"$m\">$s</a>$attr\n";
+	my $id = '';
+	my $mapping = $ctx->{mapping};
+	my $end = defined($s) ? "$s</a> $f\n" : "$f</a>\n";
+	if ($mapping) {
+		my $map = $mapping->{$mid};
+		$id = id_compress($mid, 1);
+		$m = '#m'.$id;
+		$map->[1] = "$d<a\nhref=\"$m\">$end";
+		$id = "\nid=r".$id;
 	} else {
-		$$dst .= "$pfx$dot<a\nhref=\"$m\">$f @ $d</a>\n";
+		$m = $ctx->{-upfx}.$m->as_href.'/';
 	}
+	$$dst .=  $d . "<a\nhref=\"$m\"$id>" . $end;
 }
 
-sub inline_dump {
-	my ($dst, $state, $upfx, $node, $level) = @_;
-	return unless $node;
+sub skel_dump {
+	my ($ctx, $level, $node) = @_;
 	if (my $mime = $node->message) {
-		my $mid = mid_clean($mime->header('Message-ID'));
-		if ($mid eq $state->{parent_cmp}) {
-			$state->{parent} = $mid;
-		}
-		_inline_header($dst, $state, $upfx, $mime, $level);
+		_skel_header($ctx, $mime->header_obj, $level);
 	} else {
-		my $dot = $level == 0 ? '' : '` ';
-		my $pfx = (INDENT x $level) . $dot;
-		$$dst .= $pfx;
-		$$dst .= ghost_parent("$upfx../", $node->messageid) . "\n";
+		my $mid = $node->messageid;
+		my $dst = $ctx->{dst};
+		my $mapping = $ctx->{mapping};
+		my $map = $mapping->{$mid} if $mapping;
+		if ($mid eq 'subject dummy') {
+			my $ncp = "\t[no common parent]\n";
+			$map->[1] = $ncp if $map;
+			$$dst .= $ncp;
+			return;
+		}
+		my $d = $ctx->{pct} ? '    [irrelevant] ' # search result
+				    : '     [not found] ';
+		$d .= indent_for($level) . th_pfx($level);
+		my $upfx = $ctx->{-upfx};
+		my $m = PublicInbox::Hval->new_msgid($mid);
+		my $href = $upfx . $m->as_href . '/';
+		my $html = $m->as_html;
+
+		if ($map) {
+			my $id = id_compress($mid, 1);
+			$map->[1] = $d . qq{&lt;<a\nhref=#r$id>$html</a>&gt;\n};
+			$d .= qq{&lt;<a\nhref="$href"\nid=r$id>$html</a>&gt;\n};
+		} else {
+			$d .= qq{&lt;<a\nhref="$href">$html</a>&gt;\n};
+		}
+		$$dst .= $d;
 	}
-	inline_dump($dst, $state, $upfx, $node->child, $level+1);
-	inline_dump($dst, $state, $upfx, $node->next, $level);
 }
 
 sub sort_ts {
@@ -801,119 +809,139 @@ sub sort_ts {
 	} @_;
 }
 
-sub rsort_ts {
-	sort {
-		(eval { $b->topmost->message->header('X-PI-TS') } || 0) <=>
-		(eval { $a->topmost->message->header('X-PI-TS') } || 0)
-	} @_;
+sub _tryload_ghost ($$) {
+	my ($srch, $mid) = @_;
+	my $smsg = $srch->lookup_mail($mid) or return;
+	$smsg->mini_mime;
 }
 
 # accumulate recent topics if search is supported
 # returns 1 if done, undef if not
 sub add_topic {
-	my ($state, $node, $level) = @_;
-	return unless $node;
-	my $child_adjust = 1;
-
-	if (my $x = $node->message) {
+	my ($ctx, $level, $node) = @_;
+	my $srch = $ctx->{srch};
+	my $mid = $node->messageid;
+	my $x = $node->message || _tryload_ghost($srch, $mid);
+	my ($subj, $ts);
+	if ($x) {
 		$x = $x->header_obj;
-		my ($topic, $subj);
-
 		$subj = $x->header('Subject');
-		$subj = $state->{srch}->subject_normalized($subj);
-		$topic = $subj;
-
-		# kill "[PATCH v2]" etc. for summarization
-		unless ($level == 0) {
-			$topic =~ s/\A\s*\[[^\]]+\]\s*//g;
-		}
-
-		if (++$state->{subjs}->{$topic} == 1) {
-			push @{$state->{order}}, [ $level, $subj, $topic ];
-		}
-
-		my $mid = mid_clean($x->header('Message-ID'));
-
-		my $ts = $x->header('X-PI-TS');
-		my $exist = $state->{latest}->{$topic};
-		if (!$exist || $exist->[1] < $ts) {
-			$state->{latest}->{$topic} = [ $mid, $ts ];
-		}
-	} else {
-		# ghost message, do not bump level
-		$child_adjust = 0;
+		$subj = $srch->subject_normalized($subj);
+		$ts = $x->header('X-PI-TS');
+	} else { # ghost message, do not bump level
+		$ts = -666;
+		$subj = "<$mid>";
+	}
+	if (++$ctx->{subjs}->{$subj} == 1) {
+		push @{$ctx->{order}}, [ $level, $subj ];
+	}
+	my $exist = $ctx->{latest}->{$subj};
+	if (!$exist || $exist->[1] < $ts) {
+		$ctx->{latest}->{$subj} = [ $mid, $ts ];
 	}
-
-	add_topic($state, $node->child, $level + $child_adjust);
-	add_topic($state, $node->next, $level);
 }
 
-sub dump_topics {
-	my ($state) = @_;
-	my $order = $state->{order};
-	my $subjs = $state->{subjs};
-	my $latest = $state->{latest};
-	return "\n[No recent topics]</pre>" unless (scalar @$order);
-	my $dst = '';
+sub emit_topics {
+	my ($ctx) = @_;
+	my $order = $ctx->{order};
+	my $subjs = $ctx->{subjs};
+	my $latest = $ctx->{latest};
+	my $fh = $ctx->{fh};
+	return $fh->write("\n[No topics in range]</pre>") unless scalar @$order;
 	my $pfx;
 	my $prev = 0;
 	my $prev_attr = '';
+	my $cur;
+	my @recent;
 	while (defined(my $info = shift @$order)) {
-		my ($level, $subj, $topic) = @$info;
-		my $n = delete $subjs->{$topic};
-		my ($mid, $ts) = @{delete $latest->{$topic}};
-		$mid = PublicInbox::Hval->new($mid)->as_href;
-		$subj = PublicInbox::Hval->new($subj)->as_html;
-		$pfx = INDENT x ($level - 1);
+		my ($level, $subj) = @$info;
+		my $n = delete $subjs->{$subj};
+		my ($mid, $ts) = @{delete $latest->{$subj}};
+		$mid = PublicInbox::Hval->new_msgid($mid)->as_href;
+		$pfx = indent_for($level);
 		my $nl = $level == $prev ? "\n" : '';
-		my $dot = $level == 0 ? '' : '` ';
-		$dst .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
+		if ($nl && $cur) {
+			push @recent, $cur;
+			$cur = undef;
+		}
+		$cur ||= [ $ts, '' ];
+		$cur->[0] = $ts if $ts > $cur->[0];
+		$cur->[1] .= $nl . $pfx . th_pfx($level);
+		if ($ts == -666) { # ghost
+			$cur->[1] .= ghost_parent('', $mid) . "\n";
+			next; # child will have mbox / atom link
+		}
 
-		my $attr;
+		$subj = PublicInbox::Hval->new($subj)->as_html;
+		$cur->[1] .= "<a\nhref=\"$mid/T/#u\"><b>$subj</b></a>\n";
 		$ts = fmt_ts($ts);
-		if ($n == 1) {
-			$attr = "@ $ts UTC";
-			$n = "";
-		} else {
-			# $n isn't the total number of posts on the topic,
-			# just the number of posts in the current results
-			# window, so leave it unlabeled
-			$attr = "@ $ts UTC";
-			$n = " ($n)";
-		}
+		my $attr = " $ts UTC";
+
+		# $n isn't the total number of posts on the topic,
+		# just the number of posts in the current results window
+		$n = $n == 1 ? '' : " ($n+ messages)";
+
 		if ($level == 0 || $attr ne $prev_attr) {
-			my $mbox = qq(<a\n$MBOX_TITLE\n) .
-				   qq(href="$mid/t.mbox.gz">mbox.gz</a>);
+			my $mbox = qq(<a\nhref="$mid/t.mbox.gz">mbox.gz</a>);
 			my $atom = qq(<a\nhref="$mid/t.atom">Atom</a>);
 			$pfx .= INDENT if $level > 0;
-			$dst .= $pfx . $attr . $n . " - $mbox / $atom\n";
+			$cur->[1] .= $pfx . $attr . $n . " - $mbox / $atom\n";
 			$prev_attr = $attr;
 		}
 	}
-	$dst .= '</pre>';
+	push @recent, $cur if $cur;
+	@recent = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @recent;
+	$fh->write(join('', @recent) . '</pre>');
 }
 
 sub emit_index_topics {
-	my ($state, $fh) = @_;
-	my $off = $state->{ctx}->{cgi}->param('o');
-	$off = 0 unless defined $off;
-	$state->{order} = [];
-	$state->{subjs} = {};
-	$state->{latest} = {};
+	my ($ctx) = @_;
+	my ($off) = (($ctx->{cgi}->param('o') || '0') =~ /(\d+)/);
+	$ctx->{order} = [];
+	$ctx->{subjs} = {};
+	$ctx->{latest} = {};
 	my $max = 25;
-	my %opts = ( offset => int $off, limit => $max * 4 );
-	while (scalar @{$state->{order}} < $max) {
-		my $res = $state->{srch}->query('', \%opts);
-		my $nr = scalar @{$res->{msgs}} or last;
-
-		for (rsort_ts(thread_results(load_results($res), 1)->rootset)) {
-			add_topic($state, $_, 0);
-		}
+	my %opts = ( offset => $off, limit => $max * 4 );
+	while (scalar @{$ctx->{order}} < $max) {
+		my $sres = $ctx->{srch}->query('', \%opts);
+		my $nr = scalar @{$sres->{msgs}} or last;
+		$sres = load_results($sres);
+		walk_thread(thread_results($sres), $ctx, *add_topic);
 		$opts{offset} += $nr;
 	}
 
-	$fh->write(dump_topics($state));
+	emit_topics($ctx);
 	$opts{offset};
 }
 
+sub thread_adj_level {
+	my ($ctx, $level) = @_;
+
+	my $max = $ctx->{cur_level};
+	if ($level <= 0) {
+		return ('', '') if $max == 0; # flat output
+
+		# reset existing lists
+		my $beg = $max > 1 ? ('</ul></li>' x ($max - 1)) : '';
+		$ctx->{cur_level} = 0;
+		("$beg</ul>", '');
+	} elsif ($level == $max) { # continue existing list
+		qw(<li> </li>);
+	} elsif ($level < $max) {
+		my $beg = $max > 1 ? ('</ul></li>' x ($max - $level)) : '';
+		$ctx->{cur_level} = $level;
+		("$beg<li>", '</li>');
+	} else { # ($level > $max) # start a new level
+		$ctx->{cur_level} = $level;
+		my $beg = ($max ? '<li>' : '') . '<ul><li>';
+		($beg, '</li>');
+	}
+}
+
+sub ghost_index_entry {
+	my ($ctx, $level, $mid) = @_;
+	my ($beg, $end) = thread_adj_level($ctx,  $level);
+	$beg . '<pre>'. ghost_parent($ctx->{-upfx}, $mid) . '</pre>' . $end;
+}
+
 1;