diff --git a/emacs/mu4e-compose.el b/emacs/mu4e-compose.el
index bbfc6900..e7f135e9 100644
--- a/emacs/mu4e-compose.el
+++ b/emacs/mu4e-compose.el
@@ -34,6 +34,7 @@
 (require 'message)
 (require 'mail-parse)
 (require 'smtpmail)
+(require 'rfc2368)
 
 (require 'mu4e-utils)
 (require 'mu4e-vars)
@@ -768,5 +769,22 @@ message."
   'message-kill-buffer
   'message-send-hook)
 
+(defun mu4e~compose-browse-url-mail (url &optional ignored)
+  "Adapter for `browse-url-mailto-function."
+  (let* ((headers (rfc2368-parse-mailto-url url))
+	  (to (cdr (assoc "To" headers)))
+	  (subject (cdr (assoc "Subject" headers)))
+	  (body (cdr (assoc "Body" headers))))
+    (mu4e~compose-mail to subject)
+    (if body
+      (progn
+	(message-goto-body)
+	(insert body)
+	(if (not to)
+	  (message-goto-to)
+	  (if (not subject)
+	    (message-goto-subject)
+	    (message-goto-body)))))))
+ 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (provide 'mu4e-compose)
diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el
index 5c5a0244..9dbc41e9 100644
--- a/emacs/mu4e-view.el
+++ b/emacs/mu4e-view.el
@@ -36,6 +36,7 @@
 ;; we prefer the improved fill-region
 (require 'filladapt nil 'noerror)
 (require 'comint)
+(require 'browse-url)
 
 (eval-when-compile (byte-compile-disable-warning 'cl-functions))
 (require 'cl)
@@ -98,6 +99,11 @@ buffer."
   if you're using an emacs with Imagemagick support."
   :group 'mu4e-view)
 
+
+(defvar mu4e-view-browse-url-mailto-function
+  'mu4e~compose-browse-url-mail
+  "Function to use for mailto: links.")
+ 
 (defvar mu4e-view-actions
   '( ("capture message" . mu4e-action-capture-message)
      ("view as pdf"     . mu4e-action-view-as-pdf))
@@ -135,10 +141,16 @@ where:
   "A map of some number->url so we can jump to url by number.")
 
 (defconst mu4e~view-url-regexp
-  "\\(https?://[-+a-zA-Z0-9.?_$%/+&#@!~,:;=/()]+\\)"
-  "Regexp that matches URLs; match-string 1 will contain
+  "\\(\\(https?\\://\\|mailto:\\)[-+a-zA-Z0-9.?_$%/+&#@!~,:;=/()]+\\)"
+  "Regexp that matches http:/https:/mailto: URLs; match-string 1
+  will contain the matched URL, if any.")
+
+(defconst mu4e~view-mailto-regexp
+  "\\("
+  "Regexp that matches mailto: URLs; match-string 1 will contain
   the matched URL, if any.")
 
+
 (defvar mu4e~view-attach-map nil
   "A mapping of user-visible attachment number to the actual part index.")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -522,6 +534,9 @@ is nil, and otherwise open it."
   (make-local-variable 'mu4e~view-lines-wrapped)
   (make-local-variable 'mu4e~view-cited-hidden)
 
+  (make-local-variable 'browse-url-mailto-function)
+  (setq browse-url-mailto-function mu4e-view-browse-url-mailto-function)
+
   (setq buffer-undo-list t) ;; don't record undo info
 
   ;; autopair mode gives error when pressing RET
@@ -585,7 +600,9 @@ Seen; if the message is not New/Unread, do nothing."
 	  (add-text-properties p (point-max) '(face mu4e-footer-face)))))))
 
 (defun mu4e~view-browse-url-func (url)
-  "Return a function that executes `browse-url' with URL."
+  "Return a function that executes `browse-url' with URL. What
+browser is called is depending on `browse-url-browser-function' and
+`browse-url-mailto-function'."
   (lexical-let ((url url))
     (lambda ()
       (interactive)
@@ -996,7 +1013,7 @@ user that unmarking only works in the header list."
 
 (defun mu4e-view-go-to-url (num)
   "Go to a numbered url."
-  (interactive "n[mu4e] Go to url with number: ")
+  (interactive "n[mu4e] Visit url with number: ")
   (let ((url (gethash num mu4e~view-link-map)))
     (unless url (error "Invalid number for URL"))
     (browse-url url)))