diff --git a/ChangeLog b/ChangeLog
index 6af9f81d8..6ea9b615c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-25  Pavel Roskin  <proski@gnu.org>
+
+	* lib/mc.ext.in: Match both "mail" and "Mail", but only if they
+	are in the beginning of the "file" output.
+
 2001-05-23  Pavel Roskin  <proski@gnu.org>
 
 	* lib/mc.ext.in: Add associations for viewing RPM files.
diff --git a/lib/mc.ext.in b/lib/mc.ext.in
index a744c3dc1..d61986986 100644
--- a/lib/mc.ext.in
+++ b/lib/mc.ext.in
@@ -377,7 +377,7 @@ shell/^RMAIL$
 	Start Emacs on this RMAIL file=emacs %f
 	Open=emacs %f
 
-type/mail
+type/^(M|m)ail
 	Open=elm -f %f
 	View=%view{ascii} mcmfmt < %f