view: use '+' instead of '%20' to escape spaces in mailto:

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 2cda691c99d42fb7ffefd51e76baa9ea1aeb6d80..07023e814516c40862ed32b0c2c86ebe7ba5f4db 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -117,7 +117,7 @@ sub index_entry {
        my $mhref = "${path}$href/";
 
        # show full message if it's our root message
-       if ($root_anchor ne $id) {
+       if ($root_anchor ne $id || ($level != 0 && !$ctx->{flat})) {
                $fhref = "${path}$href/f/";
                $more_ref = \$more;
        }
@@ -434,7 +434,12 @@ sub headers_to_html_header {
        $rv .= "(<a\nhref=\"${upfx}raw\">raw</a>)\n";
        my $atom;
        if ($srch) {
-               $rv .= "<a\nhref=\"${upfx}t/\">References: [expand]</a>\n";
+               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 {
@@ -540,6 +545,7 @@ sub html_footer {
 
        my $cc = uri_escape_utf8(join(',', sort values %cc));
        my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
+       $href =~ s/%20/+/g;
 
        my $srch = $ctx->{srch} if $ctx;
        my $upfx = $full_pfx ? '../' : '../../';