diff --git a/lisp/ti-config/work-config.el b/lisp/ti-config/work-config.el
index 00de410..802ab8e 100644
--- a/lisp/ti-config/work-config.el
+++ b/lisp/ti-config/work-config.el
@@ -226,5 +226,16 @@
 (when my-ec/enable-mail
   (require 'work-mail))
 
+(defun always-expand-mail-abbrevs-in-commit-buffer (orig)
+  (or with-editor-mode
+      (funcall orig)))
+
+(add-hook 'with-editor-mode-hook
+          #'mail-abbrevs-setup)
+
+(advice-add #'mail-abbrev-in-expansion-header-p
+            :around
+            #'always-expand-mail-abbrevs-in-commit-buffer)
+
 (provide 'work-config)
 ;;; work-config.el ends here