This is version 6 of this patch set -- the previous version is at id:1455475199-32622-1-git-send-email-markwalters1009@gmail.com The end result should be exactly the same as the previous series but the tests should now pass at all intermediate points. To achieve this I moved the part of the code allowing the new reply to code to say "don't display buttons", before the new reply code change (patch 4), and merged the one test fix needed with that main change. Best wishes Mark David Edmondson (6): emacs/show: Re-arrange determination if a part header is necessary emacs/show: Make the insertion of part headers overridable. 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/mua: Let user specify which parts get a header in citations. 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