According to the proposal of Jani and Tomi I have made a new patch version which adds a flag --message-headers to notmuch show. This is a preliminary commit just to get general comments. No doc updates here. Also there are probably a few style issues. And I guess I should use talloc instead of malloc. /Johan