diff --git a/emacs/mu4e-hdrs.el b/emacs/mu4e-hdrs.el
index 939a0180..521fe304 100644
--- a/emacs/mu4e-hdrs.el
+++ b/emacs/mu4e-hdrs.el
@@ -642,7 +642,7 @@ results."
   (when (mu4e-ignore-marks)
     (mu4e-kill-proc) ;; hmmm...
     (kill-buffer)
-    (mm)))
+    (mu4e)))
 
 (defun mu4e-rerun-search ()
   "Rerun the search for the last search expression; if none exists,
diff --git a/emacs/mu4e-main.el b/emacs/mu4e-main.el
index 139a977d..bdff638a 100644
--- a/emacs/mu4e-main.el
+++ b/emacs/mu4e-main.el
@@ -47,7 +47,7 @@
     (define-key map "u" 'mu4e-retrieve-mail-update-db)
 
     map)
-  "Keymap for the *mm* buffer.")
+  "Keymap for the *mu4e-main* buffer.")
 (fset 'mu4e-main-mode-map mu4e-main-mode-map)
 
 (defun mu4e-main-mode ()
@@ -128,7 +128,7 @@
     (if smtpmail-queue-mail
       "Outgoing mail will now be queued"
       "Outgoing mail will now be sent directly"))
-  (mm))
+  (mu4e))
 
 
 (defun mu4e-quit-mm()
diff --git a/emacs/mu4e.el b/emacs/mu4e.el
index 937f4d4f..1efdd8b1 100644
--- a/emacs/mu4e.el
+++ b/emacs/mu4e.el
@@ -339,13 +339,18 @@ server has the expected values."
   (interactive)
   (if (buffer-live-p mu4e-main-buffer-name)
     (switch-to-buffer mu4e-main-buffer-name)
-    (setq mu4e-proc-pong-func
-      (lambda (version doccount)
-	(unless (string= version mu4e-mu-version)
-	  (error "mu server has version %s, but we need %s"
-	    version mu4e-mu-version))
-	(mu4e-main-view)))
-    (mu4e-proc-ping)))
+    (progn
+      ;; explicit version checks are a bit questionable,
+      ;; better to check for specific features
+      (when (< emacs-major-version 23)
+	(error "Emacs >= 23.x is required for mu4e"))
+      (setq mu4e-proc-pong-func
+	(lambda (version doccount)
+	  (unless (string= version mu4e-mu-version)
+	    (error "mu server has version %s, but we need %s"
+	      version mu4e-mu-version))
+	  (mu4e-main-view)))
+    (mu4e-proc-ping))))
 
 (defun mu4e-ask-maildir (prompt)
   "Ask the user for a shortcut (using PROMPT) as defined in
@@ -410,7 +415,8 @@ old one first."
 (defun mu4e-flags-to-string (flags)
   "Remove duplicates and sort the output of `mu4e-flags-to-string-raw'."
   (concat
-    (sort (remove-duplicates (append (mu4e-flags-to-string-raw flags) nil)) '>)))
+    (sort (remove-duplicates
+	    (append (mu4e-flags-to-string-raw flags) nil)) '>)))
 
 (defun mu4e-flags-to-string-raw (flags)
   "Convert a list of flags into a string as seen in Maildir