This one expands on [1] to use GMimeMessage more. There are some less than perfect intermediate steps in order to split the stuff into reasonable sized patches, but it gets better in the end. There's still more to do, but I ran out of steam a bit (thus RFC), and it's better to get the first series merged first anyway. This should fix the issue Daniel saw [2], but I haven't really tested that, as there are no dedicated tests for it. Daniel, care to try this on the problematic message? Reindexing is not needed. BR, Jani. [1] id:cover.1466284726.git.jani@nikula.org [2] id:87d1ngv95p.fsf@alice.fifthhorseman.net Jani Nikula (6): cli/reply: use dedicated functions for reply to mapping cli/reply: check for NULL list first in scan_address_list() cli/reply: return internet address list from get header funcs cli/reply: pass internet address list to munge detect cli/reply: pass gmime message to munge detection cli/reply: only pass gmime message to add recipients to reply message notmuch-reply.c | 171 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 81 deletions(-) -- 2.1.4