X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-reply.c;h=472a002ec2136c02a588598782c1da98ee3d8b16;hb=6cdab6e0b77041791f70345ac729d63d865bae5e;hp=e151f78a79a406b695da6cf7feeca7917facbc2a;hpb=f0dfda5c7797f9db81ce35d270fe0ac406c7fca1;p=obsolete%2Fnotmuch-old

diff --git a/notmuch-reply.c b/notmuch-reply.c
index e151f78a..472a002e 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -34,6 +34,10 @@ show_reply_headers (GMimeMessage *message)
 	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
 	stream_filter = g_mime_stream_filter_new(stream_stdout);
 	if (stream_filter) {
+		// g_mime_object_write_to_stream will produce
+		// RFC2047-encoded headers, but we want to present the
+		// user with decoded headers and let whatever
+		// ultimately sends the mail do the RFC2047 encoding.
 		g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
 					 g_mime_filter_headers_new());
 		g_mime_object_write_to_stream(GMIME_OBJECT(message), stream_filter);
@@ -533,9 +537,12 @@ create_reply_message(void *ctx,
 			      "In-Reply-To", in_reply_to);
 
     orig_references = notmuch_message_get_header (message, "references");
+    if (!orig_references)
+	/* Treat errors like missing References headers. */
+	orig_references = "";
     references = talloc_asprintf (ctx, "%s%s%s",
-				  orig_references ? orig_references : "",
-				  orig_references ? " " : "",
+				  *orig_references ? orig_references : "",
+				  *orig_references ? " " : "",
 				  in_reply_to);
     g_mime_object_set_header (GMIME_OBJECT (reply),
 			      "References", references);