diff --git a/.local/bin/emacs-mail b/.local/bin/emacs-mail
new file mode 100755
index 00000000..a942f58c
--- /dev/null
+++ b/.local/bin/emacs-mail
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+emacsclient -c --eval "(browse-url-mail \"$@\")"
diff --git a/.local/share/applications/emacs-mail.desktop b/.local/share/applications/emacs-mail.desktop
new file mode 100644
index 00000000..3938266b
--- /dev/null
+++ b/.local/share/applications/emacs-mail.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Emacs Mail
+Comment=E-Mail client
+Exec=emacs-mail %u
+MimeType=x-scheme-handler/mailto;
+Type=Application
diff --git a/.xprofile b/.xprofile
index 5e84b548..fa9d01e9 100644
--- a/.xprofile
+++ b/.xprofile
@@ -19,6 +19,7 @@ text/html=$BROWSER.desktop
 application/pdf=zathura.desktop
 x-scheme-handler/http=$BROWSER.desktop
 x-scheme-handler/https=$BROWSER.desktop
+x-scheme-handler/mailto=emacs-mail.desktop
 EOF
 
 ## X resources for xterm.