cli/show: emit headers after emitting body

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index c6a7a10a270f4650a354611dd465efe94682f6e9..0816a5e1b8c786fdb70b0bc29d796c60403084a7 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -619,9 +619,6 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
        sp->begin_map (sp);
        format_message_sprinter (sp, node->envelope_file);
 
-       sp->map_key (sp, "headers");
-       format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false);
-
        if (output_body) {
            sp->map_key (sp, "body");
            sp->begin_list (sp);
@@ -657,6 +654,9 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
            sp->end (sp);
        }
 
+       sp->map_key (sp, "headers");
+       format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false);
+
        sp->end (sp);
        return;
     }