diff --git a/config/template.json b/config/template.json
index bdfea5078..f61ea52b6 100644
--- a/config/template.json
+++ b/config/template.json
@@ -1113,7 +1113,9 @@
       "CollectCoin": true,
       "CollectExp": true,
       "CollectMission": true,
-      "CollectWeeklyMission": true
+      "CollectWeeklyMission": true,
+      "CollectMail": false,
+      "MailFilter": "Merit"
     }
   },
   "ShopFrequent": {
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index 478bbe789..3df379f50 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -5846,6 +5846,14 @@
       "CollectWeeklyMission": {
         "type": "checkbox",
         "value": true
+      },
+      "CollectMail": {
+        "type": "checkbox",
+        "value": false
+      },
+      "MailFilter": {
+        "type": "textarea",
+        "value": "Merit"
       }
     }
   },
diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml
index be4860501..796a10c8c 100644
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -360,6 +360,9 @@ Reward:
   CollectExp: true
   CollectMission: true
   CollectWeeklyMission: true
+  CollectMail: false
+  MailFilter: |-
+    Merit
 GeneralShop:
   UseGems: false
   Refresh: false
diff --git a/module/config/config_generated.py b/module/config/config_generated.py
index 7d290be5a..46775bf23 100644
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -235,6 +235,8 @@ class GeneratedConfig:
     Reward_CollectExp = True
     Reward_CollectMission = True
     Reward_CollectWeeklyMission = True
+    Reward_CollectMail = False
+    Reward_MailFilter = 'Merit'
 
     # Group `GeneralShop`
     GeneralShop_UseGems = False
diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json
index 0f025ffeb..bb9de08c0 100644
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -1414,6 +1414,14 @@
     "CollectWeeklyMission": {
       "name": "Collect Weekly Mission Rewards",
       "help": ""
+    },
+    "CollectMail": {
+      "name": "Collect Mail Rewards",
+      "help": "Only collects the top 3 mail entries, also deletes recently viewed for clean up"
+    },
+    "MailFilter": {
+      "name": "Mail Filter",
+      "help": "Filter as to which mail types should be collected\nSupports Merit, Coin, Cube, Oil, and/or Gem"
     }
   },
   "GeneralShop": {
diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json
index 1c5cb8d42..c653869a7 100644
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -1414,6 +1414,14 @@
     "CollectWeeklyMission": {
       "name": "Reward.CollectWeeklyMission.name",
       "help": "Reward.CollectWeeklyMission.help"
+    },
+    "CollectMail": {
+      "name": "Reward.CollectMail.name",
+      "help": "Reward.CollectMail.help"
+    },
+    "MailFilter": {
+      "name": "Reward.MailFilter.name",
+      "help": "Reward.MailFilter.help"
     }
   },
   "GeneralShop": {
diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json
index ec7ff2e3a..83e0d47df 100644
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -1414,6 +1414,14 @@
     "CollectWeeklyMission": {
       "name": "领取周任务奖励",
       "help": ""
+    },
+    "CollectMail": {
+      "name": "Reward.CollectMail.name",
+      "help": "Reward.CollectMail.help"
+    },
+    "MailFilter": {
+      "name": "Reward.MailFilter.name",
+      "help": "Reward.MailFilter.help"
     }
   },
   "GeneralShop": {
diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json
index 6b11e46d9..8abe363ca 100644
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -1414,6 +1414,14 @@
     "CollectWeeklyMission": {
       "name": "領取周任務獎勵",
       "help": ""
+    },
+    "CollectMail": {
+      "name": "Reward.CollectMail.name",
+      "help": "Reward.CollectMail.help"
+    },
+    "MailFilter": {
+      "name": "Reward.MailFilter.name",
+      "help": "Reward.MailFilter.help"
     }
   },
   "GeneralShop": {