diff --git a/notmuch-reply.c b/notmuch-reply.c
index 8c5e76cc..79599358 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -29,12 +29,12 @@ reply_part (GMimeObject *part,
 	    unused (int *part_count));
 
 static const notmuch_show_format_t format_reply = {
-    NULL,
-	NULL, NULL,
-	    NULL, NULL, NULL,
-	    NULL, reply_part, NULL, NULL, NULL,
-	NULL, NULL,
-    NULL
+    "",
+	"", NULL,
+	    "", NULL, "",
+	    "", reply_part, NULL, "", "",
+	"", "",
+    ""
 };
 
 static void
diff --git a/show-message.c b/show-message.c
index 2ec9eca9..32bb860f 100644
--- a/show-message.c
+++ b/show-message.c
@@ -46,7 +46,7 @@ show_message_part (GMimeObject *part,
     selected = (params->part <= 0 || state->part_count == params->part);
 
     if (selected || state->in_zone) {
-	if (!first && (params->part <= 0 || state->in_zone) && format->part_sep)
+	if (!first && (params->part <= 0 || state->in_zone))
 	    fputs (format->part_sep, stdout);
 
 	format->part (part, &(state->part_count));