diff --git a/NEWS.org b/NEWS.org
index 67ba5327..80522672 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -29,9 +29,6 @@
     - The ~--xbatchsize~ and ~--autoupgrade~ options for indexing are gone now; both
       are determined implicitly now.
 
-    - There is a new sub-command ~mfind~, which works just like ~find~, but uses
-      some mu4e-defaults ~--skip-dups~ and ~--include-related~.
-
 *** mu4e
 
     - In many cases, ~mu4e~ used to receive /all/ contacts after each indexing
@@ -53,6 +50,9 @@
       But it's available now for testing. Note that this requires the gnus-based
       viewer, ie ~(setq mu4e-view-use-gnus t)~
 
+    - In addition, he added support for custom headers, so the ones for for the
+      non-gnus-view should work just as well.
+
     - Pierre Neidhardt contributed an "Account Setup Helper" which wraps the
       existing context setup with some niceties for accounts. See the manual for
       details.
diff --git a/man/Makefile.am b/man/Makefile.am
index c5ce281a..e0556000 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -34,14 +34,4 @@ dist_man_MANS =		\
 	mu-script.1	\
 	mu-verify.1     \
 	mu-view.1	\
-	mu.1		\
-	$(BUILT_SOURCES)
-
-BUILT_SOURCES=		\
-	mu-mfind.1
-
-mu-mfind.1: mu-find.1
-	cp -f $< $@
-
-CLEANFILES=		\
-	$(BUILT_SOURCES)
+	mu.1
diff --git a/mu/mu-config.c b/mu/mu-config.c
index 793f7ced..b90744e0 100644
--- a/mu/mu-config.c
+++ b/mu/mu-config.c
@@ -222,13 +222,6 @@ set_group_find_defaults (void)
 			get_output_format (MU_CONFIG.formatstr);
 
 	expand_dir (MU_CONFIG.linksdir);
-
-	if (MU_CONFIG.cmd == MU_CONFIG_CMD_MFIND) {
-		/* 'mfind' --> find with mu4e defaults */
-		MU_CONFIG.include_related = TRUE;
-		MU_CONFIG.skip_dups	  = TRUE;
-		MU_CONFIG.cmd		  = MU_CONFIG_CMD_FIND;
-	}
 }
 
 static GOptionGroup*
@@ -492,7 +485,6 @@ cmd_from_string (const char *str)
 		{ "index",   MU_CONFIG_CMD_INDEX   },
                 { "info",    MU_CONFIG_CMD_INFO    },
                 { "init",    MU_CONFIG_CMD_INIT    },
-		{ "mfind",   MU_CONFIG_CMD_MFIND   },
 		{ "mkdir",   MU_CONFIG_CMD_MKDIR   },
 		{ "remove",  MU_CONFIG_CMD_REMOVE  },
 		{ "script",  MU_CONFIG_CMD_SCRIPT  },
@@ -566,7 +558,6 @@ get_option_group (MuConfigCmd cmd)
 	case MU_CONFIG_CMD_EXTRACT:
 		return config_options_group_extract();
 	case MU_CONFIG_CMD_FIND:
-	case MU_CONFIG_CMD_MFIND:
 		return config_options_group_find();
 	case MU_CONFIG_CMD_INDEX:
 		return config_options_group_index();
diff --git a/mu/mu-config.h b/mu/mu-config.h
index a62e30ab..1d1bec00 100644
--- a/mu/mu-config.h
+++ b/mu/mu-config.h
@@ -71,7 +71,6 @@ typedef enum {
 	MU_CONFIG_CMD_INDEX,
         MU_CONFIG_CMD_INFO,
         MU_CONFIG_CMD_INIT,
-	MU_CONFIG_CMD_MFIND,
 	MU_CONFIG_CMD_MKDIR,
 	MU_CONFIG_CMD_REMOVE,
 	MU_CONFIG_CMD_SCRIPT,