diff --git a/docs/modules.org b/docs/modules.org
index 2187b1cb5..539f24be7 100644
--- a/docs/modules.org
+++ b/docs/modules.org
@@ -84,7 +84,7 @@ Modules that reconfigure or augment packages or features built into Emacs.
 + [[file:../modules/emacs/vc/README.org][vc]] - TODO
 
 * :email
-+ [[file:../modules/email/mu4e/README.org][mu4e]] =+gmail= - TODO
++ [[file:../modules/email/mu4e/README.org][mu4e]] =+org +gmail= - TODO
 + [[file:../modules/email/notmuch/README.org][notmuch]] - TODO
 + wanderlust =+gmail= - TODO
 
diff --git a/init.example.el b/init.example.el
index b24c44cb6..457989e54 100644
--- a/init.example.el
+++ b/init.example.el
@@ -171,7 +171,7 @@
        ;;zig               ; C, but simpler
 
        :email
-       ;;(mu4e +gmail)
+       ;;(mu4e +org +gmail)
        ;;notmuch
        ;;(wanderlust +gmail)
 
diff --git a/modules/email/mu4e/README.org b/modules/email/mu4e/README.org
index 323634119..ed8134ae9 100644
--- a/modules/email/mu4e/README.org
+++ b/modules/email/mu4e/README.org
@@ -33,12 +33,15 @@ via IMAP) and ~mu~ (to index my mail into a format ~mu4e~ can understand).
 #+end_quote
 
 ** Module Flags
-+ ~+gmail~ Enables gmail-specific configuration for mail ~To~ or ~From~ a gmail
++ =+gmail= Enables gmail-specific configuration for mail ~To~ or ~From~ a gmail
   address, or a maildir with ~gmail~ in the name.
++ =+org= Use =org-msg= for composing email in Org, then sending a multipart text
+  (ASCII export) and HTML message.
 
 ** Plugins
-+ [[https://github.com/jeremy-compostella/org-msg][org-msg]]
 + [[https://github.com/iqbalansari/mu4e-alert][mu4e-alert]]
++ =+org=
+  + [[https://github.com/jeremy-compostella/org-msg][org-msg]]
 
 * Prerequisites
 This module requires:
@@ -75,7 +78,7 @@ environment.systemPackages = with pkgs; [
 + Prettified =mu4e:main= view
 + Cooperative locking of the =mu= process. Another Emacs instance may request
   access, or grab the lock when it's available.
-+ =org-msg= integration, which can be toggled per-message, with revamped style and
++ =org-msg= integration with =+org=, which can be toggled per-message, with revamped style and
   an accent colour
 + Gmail integrations with the =+gmail= flag
 + Email notifications with =mu4e-alert=, and (on Linux) a customised notification style
@@ -102,7 +105,7 @@ You can now proceed with the [[#mu-and-mu4e][mu and mu4e]] section.
 The steps needed to set up =mu4e= with =mbsync= are very similar to the ones for
 [[#offlineimap][offlineimap]].
 
-Start with writing a ~\~/.mbsyncrc~. An example for Gmail can be found on
+Start with writing a ~~/.mbsyncrc~. An example for Gmail can be found on
 [[http://pragmaticemacs.com/emacs/migrating-from-offlineimap-to-mbsync-for-mu4e/][pragmaticemacs.com]]. A non-Gmail example is available as a gist [[https://gist.github.com/agraul/60977cc497c3aec44e10591f94f49ef0][here]]. The [[http://isync.sourceforge.net/mbsync.html][manual
 page]] contains all needed information to set up your own.
 
diff --git a/modules/email/mu4e/config.el b/modules/email/mu4e/config.el
index 83812c4e2..a6135cf33 100644
--- a/modules/email/mu4e/config.el
+++ b/modules/email/mu4e/config.el
@@ -210,7 +210,7 @@
 
 (use-package! org-msg
   :after mu4e
-  :when (featurep! :lang org)
+  :when (featurep! +org)
   :config
   (setq org-msg-options "html-postamble:nil H:5 num:nil ^:{} toc:nil author:nil email:nil tex:dvipng"
         org-msg-startup "hidestars indent inlineimages"
diff --git a/modules/email/mu4e/doctor.el b/modules/email/mu4e/doctor.el
index 81e0e55ba..3355e6021 100644
--- a/modules/email/mu4e/doctor.el
+++ b/modules/email/mu4e/doctor.el
@@ -8,7 +8,7 @@
   (wan! "Couldn't find mbsync or offlineimap command. \
 You may not have a way of fetching mail."))
 
-(when (and (featurep! :lang org)
+(when (and (featurep! +org)
            (not IS-WINDOWS))
   (unless (executable-find "identify")
     (warn! "Couldn't find the identify command from imagemagik. \
diff --git a/modules/email/mu4e/packages.el b/modules/email/mu4e/packages.el
index 808b419d9..3a448797e 100644
--- a/modules/email/mu4e/packages.el
+++ b/modules/email/mu4e/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; email/mu4e/packages.el
 
-(when (featurep! :lang org)
+(when (featurep! +org)
   (package! org-msg :pin "2db6725c4a4f4342a9c61895b7c3c82795b01fee"))
 
 (package! mu4e-alert :pin "91f0657c5b245a9de57aa38391221fb5d141d9bd")