diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index e9b76f10..fcdd2d14 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -111,6 +111,7 @@
 
   (message-mail to subject other-headers continue
 		switch-function yank-action send-actions)
+  (message-sort-headers)
   (message-hide-headers))
 
 (defun notmuch-mua-send-and-exit (&optional arg)