diff --git a/modules/email/mu4e/config.el b/modules/email/mu4e/config.el
index f5ee2f240..1a87d7f8a 100644
--- a/modules/email/mu4e/config.el
+++ b/modules/email/mu4e/config.el
@@ -105,13 +105,13 @@
         :desc "save draft"    "S" #'message-dont-send
         :desc "attach"        "a" #'mail-add-attachment))
 
-
-(use-package! org-msg
-  :hook (mu4e-compose-pre . org-msg-mode)
-  :config
-  (setq org-msg-startup "inlineimages"
-        org-msg-greeting-name-limit 3
-        org-msg-text-plain-alternative t))
+(when (featurep! :lang org)
+  (use-package! org-msg
+    :hook (org-load . org-msg-mode)
+    :config
+    (setq org-msg-startup "inlineimages"
+          org-msg-greeting-name-limit 3
+          org-msg-text-plain-alternative t)))
 
 
 
diff --git a/modules/email/mu4e/packages.el b/modules/email/mu4e/packages.el
index 61c1ffa1b..2be20229a 100644
--- a/modules/email/mu4e/packages.el
+++ b/modules/email/mu4e/packages.el
@@ -1,4 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; email/mu4e/packages.el
 
-(package! org-msg :pin "2db6725c4a4f4342a9c61895b7c3c82795b01fee")
+(when (featurep! :lang org)
+  (package! org-msg :pin "2db6725c4a4f4342a9c61895b7c3c82795b01fee"))