diff --git a/guile/mu-guile-message.c b/guile/mu-guile-message.c
index 9fdea389..c6684dd9 100644
--- a/guile/mu-guile-message.c
+++ b/guile/mu-guile-message.c
@@ -308,7 +308,7 @@ each_part (MuMsg *msg, MuMsgPart *part, AttInfo *attinfo)
 	if (!part->type)
 		return;
 	if (attinfo->attachments_only &&
-	    !mu_msg_part_looks_like_attachment (part, TRUE))
+	    !mu_msg_part_maybe_attachment (part))
 		return;
 
 	mime_type = g_strdup_printf ("%s/%s", part->type, part->subtype);
diff --git a/lib/mu-msg-sexp.c b/lib/mu-msg-sexp.c
index 4894fbd8..383c1990 100644
--- a/lib/mu-msg-sexp.c
+++ b/lib/mu-msg-sexp.c
@@ -333,7 +333,7 @@ each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo)
 		 elvis (part->subtype, "octet-stream"),
 		 tmpfile ? " :temp" : "", tmpfile ? tmpfile : "",
 		 parttype,
-		 mu_msg_part_looks_like_attachment (part, TRUE) ? "t" : "nil",
+		 mu_msg_part_maybe_attachment (part) ? "t" : "nil",
 		 (int)part->size,
 		 sig_verdict (part->sig_infos));
 
diff --git a/mu/mu-cmd-extract.c b/mu/mu-cmd-extract.c
index 638a9e21..fc2b2958 100644
--- a/mu/mu-cmd-extract.c
+++ b/mu/mu-cmd-extract.c
@@ -185,7 +185,7 @@ ignore_part (MuMsg *msg, MuMsgPart *part, SaveData *sd)
 
 	/* filter out non-attachments? */
 	if (!sd->opts->save_all &&
-	    !(mu_msg_part_looks_like_attachment (part, TRUE)))
+	    !(mu_msg_part_maybe_attachment (part)))
 		return TRUE;
 
 	return FALSE;
diff --git a/mu/mu-cmd-server.c b/mu/mu-cmd-server.c
index b8751343..13ccae4b 100644
--- a/mu/mu-cmd-server.c
+++ b/mu/mu-cmd-server.c
@@ -417,7 +417,7 @@ each_part (MuMsg *msg, MuMsgPart *part, GSList **attlist)
 	GError *err;
 
 	/* exclude things that don't look like proper attachments */
-	if (!mu_msg_part_looks_like_attachment(part, FALSE))
+	if (!mu_msg_part_maybe_attachment(part))
 		return;
 
 	err	  = NULL;
diff --git a/mu/mu-cmd.c b/mu/mu-cmd.c
index 83c0570d..389f7bb8 100644
--- a/mu/mu-cmd.c
+++ b/mu/mu-cmd.c
@@ -65,7 +65,7 @@ each_part (MuMsg *msg, MuMsgPart *part, gchar **attach)
 {
 	char *fname, *tmp;
 
-	if (!mu_msg_part_looks_like_attachment (part, TRUE))
+	if (!mu_msg_part_maybe_attachment (part))
 		return;
 
 	fname = mu_msg_part_get_filename (part, FALSE);
diff --git a/toys/mug/mu-msg-attach-view.c b/toys/mug/mu-msg-attach-view.c
index 050ad7e5..3368d700 100644
--- a/toys/mug/mu-msg-attach-view.c
+++ b/toys/mug/mu-msg-attach-view.c
@@ -208,7 +208,6 @@ mu_msg_attach_view_init (MuMsgAttachView *obj)
 						GDK_ACTION_COPY);
 	gtk_drag_source_add_uri_targets(GTK_WIDGET(obj));
 	g_signal_connect (obj, "drag-data-get", G_CALLBACK(on_drag_data_get), NULL);
-
 }
 
 
@@ -241,7 +240,7 @@ each_part (MuMsg *msg, MuMsgPart *part, CBData *cbdata)
 	GdkPixbuf *pixbuf;
 	char ctype[128];
 
-	if (!mu_msg_part_looks_like_attachment(part, FALSE))
+	if (!mu_msg_part_maybe_attachment(part))
 		return;
 
 	if (!part->type || !part->subtype)