This is a slight update and a rebase of this patch set (previous version at id:1446894276-7814-1-git-send-email-markwalters1009@gmail.com ) The only change from last time (apart from fixing rebasing to master) is the rewording of couple of minor comments inline with dme's review of the previous version. Although I am submitting it is primarily dme's series, with minor updates from me. One particular motivation for this series is that it fixes a long standing bug we have that replying to a message with an rfc822 part completely omits that part. It also fixes the bug whereby we don't include application/octet-stream parts which are actually text/plain (and thus are displayed in show mode). This series makes the reply code use the same code as the show code so everything works as expected: the reply buffer looks essentially the same as the show buffer. There is one slight difference: the user might want different part headers displayed when replying; both because the audience is different (a non-notmuch using recipient) and because the buttons don't "work" (you can't click on them to show or view a part). Dme and I disagree on which of these we would like to see so make that customisable. The key change is patch 3 which switches how reply works. Also note that patch 2 is almost all whitespace change as the changes modify the indentation. Best wishes Mark David Edmondson (6): emacs/show: Re-arrange determination if a part header is necessary emacs/show: Accommodate the lack of part header buttons emacs/mua: Generate improved cited text for replies emacs/show: Remove the 'no-buttons option of `notmuch-show-insert-bodypart' emacs/show: Make the insertion of part headers overridable. emacs/mua: Let user specify which parts get a header in citations. Mark Walters (1): test: fix the tests for the new reply code emacs/notmuch-mua.el | 60 ++++++++++----------- emacs/notmuch-show.el | 144 +++++++++++++++++++++++++++++++------------------- test/T310-emacs.sh | 32 +++++++++++ test/test-lib.el | 4 ++ 4 files changed, 156 insertions(+), 84 deletions(-) -- 2.1.4