diff --git a/apps/web/utils/actions/rule.ts b/apps/web/utils/actions/rule.ts
index 007d491c2e..b34fcfd35b 100644
--- a/apps/web/utils/actions/rule.ts
+++ b/apps/web/utils/actions/rule.ts
@@ -467,6 +467,21 @@ export const createRulesOnboardingAction = actionClient
         }
       }
 
+      const conversationRules = [
+        SystemType.FYI,
+        SystemType.AWAITING_REPLY,
+        SystemType.ACTIONED,
+      ];
+
+      for (const type of conversationRules) {
+        const config = systemCategoryMap.get(SystemType.TO_REPLY);
+        if (config && isSet(config.action)) {
+          createRule(type);
+        } else {
+          deleteRule(type, emailAccountId);
+        }
+      }
+
       // Create rules for custom categories
       for (const customCategory of customCategories) {
         if (customCategory.action && isSet(customCategory.action)) {
diff --git a/version.txt b/version.txt
index 47aff0ca58..d9bf6070cb 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.16.4
+v2.16.5