diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index 74e067ac..7c9493c1 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -1203,6 +1203,9 @@ GNU patch review metho dor sometihng idk
     ;; for mail accounts
     (setq sakomacs-mail-accounts (json-read-file "~/Mail/accounts.json"))
 
+    ;; kill message buffers
+    (setq message-kill-buffer-on-exit t)
+
     (setq mu4e-context-policy 'pick-first)
     (setq mu4e-compose-context-policy 'always-ask)
     (setq mu4e-contexts