Threading broken when In-Reply-To: header content escaped

[nabijaczleweli]

Expected Behaviour

Messages to be threaded correctly, even if escaped by a remote.

Actual Behaviour

They appeared unrelated.

Steps to Reproduce

1. Open mbox.broken
2. Notice that these two are not threaded together
   
3. Notice that the headers appear to be correct
   
4. Manually unescape the In-Reply-To: header, creating mbox.ok:

diff --git a/mbox.broken b/mbox.ok
index e767404..daa4158 100755
--- a/mbox.broken
+++ b/mbox.ok
@@ -23,10 +23,8 @@ index 0000000..f971561
 
 From nobody Tue May  5 22:27:45 2020
 Message-Id: <42254f08a01207fcbb4ecca7f6b2915f8dcd6c61.1588717517.git.nabijaczleweli@gmail.com>
-In-Reply-To: =?utf-8?q?=3Cf90fcb94abf016741cbd83c8422a6d3c8e1ff664=2E1588717?=
- =?utf-8?q?517=2Egit=2Enabijaczleweli=40gmail=2Ecom=3E?=
-References: =?utf-8?q?=3Cf90fcb94abf016741cbd83c8422a6d3c8e1ff664=2E15887175?=
- =?utf-8?q?17=2Egit=2Enabijaczleweli=40gmail=2Ecom=3E?=
+In-Reply-To: <f90fcb94abf016741cbd83c8422a6d3c8e1ff664.1588717517.git.nabijaczleweli@gmail.com>
+References: <f90fcb94abf016741cbd83c8422a6d3c8e1ff664.1588717517.git.nabijaczleweli@gmail.com>
 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@gmail.com>
 Date: Wed, 6 May 2020 00:13:22 +0200
 Subject: [PATCH 2/2] Demonstrate that I can use git send-email (but in a 

5. Open mbox.ok, see they're threaded now:
   
6. And the displayed headers are identical:
   

How often does this happen?

• On a particular email:
  mbox.broken.gz
  mbox.ok.gz

Got these back from a list at https://lists.sr.ht, the mails in my Sent Mail folder are equivalent to mbox.ok.

When did it start to happen?

dunno

NeoMutt Version

Tried with 20200320 and 20200501:

nabijaczleweli@tarta:~/uwu/email-test-drive$ neomutt -v
NeoMutt 20200320
Copyright (C) 1996-2016 Michael R. Elkins and others.
NeoMutt comes with ABSOLUTELY NO WARRANTY; for details type 'neomutt -vv'.
NeoMutt is free software, and you are welcome to redistribute it
under certain conditions; type 'neomutt -vv' for details.

System: Linux 4.19.0-8-amd64 (x86_64)
ncurses: ncurses 6.1.20181013 (compiled with 6.1.20181013)
libidn: 1.33 (compiled with 1.33)
GPGME: 1.12.0
GnuTLS: 3.6.7
libnotmuch: 5.2.0
hcache backends: tokyocabinet
hcache compression: zlib, zstd

Configure options: --build=x86_64-linux-gnu --prefix=/usr {--includedir=${prefix}/include} {--mandir=${prefix}/share/man} {--infodir=${prefix}/share/info} --sysconfdir=/etc --localstatedir=/var --disable-silent-rules {--libdir=${prefix}/lib/x86_64-linux-gnu} {--libexecdir=${prefix}/lib/x86_64-linux-gnu} --disable-maintainer-mode --disable-dependency-tracking --mandir=/usr/share/man --libexecdir=/usr/libexec --with-mailpath=/var/mail --gpgme --lua --notmuch --with-ui --gnutls --gss --idn --mixmaster --sasl --tokyocabinet --zlib --zstd

Compilation CFLAGS: -g -O2 -fdebug-prefix-map=/home/nabijaczleweli/backports/build-output/neomutt-20200320+dfsg.1=. -fstack-protector-strong -Wformat -Werror=format-security -std=c99 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__ -I/usr/include -I/usr/include/lua5.3 -DNCURSES_WIDECHAR -isystem /usr/include/mit-krb5

Default options:
  +attach_headers_color +compose_to_sender +compress +cond_date +debug
  +encrypt_to_self +forgotten_attachments +forwref +ifdef +imap +index_color
  +initials +limit_current_thread +multiple_fcc +nested_if +new_mail +nntp +pop
  +progress +quasi_delete +regcomp +reply_with_xorig +sensible_browser +sidebar
  +skip_quoted +smtp +status_color +timeout +tls_sni +trash

Compile options:
  -autocrypt +bkgdset +color +curs_set +fcntl -flock -fmemopen +futimens
  +getaddrinfo +gnutls +gpgme +gss +hcache -homespool +idn +inotify
  -locales_hack +lua -lz4 +meta +mixmaster +nls +notmuch -openssl +pgp +sasl
  +smime -sqlite +start_color +sun_attachment +typeahead +zlib +zstd
MAILPATH="/var/mail"
MIXMASTER="mixmaster"
PKGDATADIR="/usr/share/neomutt"
SENDMAIL="/usr/sbin/sendmail"
SYSCONFDIR="/etc"

To learn more about NeoMutt, visit: https://neomutt.org
If you find a bug in NeoMutt, please raise an issue at:
    https://github.com/neomutt/neomutt/issues
or send an email to: <neomutt-devel@neomutt.org>

nabijaczleweli@tarta:~/uwu/neomutt-test/build-output/bin$ ./usr/bin/neomutt -v
NeoMutt 20200501
Copyright (C) 1996-2016 Michael R. Elkins and others.
NeoMutt comes with ABSOLUTELY NO WARRANTY; for details type 'neomutt -vv'.
NeoMutt is free software, and you are welcome to redistribute it
under certain conditions; type 'neomutt -vv' for details.

System: Linux 4.19.0-8-amd64 (x86_64)
ncurses: ncurses 6.1.20181013 (compiled with 6.1.20181013)
libidn: 1.33 (compiled with 1.33)
GPGME: 1.12.0
GnuTLS: 3.6.7
libnotmuch: 5.2.0
storage: tokyocabinet
compression: zlib, zstd

Configure options: --build=x86_64-linux-gnu --prefix=/usr {--includedir=${prefix}/include} {--mandir=${prefix}/share/man} {--infodir=${prefix}/share/info} --sysconfdir=/etc --localstatedir=/var --disable-silent-rules {--libdir=${prefix}/lib/x86_64-linux-gnu} {--libexecdir=${prefix}/lib/x86_64-linux-gnu} --disable-maintainer-mode --disable-dependency-tracking --mandir=/usr/share/man --libexecdir=/usr/libexec --with-mailpath=/var/mail --gpgme --lua --notmuch --with-ui --gnutls --gss --idn --mixmaster --sasl --tokyocabinet --zlib --zstd --testing

Compilation CFLAGS: -g -O2 -fdebug-prefix-map=/home/nabijaczleweli/uwu/neomutt-test/build-output/neomutt-20200501+dfsg.1=. -fstack-protector-strong -Wformat -Werror=format-security -std=c99 -D_ALL_SOURCE=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__ -I/usr/include -I/usr/include/lua5.3 -DNCURSES_WIDECHAR -isystem /usr/include/mit-krb5

Default options:
  +attach_headers_color +compose_to_sender +compress +cond_date +debug
  +encrypt_to_self +forgotten_attachments +forwref +ifdef +imap +index_color
  +initials +limit_current_thread +multiple_fcc +nested_if +new_mail +nntp +pop
  +progress +quasi_delete +regcomp +reply_with_xorig +sensible_browser +sidebar
  +skip_quoted +smtp +status_color +timeout +tls_sni +trash

Compile options:
  -autocrypt +bkgdset +color +curs_set +fcntl -flock -fmemopen +futimens
  +getaddrinfo +gnutls +gpgme +gss +hcache -homespool +idn +inotify
  -locales_hack +lua -lz4 +meta +mixmaster +nls +notmuch -openssl +pgp +regex
  +sasl +smime -sqlite +start_color +sun_attachment +typeahead +zlib +zstd
MAILPATH="/var/mail"
MIXMASTER="mixmaster"
PKGDATADIR="/usr/share/neomutt"
SENDMAIL="/usr/sbin/sendmail"
SYSCONFDIR="/etc"

To learn more about NeoMutt, visit: https://neomutt.org
If you find a bug in NeoMutt, please raise an issue at:
    https://github.com/neomutt/neomutt/issues
or send an email to: <neomutt-devel@neomutt.org>

Extra Info

• Tried on maildir, uploading the broken ones to my GMail mangled them again to a version with non-broken headers.

[gahr]

Nice - I'll take care of this

[nabijaczleweli]

Works for me as well. Thanks!