X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=f8d5f64716e2a47e39a2d6767f4e36eeab980d5a;hp=c500862d36000428284adcec942513911c170e34;hb=ada246aa20c2f9b1e225bc50865e208d03296fc0;hpb=c75410fd81878ccb9f3fa3878507e5650de5fa3f

diff --git a/notmuch-reply.c b/notmuch-reply.c
index c500862d..f8d5f647 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -98,6 +98,11 @@ reply_part_content (GMimeObject *part)
     {
 	/* Output nothing, since multipart subparts will be handled individually. */
     }
+    else if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") ||
+	     g_mime_content_type_is_type (content_type, "application", "pgp-signature"))
+    {
+	/* Ignore PGP/MIME cruft parts */
+    }
     else if (g_mime_content_type_is_type (content_type, "text", "*") &&
 	!g_mime_content_type_is_type (content_type, "text", "html"))
     {
@@ -541,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);
     }
@@ -623,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++;