diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index 8141af98..5e91543b 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -128,6 +128,11 @@ see `mu4e-headers-visible-lines' and
 view buffer."
   :group 'mu4e-view)
 
+(defcustom mu4e-confirm-quit t
+  "Whether to confirm to quit mu4e."
+  :type 'boolean
+  :group 'mu4e)
+
 ;; crypto
 (defgroup mu4e-crypto nil
   "Crypto-related settings."
diff --git a/mu4e/mu4e.el b/mu4e/mu4e.el
index 5be2adcd..3f72c999 100644
--- a/mu4e/mu4e.el
+++ b/mu4e/mu4e.el
@@ -82,8 +82,10 @@
 (defun mu4e-quit()
   "Quit the mu4e session."
   (interactive)
-  (when (y-or-n-p (mu4e-format "Are you sure you want to quit?"))
-    (mu4e~stop)))
+  (if mu4e-confirm-quit
+	  (when (y-or-n-p (mu4e-format "Are you sure you want to quit?"))
+		(mu4e~stop))
+	(mu4e~stop)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/mu4e/org-mu4e.el b/mu4e/org-mu4e.el
index c5a970eb..23b845de 100644
--- a/mu4e/org-mu4e.el
+++ b/mu4e/org-mu4e.el
@@ -65,7 +65,7 @@
 	      desc link)
 	(org-store-link-props :type "mu4e" :query query)
 	(setq
-	  desc (org-make-link "mu4e:query:" query)
+	  desc (concat "mu4e:query:" query)
 	  link desc)
 	(org-add-link-props :link link :description desc)
 	link))
@@ -76,7 +76,7 @@
 	     link)
        (org-store-link-props :type "mu4e" :link link
 			     :message-id msgid)
-       (setq link (org-make-link "mu4e:msgid:" msgid))
+       (setq link (concat "mu4e:msgid:" msgid))
        (org-add-link-props :link link
 			   :description (funcall org-mu4e-link-desc-func msg))
        link))))