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);
/* 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");