append _unused to the expression defined using unused() macro

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 7f284229e38c02ff56e1c23433723b9470d8d9ab..46bab4344f7464f57f603040c13608e1a14459a9 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -591,7 +591,7 @@ create_reply_message(void *ctx,
                                 from_addr);
     g_mime_object_set_header (GMIME_OBJECT (reply), "From", from_addr, NULL);
 
-    subject = notmuch_message_get_header (message, "subject");
+    subject = g_mime_message_get_subject (mime_message);
     if (subject) {
        if (strncasecmp (subject, "Re:", 3))
            subject = talloc_asprintf (ctx, "Re: %s", subject);
@@ -663,7 +663,9 @@ static int do_reply(notmuch_config_t *config,
 
            /* The headers of the reply message we've created */
            sp->map_key (sp, "reply-headers");
-           format_headers_sprinter (sp, reply, true);
+           /* FIXME: send msg_crypto here to avoid killing the
+            * subject line on reply to encrypted messages! */
+           format_headers_sprinter (sp, reply, true, NULL);
 
            /* Start the original */
            sp->map_key (sp, "original");