diff --git a/CODEOWNERS b/CODEOWNERS
index 73398afad29..e426d5f98b5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -550,8 +550,8 @@ build.json @home-assistant/supervisor
 /tests/components/image_processing/ @home-assistant/core
 /homeassistant/components/image_upload/ @home-assistant/core
 /tests/components/image_upload/ @home-assistant/core
-/homeassistant/components/imap/ @engrbm87
-/tests/components/imap/ @engrbm87
+/homeassistant/components/imap/ @engrbm87 @jbouwh
+/tests/components/imap/ @engrbm87 @jbouwh
 /homeassistant/components/incomfort/ @zxdavb
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
diff --git a/homeassistant/components/imap/manifest.json b/homeassistant/components/imap/manifest.json
index aeaf7b6fe9c..39dfc6c0d48 100644
--- a/homeassistant/components/imap/manifest.json
+++ b/homeassistant/components/imap/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "imap",
   "name": "IMAP",
-  "codeowners": ["@engrbm87"],
+  "codeowners": ["@engrbm87", "@jbouwh"],
   "config_flow": true,
   "dependencies": ["repairs"],
   "documentation": "https://www.home-assistant.io/integrations/imap",