diff --git a/emacs/mu4e-hdrs.el b/emacs/mu4e-hdrs.el
index 0d1cfdd7..36ba72bc 100644
--- a/emacs/mu4e-hdrs.el
+++ b/emacs/mu4e-hdrs.el
@@ -86,7 +86,7 @@ results, otherwise, limit number of results to
 	 (errmsg (plist-get err :error-message)))
     (case errcode
       (4 (message "No matches for this search query."))
-      (t  (message (format "Error %d: %s" errcode errmsg))))))
+      (t (message (format "Error %d: %s" errcode errmsg))))))
 
 (defun mu4e-hdrs-update-handler (msg is-move)
   "Update handler, will be called when a message has been updated
@@ -249,7 +249,7 @@ after the end of the search results."
     (let ((map (make-sparse-keymap)))
 
       (define-key map "s" 'mu4e-search)
-      
+
       (define-key map "b" 'mu4e-search-bookmark)
 
       (define-key map "q" 'mu4e-quit-buffer)
@@ -284,7 +284,7 @@ after the end of the search results."
       (define-key map (kbd "RET") 'mu4e-view-message)
       (define-key map "H" 'mu4e-display-manual)
 
-      
+
       ;; menu
       (define-key map [menu-bar] (make-sparse-keymap))
       (let ((menumap (make-sparse-keymap "Headers")))
@@ -355,6 +355,7 @@ after the end of the search results."
     major-mode 'mu4e-hdrs-mode
     mode-name "mm: message headers"
     truncate-lines t
+    buffer-undo-list t ;; don't record undo information
     buffer-read-only t
     overwrite-mode 'overwrite-mode-binary)
 
diff --git a/emacs/mu4e-proc.el b/emacs/mu4e-proc.el
index ae3b2d35..334af238 100644
--- a/emacs/mu4e-proc.el
+++ b/emacs/mu4e-proc.el
@@ -137,6 +137,7 @@ process."
     ;; register a function for (:info ...) sexps
     (setq mu4e-proc-info-func 'mu4e-proc-info-handler)
     (when mu4e-mu-proc
+      (set-process-query-on-exit-flag mu4e-mu-proc nil)
       (set-process-coding-system mu4e-mu-proc 'binary 'utf-8-unix)
       (set-process-filter mu4e-mu-proc 'mu4e-proc-filter)
       (set-process-sentinel mu4e-mu-proc 'mu4e-proc-sentinel))))
diff --git a/emacs/mu4e.texi b/emacs/mu4e.texi
index ea128aa8..c8995a7c 100644
--- a/emacs/mu4e.texi
+++ b/emacs/mu4e.texi
@@ -78,7 +78,7 @@ from @emph{GMail} with respect to being search-based.
 clients, synchronize over @abbr{IMAP} or backup with @t{rsync}.
 
 @node What mu4e does and doesn't do
-@section What mu4e does and doesn't do 
+@section What mu4e does and doesn't do
 
 @t{mu4e} (and @t{mu}) does @emph{not} deal with getting your e-mail messages
 from some e-mail server; instead, this task is delegated to other tools, such
@@ -733,8 +733,8 @@ some ascii-art:
               |    +------+
               +----| mu4e | --> send mail (smtpmail)
                    +------+
-                    |  A        
-                    V  |  ---/ search, view, move mail  
+                    |  A
+                    V  |  ---/ search, view, move mail
               +---------+    \
               |   mu    |
               +---------+
@@ -806,10 +806,10 @@ process has some chunk of output. Something like:
     (set-process-filter proc 'my-process-filter)
     (set-process-sentinel proc 'my-process-sentinel))
 @end verbatim
-  
+
 Note, the process sentinel is invoked when the process is terminated -- so there
 you can clean things up.
-   
+
 The function =my-process-filter= is a user-defined function that takes the
 process and the chunk of output as arguments; in @t{mu4e} it looks something like
 (pseudo-lisp):
@@ -818,9 +818,9 @@ process and the chunk of output as arguments; in @t{mu4e} it looks something lik
 (defun my-process-filter (proc str)
   ;; mu4e-buf: a global string variable to which data gets appended
   ;; as we receive it
-  (setq mu4e-buf (concat mu4e-buf str)) 
+  (setq mu4e-buf (concat mu4e-buf str))
   (when <we-have-received-a-full-expression>
-      <eat-expression-from mu4e-buf> 
+      <eat-expression-from mu4e-buf>
       <evaluate-expression>))
 @end verbatim
 
@@ -887,6 +887,9 @@ can save attachments, and then re-attach them by hand.
 conveniently read encrypted mail or check signatures (it should be possible
 with e.g. EPA though, @inforef{Top, EasyPG Assistant, epa}.) For outgoing
 messages, it should work though, using the built-in mechanisms.
+@item @emph{One cannot influence the sorting of messages}. Messages are sorted
+according to thread, then descending by date. It would be nice if it could be
+sorted in other ways as well.
 @item @emph{Difficulties with attachments in messages with complex
 MIME-hierarchy.} While dealing with attachments usually works fine, we have
 found some problems with specific mails. This is an issue in @t{mu}, and it is
diff --git a/src/mu-cmd-server.c b/src/mu-cmd-server.c
index cc3e17b8..63b8baf7 100644
--- a/src/mu-cmd-server.c
+++ b/src/mu-cmd-server.c
@@ -285,7 +285,7 @@ check_param_num (GSList *args, unsigned min, unsigned max)
 
 #define return_if_fail_param_num(ARGS,MN,MX,USAGE)			 \
 	do {								 \
-		if (!check_param_num((ARGS),(MN),(MX)))			\
+		if (!check_param_num((ARGS),(MN),(MX)))			 \
 			return server_error(NULL,MU_ERROR_IN_PARAMETERS, \
 					    (USAGE));			 \
 	} while (0)