X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-reply.c;h=929f3077862f93e6f8c2b213f9d064369cc42fc9;hb=d57da17fcd30a5cbe191ccd42906e489dd2bd6a3;hp=430c466c013e2cf511b6ce9fc8f201e4a93b81f9;hpb=4ce7591610444a1c5ef6f56b57af8e180437fa62;p=notmuch

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 430c466c..929f3077 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -667,7 +667,7 @@ static int do_reply(notmuch_config_t *config,
 
 	    /* Start the original */
 	    sp->map_key (sp, "original");
-	    format_part_sprinter (config, sp, node, TRUE, TRUE, FALSE);
+	    format_part_sprinter (config, sp, node, TRUE, FALSE);
 
 	    /* End */
 	    sp->end (sp);
@@ -740,7 +740,9 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[])
 	return EXIT_FAILURE;
     }
 
+#if (GMIME_MAJOR_VERSION < 3)
     params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config);
+#endif
 
     if (notmuch_database_open (notmuch_config_get_database_path (config),
 			       NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))