diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap
index 3d184aec..e4405e07 100644
--- a/src/sampleconf/mimemap
+++ b/src/sampleconf/mimemap
@@ -30,6 +30,8 @@
 .php = text/html
 .ics = text/calendar
 
+.eml = message/rfc822
+
 .pdf = application/pdf
 
 .ps = application/postscript
diff --git a/src/sampleconf/mimeview b/src/sampleconf/mimeview
index d421e06b..6934f17e 100644
--- a/src/sampleconf/mimeview
+++ b/src/sampleconf/mimeview
@@ -72,9 +72,12 @@ image/bmp = gwenview %f
 image/x-ms-bmp = gwenview %f
 image/x-xpmi = gwenview %f
 
-# Or firefox -remote "openFile(%u)"
+message/rfc822 = thunderbird -file %f
+text/x-mail = thunderbird -file %f
+
 application/x-tex = emacsclient  %f
 text/x-tex = emacsclient  %f
+# Or firefox -remote "openFile(%u)"
 text/html = firefox %u
 text/html|gnuinfo = rclshowinfo %F %(title)
 text/plain = emacsclient  %f