diff --git a/emacs/mu4e-compose.el b/emacs/mu4e-compose.el
index bb09f207..07d400eb 100644
--- a/emacs/mu4e-compose.el
+++ b/emacs/mu4e-compose.el
@@ -485,7 +485,8 @@ needed, set the Fcc header, and register the handler function."
     (setq default-directory (expand-file-name "~/"))
      
     ;; offer completion for e-mail addresses
-    (when mu4e-compose-complete-addresses
+    (when (and mu4e-compose-complete-addresses
+	    (boundp 'completion-at-point-functions))
       (mu4e~compose-setup-completion))
       
     ;; setup the fcc-stuff, if needed
diff --git a/emacs/mu4e.texi b/emacs/mu4e.texi
index 18315f96..be26af75 100644
--- a/emacs/mu4e.texi
+++ b/emacs/mu4e.texi
@@ -976,7 +976,8 @@ configuration:
 Since @t{mu}/@t{mu4e} version 0.9.8.5, there is support for autocompleting
 addresses using @key{TAB} when composing e-mail messages. As the source for
 the addresses to complete, @t{mu4e} uses the e-mail addresses in its database
--- addresses you sent messages to or received messages from.
+-- addresses you sent messages to or received messages from. @emph{Note:}
+auto-completion should work with emacs versions 23.2 and later.
 
 Address auto-completion is enabled by default, using the variable
 @t{mu4e-compose-complete-addresses}.