This is a very slightly modified version of id:1465599772-10297-1-git-send-email-markwalters1009@gmail.com in response to bremner's review The diff in the final result is below (the changes internally are slightly bigger). Best wishes Mark diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index db75d0d..1218c01 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -158,10 +158,7 @@ This is taken from the function message-do-fcc." (message-encode-message-body) (save-restriction (message-narrow-to-headers) - (let ((mail-parse-charset message-default-charset) - (rfc2047-header-encoding-alist - (cons '("Newsgroups" . default) - rfc2047-header-encoding-alist))) + (let ((mail-parse-charset message-default-charset)) (mail-encode-encoded-word-buffer))) (goto-char (point-min)) (when (re-search-forward Mark Walters (6): emacs: notmuch-check-exit-status bugfix emacs: maildir-fcc: prepare for use of notmuch insert emacs: maildir import message-do-fcc emacs: simplify our local copy of message-do-fcc Modify our local copy of message-do-fcc emacs: maildir: add the actual insert code emacs/notmuch-lib.el | 10 ++- emacs/notmuch-maildir-fcc.el | 189 +++++++++++++++++++++++++++++++++++++------ emacs/notmuch-mua.el | 10 +-- test/test-lib.el | 5 ++ 4 files changed, 182 insertions(+), 32 deletions(-) -- 2.1.4