diff --git a/modules/email/mu4e/README.org b/modules/email/mu4e/README.org
index 39411bcad7e..1e363a2ff0c 100644
--- a/modules/email/mu4e/README.org
+++ b/modules/email/mu4e/README.org
@@ -38,7 +38,7 @@ via IMAP) and ~mu~ (to index my mail into a format ~mu4e~ can understand).
 + ~+gmail~ Enables gmail-specific configuration.
 
 ** Plugins
-This module install no plugins.
++ [[https://github.com/jeremy-compostella/org-msg][org-msg]]
 
 * Prerequisites
 This module requires:
diff --git a/modules/email/mu4e/config.el b/modules/email/mu4e/config.el
index 3ff2182abfc..ebd8209309b 100644
--- a/modules/email/mu4e/config.el
+++ b/modules/email/mu4e/config.el
@@ -108,16 +108,13 @@
         :desc "attach"        "a" #'mail-add-attachment))
 
 
-(use-package! org-mu4e
-  :hook (mu4e-compose-mode . org-mu4e-compose-org-mode)
+(use-package! org-msg
+  :hook (org-load . org-msg-mode)
   :config
-  (setq org-mu4e-convert-to-html t)
-  (when (version< mu4e-mu-version "1.4")
-    (setq org-mu4e-link-query-in-headers-mode nil))
+  (setq org-msg-startup "inlineimages"
+        org-msg-greeting-name-limit 3
+        org-msg-text-plain-alternative t))
 
-  ;; Only render to html once. If the first send fails for whatever reason,
-  ;; org-mu4e would do so each time you try again.
-  (setq-hook! 'message-send-hook org-mu4e-convert-to-html nil))
 
 
 ;;
diff --git a/modules/email/mu4e/packages.el b/modules/email/mu4e/packages.el
index 462e1f53ca3..61c1ffa1b79 100644
--- a/modules/email/mu4e/packages.el
+++ b/modules/email/mu4e/packages.el
@@ -1,3 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; email/mu4e/packages.el
 
+(package! org-msg :pin "2db6725c4a4f4342a9c61895b7c3c82795b01fee")