diff --git a/modules/email/notmuch/config.el b/modules/email/notmuch/config.el
index 0f95ddf15..ffaf54a8c 100644
--- a/modules/email/notmuch/config.el
+++ b/modules/email/notmuch/config.el
@@ -117,6 +117,9 @@ variable accordingly.")
   :after (org notmuch)
   :config (setq org-mime-library 'mml))
 
+(use-package! ol-notmuch
+  :when (featurep! +org)
+  :after (org notmuch))
 
 (use-package! counsel-notmuch
   :when (featurep! :completion ivy)
diff --git a/modules/email/notmuch/packages.el b/modules/email/notmuch/packages.el
index 4b5c7428e..12fde3668 100644
--- a/modules/email/notmuch/packages.el
+++ b/modules/email/notmuch/packages.el
@@ -20,7 +20,8 @@
   :pin "63413a5563450bdedee4c077f2f998578e75083a")
 
 (when (featurep! +org)
-  (package! org-mime :pin "eb21c02ba8f97fe69c14dc657a7883b982664649"))
+  (package! org-mime :pin "eb21c02ba8f97fe69c14dc657a7883b982664649")
+  (package! ol-notmuch :pin "126fb446d8fa9e54cf21103afaf506fd81273c02"))
 (when (featurep! :completion ivy)
   (package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688"))
 (when (featurep! :completion helm)