diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index acafc53d..927f9da5 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1050,5 +1050,17 @@
   "thunderai_def_lang": {
     "message": "Default language as defined in ThunderAI options.",
     "description": ""
+  },
+  "prefs_OptionText_spamfilter": {
+    "message": "Spam Filter",
+    "description": ""
+  },
+  "prefs_OptionText_spamfilter_Info": {
+    "message": "If checked, ThunderAI will automatically move spam emails to the spam folder.",
+    "description": ""
+  },
+  "prefs_OptionText_btnManageSpamFilterInfo": {
+    "message": "Manage Spam Filter settings",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 8cd6443e..0590c2e7 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -334,6 +334,16 @@
           </label>
         </td>
       </tr>
+      <tr class="spamfilter_tr">
+        <td><span>__MSG_prefs_OptionText_spamfilter__</span>
+        <br><button id="btnManageSpamFilterInfo" class="btn_small">__MSG_prefs_OptionText_btnManageSpamFilterInfo__</button></td>
+        <td>
+          <label>
+            <input type="checkbox" id="spamfilter" name="spamfilter" class="option-input" />
+            __MSG_prefs_OptionText_spamfilter_Info__
+          </label>
+        </td>
+      </tr>
       <tr class="get_calendar_event_tr">
         <td><span>__MSG_prefs_OptionText_get_calendar_event__</span>
         <br><button id="btnManageCalendarEventInfo" class="btn_small">__MSG_prefs_OptionText_btnManageCalendarEventInfo__</button></td>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index 81844d01..04d390fd 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -304,6 +304,13 @@ document.addEventListener('DOMContentLoaded', async () => {
   });
   addtags_info_btn.disabled = addtags_el.checked ? '' : 'disabled';
 
+  let spamfilter_el = document.getElementById('spamfilter');
+  let spamfilter_info_btn = document.getElementById('btnManageSpamFilterInfo');
+  spamfilter_el.addEventListener('click', (event) => {
+    spamfilter_info_btn.disabled = event.target.checked ? '' : 'disabled';
+  });
+  spamfilter_info_btn.disabled = spamfilter_el.checked ? '' : 'disabled';
+
   let get_calendar_event_el = document.getElementById('get_calendar_event');
   let get_calendar_event_info_btn = document.getElementById('btnManageCalendarEventInfo');
   get_calendar_event_el.addEventListener('click', (event) => {
@@ -337,6 +344,19 @@ document.addEventListener('DOMContentLoaded', async () => {
     })
   });
 
+  document.getElementById('btnManageSpamFilterInfo').addEventListener('click', () => {
+    // check if the tab is already there
+    browser.tabs.query({url: browser.runtime.getURL('../pages/spamfilter/mzta-spamfilter.html')}).then((tabs) => {
+      if (tabs.length > 0) {
+        // if the tab is already there, focus it
+        browser.tabs.update(tabs[0].id, {active: true});
+      } else {
+        // if the tab is not there, create it
+        browser.tabs.create({url: browser.runtime.getURL('../pages/spamfilter/mzta-spamfilter.html')});
+      }
+    })
+  });
+
   document.getElementById('btnManageCalendarEventInfo').addEventListener('click', () => {
     // check if the tab is already there
     browser.tabs.query({url: browser.runtime.getURL('../pages/get-calendar-event/mzta-get-calendar-event.html')}).then((tabs) => {