diff --git a/lib/mu-msg-part.c b/lib/mu-msg-part.c
index 5584f946..099274d2 100644
--- a/lib/mu-msg-part.c
+++ b/lib/mu-msg-part.c
@@ -59,6 +59,10 @@ get_mime_object_at_index (MuMsg *msg, MuMsgOptions opts, unsigned index)
 	ddata.mime_obj  = NULL;
 	ddata.index     = index;
 
+	/* wipe out some irrelevant options */
+	opts &= ~MU_MSG_OPTION_VERIFY;
+	opts &= ~MU_MSG_OPTION_EXTRACT_IMAGES;
+
 	mu_msg_part_foreach (msg, opts,
 			     (MuMsgPartForeachFunc)do_it_with_index,
 			     &ddata);
diff --git a/lib/mu-msg.c b/lib/mu-msg.c
index e478e2d9..976f3c91 100644
--- a/lib/mu-msg.c
+++ b/lib/mu-msg.c
@@ -473,6 +473,10 @@ get_body (MuMsg *self, MuMsgOptions opts, gboolean want_html)
 	bdata.want_html = want_html;
 	bdata.gstr	= g_string_sized_new (4096);
 
+	/* wipe out some irrelevant options */
+	opts &= ~MU_MSG_OPTION_VERIFY;
+	opts &= ~MU_MSG_OPTION_EXTRACT_IMAGES;
+
 	mu_msg_part_foreach (self, opts,
 			     (MuMsgPartForeachFunc)accumulate_body,
 			     &bdata);
@@ -522,6 +526,10 @@ get_content_type_parameters (MuMsg *self, MuMsgOptions opts, gboolean want_html)
 	cdata.want_html = want_html;
 	cdata.ctype	= NULL;
 
+	/* wipe out some irrelevant options */
+	opts &= ~MU_MSG_OPTION_VERIFY;
+	opts &= ~MU_MSG_OPTION_EXTRACT_IMAGES;
+
 	mu_msg_part_foreach (self, opts,
 			     (MuMsgPartForeachFunc)find_content_type,
 			     &cdata);