diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 62d2f4da..7cc94abc 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -482,6 +482,7 @@ Ie. either 'name <email>' or 'email')."
 ;; mu4e-compose-func and mu4e-send-func are wrappers so we can set ourselves
 ;; as default emacs mailer (define-mail-user-agent etc.)
 
+;;;###autoload
 (defun mu4e~compose-mail (&optional to subject other-headers continue
 			   switch-function yank-action send-actions return-action)
   "This is mu4e's implementation of `compose-mail'."
@@ -515,6 +516,7 @@ Ie. either 'name <email>' or 'email')."
       (message-goto-body))))
 
 ;; happily, we can re-use most things from message mode
+;;;###autoload
 (define-mail-user-agent 'mu4e-user-agent
   'mu4e~compose-mail
   'message-send-and-exit
@@ -547,3 +549,7 @@ Ie. either 'name <email>' or 'email')."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (provide 'mu4e-compose)
+
+;; Load mu4e completely even when this file was loaded through
+;; autoload.
+(require 'mu4e)
diff --git a/mu4e/mu4e.el b/mu4e/mu4e.el
index b2a66916..4ee708a0 100644
--- a/mu4e/mu4e.el
+++ b/mu4e/mu4e.el
@@ -71,6 +71,7 @@
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;###autoload
 (defun mu4e ()
   "Start mu4e."
   (interactive)