X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FReply.pm;fp=lib%2FPublicInbox%2FReply.pm;h=592dfb624f7a7091af7cdf4bd935d09624488d74;hb=930d2dc63e04c652e3b64cc7f3b3a7d377637065;hp=d96fadfc8b3bfc8eec1c8400218a88fa4280f77b;hpb=68b53c88891129928183c30fd416bb8bc82a87e7;p=public-inbox.git
diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index d96fadfc..592dfb62 100644
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2014-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# For reply instructions and address generation in WWW UI
package PublicInbox::Reply;
use strict;
-use warnings;
+use v5.10.1;
use URI::Escape qw/uri_escape_utf8/;
use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
use PublicInbox::Address;
@@ -81,7 +81,6 @@ sub mailto_arg_link {
# no $subj for $href below
} else {
push @arg, "--to=$to";
- $to = uri_escape_utf8($to);
$subj = uri_escape_utf8($subj);
}
my @cc = sort values %$cc;
@@ -106,6 +105,10 @@ sub mailto_arg_link {
# anyways.
return (\@arg, '', $reply_to_all) if $obfs;
+ # keep `@' instead of using `%40' for RFC 6068
+ utf8::encode($to);
+ $to =~ s!([^A-Za-z0-9\-\._~\@])!$URI::Escape::escapes{$1}!ge;
+
# order matters, Subject is the least important header,
# so it is last in case it's lost/truncated in a copy+paste
my $href = "mailto:$to?In-Reply-To=$irt${cc}&Subject=$subj";