diff --git a/regexes.yaml b/regexes.yaml
index 14412307..c362e262 100644
--- a/regexes.yaml
+++ b/regexes.yaml
@@ -460,6 +460,10 @@ user_agent_parsers:
   - regex: '(TopBuzz)/(\d+).(\d+).(\d+)'
     family_replacement: 'TopBuzz'
 
+  # Mail+ must go before Chrome Mobile WebView
+  - regex: 'TheMailApp_(iOS|Android)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Mail+ App'
+
   # Google Search App on Android, eg:
   - regex: 'Mozilla.{1,200}Android.{1,200}(GSA)/(\d+)\.(\d+)\.(\d+)'
     family_replacement: 'Google'
diff --git a/tests/test_os.yaml b/tests/test_os.yaml
index 5fbf17a7..630c5f8d 100644
--- a/tests/test_os.yaml
+++ b/tests/test_os.yaml
@@ -3237,3 +3237,18 @@ test_cases:
     minor: '1'
     patch: '1'
     patch_minor:
+
+  - user_agent_string: 'Mozilla/5.0 (Linux; Android 13; SM-X900 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/110.0.5481.153 Safari/537.36 TheMailApp_Android/8.1.9.30.PROD'
+    family: 'Android'
+    major: '13'
+    minor:
+    patch:
+    patch_minor:
+
+  - user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 15_7_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 TheMailApp_iOS/8.1.9.30.PROD'
+    family: 'iOS'
+    major: '15'
+    minor: '7'
+    patch: '3'
+    patch_minor:
+
diff --git a/tests/test_ua.yaml b/tests/test_ua.yaml
index d27a6f1f..ac9ca4db 100644
--- a/tests/test_ua.yaml
+++ b/tests/test_ua.yaml
@@ -8783,6 +8783,18 @@ test_cases:
     minor: '2'
     patch: '1'
 
+  - user_agent_string: 'Mozilla/5.0 (Linux; Android 13; SM-X900 Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/110.0.5481.153 Safari/537.36 TheMailApp_Android/8.1.9.30.PROD'
+    family: 'Mail+ App'
+    major: '8'
+    minor: '1'
+    patch: '9'
+
+  - user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 15_7_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 TheMailApp_iOS/8.1.9.30.PROD'
+    family: 'Mail+ App'
+    major: '8'
+    minor: '1'
+    patch: '9'
+
   - user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Safari/605.1.15 (Ecosia ios@8.1.3.72)'
     family: 'Ecosia iOS'
     major: '8'