diff --git a/config.org b/config.org
index ae4496a..d76aa9c 100644
--- a/config.org
+++ b/config.org
@@ -40,7 +40,6 @@
     - [[#org-roam-ui][org-roam-ui]]
   - [[#export-backends][Export backends]]
   - [[#doom-specific][Doom specific]]
-    - [[#enable-some-link-modules-that-doom-disables-by-default][Enable some link modules that doom disables by default]]
     - [[#bugfix][Bugfix]]
 - [[#magit][Magit]]
   - [[#gitlab-ci-skip-flag][Gitlab CI skip flag]]
@@ -48,7 +47,7 @@
   - [[#account-configuration][Account configuration]]
   - [[#sending-mail][Sending mail]]
   - [[#reading-plain-text][Reading plain text]]
-  - [[#org-msg-setup][=org-msg= setup]]
+  - [[#disable-org-msg-by-default][Disable =org-msg= by default]]
   - [[#message-quoting-style][Message quoting style]]
   - [[#disable-formatflowed][Disable format=flowed]]
   - [[#dont-permanently-delete-when-trashing-mails][Don't permanently delete when trashing mails]]
@@ -507,13 +506,6 @@ one. Taken from [[https://github.com/hlissner/doom-emacs/tree/develop/modules/la
   (remove-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h))
 #+END_SRC
 
-*** Enable some link modules that doom disables by default
-
-#+begin_src emacs-lisp
-(add-to-list 'org-modules 'ol-info)
-(add-to-list 'org-modules 'ol-doi)
-#+end_src
-
 *** Bugfix
 
 Fix a bug with capture mode not working correctly when agenda is opened, stolen
@@ -617,29 +609,14 @@ possible.
 (add-to-list 'mm-discouraged-alternatives "text/richtext")
 #+end_src
 
-** =org-msg= setup
+** Disable =org-msg= by default
 
-Add =-:nil= to the export options list, otherwise the =--= in the signature gets
-converted to a single hyphen when exporting to utf-8. See [[info:org#Export settings]]
+Doom adds a hook, making it impossible to disable. This allows us to toggle it
+manually.
 
-#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
-(setq org-msg-options (concat org-msg-options " -:nil"))
-#+end_src
-
-Setup signature as well. The double backslashes are there to make sure that the
-linebreak is preserved even in the html export, which otherwise wraps the
-signature lines as a single paragraph.
-
-#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
-(setq org-msg-signature "\n#+begin_signature\n-- \\\\\nAntoine Martin\n#+end_signature")
-#+end_src
-
-I don't want to send HTML emails at all unless I choose to explicitely.
-
-#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
-(setq org-msg-default-alternatives '((new utf-8)
-                                     (reply-to-text utf-8)
-                                     (reply-to-html utf-8)))
+#+begin_src emacs-lisp
+(after! org-msg
+  (setq +mu4e-compose-org-msg-toggle-next nil))
 #+end_src
 
 ** Message quoting style