X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=f8d5f64716e2a47e39a2d6767f4e36eeab980d5a;hp=8f23cea23129108e7abf3985950f65bb43eed225;hb=482033f8f81b19228a7b74458f2b13ee3d6c1a17;hpb=fbe3c38655d4eaf0e263ec4cfa7e206174152748

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 8f23cea2..f8d5f647 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -546,8 +546,7 @@ notmuch_reply_format_default(void *ctx,
 		notmuch_message_get_header (message, "date"),
 		notmuch_message_get_header (message, "from"));
 
-	show_message_body (notmuch_message_get_filename (message),
-			   format, params);
+	show_message_body (message, format, params);
 
 	notmuch_message_destroy (message);
     }
@@ -628,6 +627,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     params.part = -1;
     params.cryptoctx = NULL;
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
 	if (strcmp (argv[i], "--") == 0) {
 	    i++;