diff --git a/lib/mu-index.c b/lib/mu-index.c
index 426644f2..9e81a4b1 100644
--- a/lib/mu-index.c
+++ b/lib/mu-index.c
@@ -1,7 +1,5 @@
-/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
-
 /*
-** Copyright (C) 2008-2013 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2008-2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify
 1** it under the terms of the GNU General Public License as published by
@@ -19,10 +17,7 @@
 **
 */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /*HAVE_CONFIG_H*/
-
 #include "mu-index.h"
 
 #include <stdlib.h>
diff --git a/lib/mu-index.h b/lib/mu-index.h
index df3919c2..cdb28d89 100644
--- a/lib/mu-index.h
+++ b/lib/mu-index.h
@@ -1,7 +1,5 @@
-/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
-
 /*
-** Copyright (C) 2008-2019 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2008-2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -150,8 +148,6 @@ MuError mu_index_stats (MuIndex *index, MuIndexStats *stats,
 			MuIndexMsgCallback msg_cb, MuIndexDirCallback dir_cb,
 			void *user_data);
 
-
-
 /**
  * callback function called for each message
  *
diff --git a/man/mu-index.1 b/man/mu-index.1
index a8a7a802..5760edcc 100644
--- a/man/mu-index.1
+++ b/man/mu-index.1
@@ -87,15 +87,6 @@ indexing only a part of messages (using \fB\-\-maildir\fR). For this reason,
 it is necessary to run \fBmu index \-\-rebuild\fR when there is an upgrade in
 the database format. \fBmu index\fR will issue a warning about this.
 
-.TP
-\fB\-\-max-msg-size\fR=\fI<max msg size>\fR
-set the maximum size (in bytes) for messages. The default maximum
-(currently at 500Mb) should be enough in most cases, but if you
-encounter warnings from \fBmu\fR about ignoring messsage because they
-are too big, you may want to increase this. Note that the reason for
-having a maximum size is that big messages require big memory
-allocations, which may lead to problems.
-
 .B NOTE:
 It is not recommended to mix maildirs and sub-maildirs within the hierarchy
 in the same database; for example, it's better not to index both with