From 021e317a3770f0d2a3c0b3e58fedc91a55c60454 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 25 Mar 2026 00:13:00 +0100
Subject: [PATCH 01/25] correctly setting the current model in the special
 prompts pages

---
 pages/addtags/mzta-add-tags.js                | 24 ++++++++--------
 .../mzta-get-calendar-event.js                | 24 ++++++++--------
 pages/get-task/mzta-get-task.js               | 24 ++++++++--------
 pages/spamfilter/mzta-spamfilter.js           | 22 +++++++++------
 pages/summarize/mzta-summarize.js             | 28 +++++++++++--------
 5 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/pages/addtags/mzta-add-tags.js b/pages/addtags/mzta-add-tags.js
index f9296c28..c57901f9 100644
--- a/pages/addtags/mzta-add-tags.js
+++ b/pages/addtags/mzta-add-tags.js
@@ -330,19 +330,21 @@ async function restoreOptions() {
             const restoreValue = result[element.id] || default_select_value;
             // Check if option exists
             let optionExists = Array.from(element.options).some(opt => opt.value === restoreValue);
-            // If it doesn't exist and restoreValue is not empty, create it
-            if (!optionExists && restoreValue !== '') {
-              let newOption = new Option(restoreValue, restoreValue);
-              element.add(newOption);
-            }
-            // Set value
-            element.value = restoreValue;
-            if (element.value === '') {
-              element.selectedIndex = -1;
-            }
             if (element.tomselect) {
-              element.tomselect.setValue(element.value, true);
+              if (!optionExists && restoreValue !== '') {
+                element.tomselect.addOption({ value: restoreValue, text: restoreValue });
+              }
+              element.tomselect.setValue(restoreValue, true);
               setTomSelectBorder(element.tomselect);
+            } else {
+              if (!optionExists && restoreValue !== '') {
+                let newOption = new Option(restoreValue, restoreValue);
+                element.add(newOption);
+              }
+              element.value = restoreValue;
+              if (element.value === '') {
+                element.selectedIndex = -1;
+              }
             }
         }else{
           console.error("[ThunderAI] Unhandled input type:", element.type);
diff --git a/pages/get-calendar-event/mzta-get-calendar-event.js b/pages/get-calendar-event/mzta-get-calendar-event.js
index ca3c8ef7..19e54981 100644
--- a/pages/get-calendar-event/mzta-get-calendar-event.js
+++ b/pages/get-calendar-event/mzta-get-calendar-event.js
@@ -227,19 +227,21 @@ async function restoreOptions() {
             const restoreValue = result[element.id] || default_select_value;
             // Check if option exists
             let optionExists = Array.from(element.options).some(opt => opt.value === restoreValue);
-            // If it doesn't exist and restoreValue is not empty, create it
-            if (!optionExists && restoreValue !== '') {
-              let newOption = new Option(restoreValue, restoreValue);
-              element.add(newOption);
-            }
-            // Set value
-            element.value = restoreValue;
-            if (element.value === '') {
-              element.selectedIndex = -1;
-            }
             if (element.tomselect) {
-              element.tomselect.setValue(element.value, true);
+              if (!optionExists && restoreValue !== '') {
+                element.tomselect.addOption({ value: restoreValue, text: restoreValue });
+              }
+              element.tomselect.setValue(restoreValue, true);
               setTomSelectBorder(element.tomselect);
+            } else {
+              if (!optionExists && restoreValue !== '') {
+                let newOption = new Option(restoreValue, restoreValue);
+                element.add(newOption);
+              }
+              element.value = restoreValue;
+              if (element.value === '') {
+                element.selectedIndex = -1;
+              }
             }
         }else{
           console.error("[ThunderAI] Unhandled input type:", element.type);
diff --git a/pages/get-task/mzta-get-task.js b/pages/get-task/mzta-get-task.js
index f5e3f257..34f818dc 100644
--- a/pages/get-task/mzta-get-task.js
+++ b/pages/get-task/mzta-get-task.js
@@ -180,19 +180,21 @@ async function restoreOptions() {
             const restoreValue = result[element.id] || default_select_value;
             // Check if option exists
             let optionExists = Array.from(element.options).some(opt => opt.value === restoreValue);
-            // If it doesn't exist and restoreValue is not empty, create it
-            if (!optionExists && restoreValue !== '') {
-              let newOption = new Option(restoreValue, restoreValue);
-              element.add(newOption);
-            }
-            // Set value
-            element.value = restoreValue;
-            if (element.value === '') {
-              element.selectedIndex = -1;
-            }
             if (element.tomselect) {
-              element.tomselect.setValue(element.value, true);
+              if (!optionExists && restoreValue !== '') {
+                element.tomselect.addOption({ value: restoreValue, text: restoreValue });
+              }
+              element.tomselect.setValue(restoreValue, true);
               setTomSelectBorder(element.tomselect);
+            } else {
+              if (!optionExists && restoreValue !== '') {
+                let newOption = new Option(restoreValue, restoreValue);
+                element.add(newOption);
+              }
+              element.value = restoreValue;
+              if (element.value === '') {
+                element.selectedIndex = -1;
+              }
             }
         }else{
           console.error("[ThunderAI] Unhandled input type:", element.type);
diff --git a/pages/spamfilter/mzta-spamfilter.js b/pages/spamfilter/mzta-spamfilter.js
index 4879abcd..1809b9bd 100644
--- a/pages/spamfilter/mzta-spamfilter.js
+++ b/pages/spamfilter/mzta-spamfilter.js
@@ -322,17 +322,21 @@ async function restoreOptions() {
           const restoreValue = result[element.id] || default_select_value;
           // Ensure option exists before restoring
           let optionExists = Array.from(element.options).some(opt => opt.value === restoreValue);
-          if (!optionExists && restoreValue !== '') {
-            let newOption = new Option(restoreValue, restoreValue);
-            element.add(newOption);
-          }
-          element.value = restoreValue;
-          if (element.value === '') {
-            element.selectedIndex = -1;
-          }
           if (element.tomselect) {
-            element.tomselect.setValue(element.value, true);
+            if (!optionExists && restoreValue !== '') {
+              element.tomselect.addOption({ value: restoreValue, text: restoreValue });
+            }
+            element.tomselect.setValue(restoreValue, true);
             setTomSelectBorder(element.tomselect);
+          } else {
+            if (!optionExists && restoreValue !== '') {
+              let newOption = new Option(restoreValue, restoreValue);
+              element.add(newOption);
+            }
+            element.value = restoreValue;
+            if (element.value === '') {
+              element.selectedIndex = -1;
+            }
           }
         }else{
           console.error("[ThunderAI] Unhandled input type:", element.type);
diff --git a/pages/summarize/mzta-summarize.js b/pages/summarize/mzta-summarize.js
index b41d9084..adc565a7 100644
--- a/pages/summarize/mzta-summarize.js
+++ b/pages/summarize/mzta-summarize.js
@@ -30,7 +30,8 @@ import { textareaAutocomplete } from "../../js/mzta-placeholders-autocomplete.js
 import {
   getAccountsList,
   normalizeStringList,
-  isAPIKeyValue
+  isAPIKeyValue,
+  setTomSelectBorder
 } from "../../js/mzta-utils.js";
 import {
   initializeSpecificIntegrationUI
@@ -235,18 +236,21 @@ async function restoreOptions() {
             const restoreValue = result[element.id] || default_select_value;
             // Check if option exists
             let optionExists = Array.from(element.options).some(opt => opt.value === restoreValue);
-            // If it doesn't exist and restoreValue is not empty, create it
-            if (!optionExists && restoreValue !== '') {
-              let newOption = new Option(restoreValue, restoreValue);
-              element.add(newOption);
-            }
-            // Set value
-            element.value = restoreValue;
-            if (element.value === '') {
-              element.selectedIndex = -1;
-            }
             if (element.tomselect) {
-              element.tomselect.setValue(element.value, true);
+              if (!optionExists && restoreValue !== '') {
+                element.tomselect.addOption({ value: String(restoreValue), text: String(restoreValue) });
+              }
+              element.tomselect.setValue(String(restoreValue), true);
+              setTomSelectBorder(element.tomselect);
+            } else {
+              if (!optionExists && restoreValue !== '') {
+                let newOption = new Option(restoreValue, restoreValue);
+                element.add(newOption);
+              }
+              element.value = restoreValue;
+              if (element.value === '') {
+                element.selectedIndex = -1;
+              }
             }
         }else{
           console.error("[ThunderAI] Unhandled input type:", element.type);

From 1522e2c04c8c6c418942821fbdda2b34603fe1ed Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 25 Mar 2026 00:19:00 +0100
Subject: [PATCH 02/25] version set to 4.0.4. release notes updated

---
 CHANGELOG.md                    | 4 ++++
 manifest.json                   | 2 +-
 options/mzta-release-notes.html | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdbd6cf4..4bc5f35c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 
 
+<h2>Version 4.0.4 - ??/??/2026</h2>
+      <ul>
+        <li>Fix: Correctly selecting the current model in the special prompt pages.</li>
+      </ul>
 <h2>Version 4.0.3 - 20/03/2026</h2>
       <ul>
         <li>Fixed a bug in creating new tags [<a href="https://github.com/micz/ThunderAI/issues/698">#698</a>].</li>
diff --git a/manifest.json b/manifest.json
index 85577cc7..05f6c2bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "4.0.3",
+    "version": "4.0.4",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index bae3597c..5612787b 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,6 +7,10 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
+      <h2>Version 4.0.4 - ??/??/2026</h2>
+      <ul>
+        <li>Fix: Correctly selecting the current model in the special prompt pages.</li>
+      </ul>
       <h2>Version 4.0.3 - 20/03/2026</h2>
       <ul>
         <li>Fixed a bug in creating new tags [<a href="https://github.com/micz/ThunderAI/issues/698">#698</a>].</li>

From afdae833dc8191f3eeab8cd1a115e11c725e9da5 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 26 Mar 2026 00:14:35 +0100
Subject: [PATCH 03/25] release notes updated

---
 CHANGELOG.md                    | 4 ++--
 options/mzta-release-notes.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bc5f35c..9af970d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,9 @@
 
 
 
-<h2>Version 4.0.4 - ??/??/2026</h2>
+<h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>
-        <li>Fix: Correctly selecting the current model in the special prompt pages.</li>
+        <li>Fix: Correctly showing the selected model in the special prompt pages.</li>
       </ul>
 <h2>Version 4.0.3 - 20/03/2026</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 5612787b..58534181 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,9 +7,9 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
-      <h2>Version 4.0.4 - ??/??/2026</h2>
+      <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>
-        <li>Fix: Correctly selecting the current model in the special prompt pages.</li>
+        <li>Fix: Correctly showing the selected model in the special prompt pages.</li>
       </ul>
       <h2>Version 4.0.3 - 20/03/2026</h2>
       <ul>

From 40235e5df495db4971e8ca37d9812c49352495f4 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 26 Mar 2026 23:29:28 +0100
Subject: [PATCH 04/25] version set to 4.0.5

---
 CHANGELOG.md                    | 4 ++++
 manifest.json                   | 2 +-
 options/mzta-release-notes.html | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9af970d7..aa4f59ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 
 
+<h2>Version 4.0.5 - ??/??/2026</h2>
+      <ul>
+        <li>...</li>
+      </ul>
 <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>
         <li>Fix: Correctly showing the selected model in the special prompt pages.</li>
diff --git a/manifest.json b/manifest.json
index 05f6c2bf..197f2cc1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "4.0.4",
+    "version": "4.0.5",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 58534181..edae537c 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,6 +7,10 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
+      <h2>Version 4.0.5 - ??/??/2026</h2>
+      <ul>
+        <li>...</li>
+      </ul>
       <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>
         <li>Fix: Correctly showing the selected model in the special prompt pages.</li>

From 36d606bbc6453f5d95e698c06e5f6a2a87cc56ff Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 26 Mar 2026 23:36:49 +0100
Subject: [PATCH 05/25] html mail parts are now displayed as code and are not
 rendered. see #711

---
 api_webchat/messagesArea.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/api_webchat/messagesArea.js b/api_webchat/messagesArea.js
index 5d9b5bc4..52dc1532 100644
--- a/api_webchat/messagesArea.js
+++ b/api_webchat/messagesArea.js
@@ -273,7 +273,11 @@ class MessagesArea extends HTMLElement {
         const messageElement = document.createElement('div');
         messageElement.classList.add('message', type);
         // Replace \n with <br> for correct HTML display
-        messageElement.appendChild(htmlStringToFragment(messageText));
+        if (type === "info") {
+            messageElement.appendChild(htmlStringToFragment(messageText));
+        } else {
+            messageElement.appendChild(textWithBrToFragment(messageText));
+        }
         // messageElement.textContent = messageText;
         // // Replace \n with <br> elements for correct HTML display
         // messageElement.innerHTML = '';
@@ -576,6 +580,20 @@ class MessagesArea extends HTMLElement {
 customElements.define('messages-area', MessagesArea);
 
 
+function textWithBrToFragment(text) {
+    const fragment = document.createDocumentFragment();
+    const segments = text.split(/<br\s*\/?>/gi);
+    segments.forEach((segment, idx) => {
+        if (segment.length > 0) {
+            fragment.appendChild(document.createTextNode(segment));
+        }
+        if (idx < segments.length - 1) {
+            fragment.appendChild(document.createElement('br'));
+        }
+    });
+    return fragment;
+}
+
 function htmlStringToFragment(htmlString) {
 //   console.log(">>>>>>>>>>>>>>>> htmlStringToFragment htmlString: " + htmlString);
   const normalizedHtml = htmlString.replace(/\n/g, '<br>');

From 63f52703b7f6043b8830b511ac94acb34426f683 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 26 Mar 2026 23:41:13 +0100
Subject: [PATCH 06/25] escaping html code also in chatgpt web integration. see
 #711

---
 js/mzta-utils.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index c5dbc59e..b3048c30 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -285,10 +285,19 @@ function convertBrToNewlines(html) {
 export function convertNewlinesToParagraphs(input) {
   return input
     .split('\n')
-    .map(line => `<p>${line}</p>`)
+    .map(line => `<p>${escapeHtml(line)}</p>`)
     .join('');
 }
 
+function escapeHtml(text) {
+  return text
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#039;');
+}
+
 
 // This method is used to convert the model string id used in the URL
 // to the model string used in the webpage

From 3623b92ea590a1d752c3a35f138adc0273fb9555 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 26 Mar 2026 23:44:20 +0100
Subject: [PATCH 07/25] The API webchat window now has a dynamic title. see
 #696

---
 api_webchat/controller.js | 2 ++
 api_webchat/index.html    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index 934f83f9..ef3b1648 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -116,6 +116,8 @@ if (worker) {
         }
         messagesArea.setLLMName(llmName);
 
+        document.title += " [" + llmName + " | " + decodeURIComponent(prompt_name) + "]";
+
         let workerInitMessage = {
             type: 'init',
             do_debug: prefs_api.do_debug,
diff --git a/api_webchat/index.html b/api_webchat/index.html
index 5d803548..509c7017 100644
--- a/api_webchat/index.html
+++ b/api_webchat/index.html
@@ -3,7 +3,7 @@
 <head>
     <!-- Other meta tags and stylesheets -->
     <link rel="stylesheet" type="text/css" href="styles.css">
-    
+    <title>ThunderAI Assistant</title>
 </head>
 <body>
     <!-- Use the custom tags directly -->

From 0e9790ccf478db8a685d46d165a55c13ec201f8b Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 26 Mar 2026 23:46:40 +0100
Subject: [PATCH 08/25] release notes updated

---
 CHANGELOG.md                    | 1 +
 options/mzta-release-notes.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa4f59ac..91491412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 <h2>Version 4.0.5 - ??/??/2026</h2>
       <ul>
+        <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 4.0.4 - 26/03/2026</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index edae537c..f7604dee 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -9,6 +9,8 @@
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
       <h2>Version 4.0.5 - ??/??/2026</h2>
       <ul>
+        <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
+        <li><i>[All APIs]</i>The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
         <li>...</li>
       </ul>
       <h2>Version 4.0.4 - 26/03/2026</h2>

From 696ef5aa3c9e8d65ce4d9b9ba9ed162de4fed899 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 27 Mar 2026 00:22:43 +0100
Subject: [PATCH 09/25] removing html elements added by thunderai when
 extracting text or html from the email. see #710

---
 js/mzta-compose-script.js | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index 8b8c3239..6b1d7fab 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -16,6 +16,26 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// CSS selectors for DOM elements injected by ThunderAI.
+// These are stripped when retrieving the email body content
+// to avoid contaminating placeholder values sent to AI providers.
+// Add new selectors here when new UI elements are injected into the email DOM.
+const MZTA_INJECTED_SELECTORS = [
+  '#mzta-spam-check-progress',
+  '#mzta-spam-report-banner',
+  '.mzta_dialog',
+];
+
+function getCleanBodyClone() {
+  const clone = document.body.cloneNode(true);
+  for (const selector of MZTA_INJECTED_SELECTORS) {
+    for (const el of clone.querySelectorAll(selector)) {
+      el.remove();
+    }
+  }
+  return clone;
+}
+
 browser.runtime.onMessage.addListener((message) => {
 switch (message.command) {
   case "getSelectedText": {
@@ -60,7 +80,7 @@ switch (message.command) {
 
   case "getText": {
     let t = '';
-    const children = window.document.body.childNodes;
+    const children = getCleanBodyClone().childNodes;
     for (const node of children) {
       if (node instanceof Element) {
         if (node.classList.contains('moz-signature')) {
@@ -73,11 +93,11 @@ switch (message.command) {
   }
 
   case "getTextOnly": {
-      return Promise.resolve(window.document.body.innerText);
+      return Promise.resolve(getCleanBodyClone().innerText);
   }
 
   case "getFullHtml": {
-      return Promise.resolve(window.document.body.innerHTML);
+      return Promise.resolve(getCleanBodyClone().innerHTML);
   }
 
   case "getOnlyTypedText": {

From b1b02312e906760c35ed137372e7fd9a3c78b35c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 27 Mar 2026 00:24:20 +0100
Subject: [PATCH 10/25] release notes updated

---
 CHANGELOG.md                    | 1 +
 options/mzta-release-notes.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91491412..5000f77f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 <h2>Version 4.0.5 - ??/??/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
+        <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are no more visible in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 4.0.4 - 26/03/2026</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index f7604dee..8fc5cf2a 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -10,6 +10,7 @@
       <h2>Version 4.0.5 - ??/??/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
+        <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are no more visible in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
         <li><i>[All APIs]</i>The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
         <li>...</li>
       </ul>

From 43ffdd32e12b4d83a79859e3037db4781439a45d Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Fri, 27 Mar 2026 00:24:00 +0100
Subject: [PATCH 11/25] release notes updated

---
 CHANGELOG.md                    | 2 +-
 options/mzta-release-notes.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5000f77f..a3fdd455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 <h2>Version 4.0.5 - ??/??/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
-        <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are no more visible in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
+        <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are now not present in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 4.0.4 - 26/03/2026</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 8fc5cf2a..96fdfd2b 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -10,7 +10,7 @@
       <h2>Version 4.0.5 - ??/??/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
-        <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are no more visible in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
+        <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are now not present in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
         <li><i>[All APIs]</i>The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
         <li>...</li>
       </ul>

From 7d2b811926cac2b889d6715b0d4a00a52d1b405b Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Fri, 27 Mar 2026 00:24:00 +0100
Subject: [PATCH 12/25] stripping printing headers from the html body berfore
 using it in a placeholder

---
 js/mzta-compose-script.js | 15 +++++++++++++++
 js/mzta-utils.js          | 23 +++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index 6b1d7fab..b4091b1e 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -26,6 +26,20 @@ const MZTA_INJECTED_SELECTORS = [
   '.mzta_dialog',
 ];
 
+// Mirrors removeMozMainHeader() from mzta-utils.js.
+// Removes the Thunderbird-injected header table and any preceding divs.
+function removeMozMainHeader(root) {
+  const table = root.querySelector('table.moz-main-header');
+  if (!table) return;
+  let sibling = table.previousElementSibling;
+  while (sibling && sibling.tagName === 'DIV') {
+    const toRemove = sibling;
+    sibling = sibling.previousElementSibling;
+    toRemove.remove();
+  }
+  table.remove();
+}
+
 function getCleanBodyClone() {
   const clone = document.body.cloneNode(true);
   for (const selector of MZTA_INJECTED_SELECTORS) {
@@ -33,6 +47,7 @@ function getCleanBodyClone() {
       el.remove();
     }
   }
+  removeMozMainHeader(clone);
   return clone;
 }
 
diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index b3048c30..71f876b3 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -181,6 +181,11 @@ export function getMailBody(fullMessage){
   }
   if(html === "") {
     html = text.replace(/\n/g, "<br>");
+  } else {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(html, 'text/html');
+    removeMozMainHeader(doc.body);
+    html = doc.body.innerHTML;
   }
   return {text, html};
 }
@@ -246,7 +251,9 @@ export function htmlBodyToPlainText(htmlString) {
 	const parser = new DOMParser();
 	// Parse the HTML string
 	const doc = parser.parseFromString(htmlString, 'text/html');
-	
+
+  removeMozMainHeader(doc.body);
+
   // remove invisible elements https://stackoverflow.com/questions/39813081/queryselector-where-display-is-not-none
    // return doc;
   doc.querySelectorAll('[style*="display:none"]').forEach(e => e.remove());//.querySelector('html').children.not(':visible').remove()
@@ -263,7 +270,19 @@ export function htmlBodyToPlainText(htmlString) {
   .replace(/&nbsp;/gi,"")
   .trim();
 }
- 
+
+export function removeMozMainHeader(root) {
+  const table = root.querySelector('table.moz-main-header');
+  if (!table) return;
+  let sibling = table.previousElementSibling;
+  while (sibling && sibling.tagName === 'DIV') {
+    const toRemove = sibling;
+    sibling = sibling.previousElementSibling;
+    toRemove.remove();
+  }
+  table.remove();
+}
+
 export function cleanupNewlines(text) {
   return text
   .replace(/\r\n/g, '\n')

From 0b3c66b78ddc74748a5e43c1b302f3d87a348a69 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 27 Mar 2026 23:00:33 +0100
Subject: [PATCH 13/25] fix removing html elements added by thunderai when
 extracting text or html from the email. see #710

---
 js/mzta-compose-script.js | 32 +++++++++++++-------------------
 js/mzta-utils.js          | 16 ++++++++--------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index b4091b1e..de085546 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -26,28 +26,22 @@ const MZTA_INJECTED_SELECTORS = [
   '.mzta_dialog',
 ];
 
-// Mirrors removeMozMainHeader() from mzta-utils.js.
-// Removes the Thunderbird-injected header table and any preceding divs.
-function removeMozMainHeader(root) {
-  const table = root.querySelector('table.moz-main-header');
-  if (!table) return;
-  let sibling = table.previousElementSibling;
-  while (sibling && sibling.tagName === 'DIV') {
-    const toRemove = sibling;
-    sibling = sibling.previousElementSibling;
-    toRemove.remove();
-  }
-  table.remove();
-}
-
-function getCleanBodyClone() {
+function getCleanBodyHtml() {
   const clone = document.body.cloneNode(true);
   for (const selector of MZTA_INJECTED_SELECTORS) {
     for (const el of clone.querySelectorAll(selector)) {
       el.remove();
     }
   }
-  removeMozMainHeader(clone);
+  for (const table of clone.querySelectorAll('table.moz-main-header')) {
+    let sibling = table.previousElementSibling;
+    while (sibling && sibling.tagName === 'DIV') {
+      const toRemove = sibling;
+      sibling = sibling.previousElementSibling;
+      toRemove.remove();
+    }
+    table.remove();
+  }
   return clone;
 }
 
@@ -95,7 +89,7 @@ switch (message.command) {
 
   case "getText": {
     let t = '';
-    const children = getCleanBodyClone().childNodes;
+    const children = getCleanBodyHtml().childNodes;
     for (const node of children) {
       if (node instanceof Element) {
         if (node.classList.contains('moz-signature')) {
@@ -108,11 +102,11 @@ switch (message.command) {
   }
 
   case "getTextOnly": {
-      return Promise.resolve(getCleanBodyClone().innerText);
+      return Promise.resolve(getCleanBodyHtml().innerText);
   }
 
   case "getFullHtml": {
-      return Promise.resolve(getCleanBodyClone().innerHTML);
+      return Promise.resolve(getCleanBodyHtml().innerHTML);
   }
 
   case "getOnlyTypedText": {
diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index 71f876b3..985b9d44 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -272,15 +272,15 @@ export function htmlBodyToPlainText(htmlString) {
 }
 
 export function removeMozMainHeader(root) {
-  const table = root.querySelector('table.moz-main-header');
-  if (!table) return;
-  let sibling = table.previousElementSibling;
-  while (sibling && sibling.tagName === 'DIV') {
-    const toRemove = sibling;
-    sibling = sibling.previousElementSibling;
-    toRemove.remove();
+  for (const table of root.querySelectorAll('table.moz-main-header')) {
+    let sibling = table.previousElementSibling;
+    while (sibling && sibling.tagName === 'DIV') {
+      const toRemove = sibling;
+      sibling = sibling.previousElementSibling;
+      toRemove.remove();
+    }
+    table.remove();
   }
-  table.remove();
 }
 
 export function cleanupNewlines(text) {

From 9f929ff0036921f2eae33158a811d9246a259d59 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 27 Mar 2026 23:01:09 +0100
Subject: [PATCH 14/25] release notes updated

---
 CHANGELOG.md                    | 3 +--
 options/mzta-release-notes.html | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3fdd455..f2bceb82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,10 @@
 
 
 
-<h2>Version 4.0.5 - ??/??/2026</h2>
+<h2>Version 4.0.5 - 27/03/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
         <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are now not present in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
-        <li>...</li>
       </ul>
 <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 96fdfd2b..98314f21 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,12 +7,11 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
-      <h2>Version 4.0.5 - ??/??/2026</h2>
+      <h2>Version 4.0.5 - 27/03/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
         <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are now not present in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
         <li><i>[All APIs]</i>The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
-        <li>...</li>
       </ul>
       <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>

From 9df3667e75fa64e4bfad2be6bd34474b3f688681 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 1 Apr 2026 23:00:27 +0200
Subject: [PATCH 15/25] version set to 4.0.6

---
 CHANGELOG.md                    | 4 ++++
 manifest.json                   | 2 +-
 options/mzta-release-notes.html | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2bceb82..3e76e7b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 
 
+<h2>Version 4.0.6 - ??/??/2026</h2>
+      <ul>
+        <li>...</li>
+      </ul>
 <h2>Version 4.0.5 - 27/03/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
diff --git a/manifest.json b/manifest.json
index 197f2cc1..729fb444 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "4.0.5",
+    "version": "4.0.6",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 98314f21..41e57144 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,6 +7,10 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
+      <h2>Version 4.0.6 - ??/??/2026</h2>
+      <ul>
+        <li>...</li>
+      </ul>
       <h2>Version 4.0.5 - 27/03/2026</h2>
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>

From da82fb0b6de8e166e2be992977b8501399eda94f Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 1 Apr 2026 23:03:34 +0200
Subject: [PATCH 16/25] normalizing also accented characters when creating new
 tags. see #732

---
 js/mzta-utils.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index 985b9d44..ab207bd5 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -517,6 +517,8 @@ function getTagsKeyFromLabel(tag_names, all_tags_list) {
 }
 
 function sanitizeString(input) {
+  // Replaces accented characters with their non-accented version
+  input = input.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
   // Define the regex to match valid characters
   const validChar = /^[^ ()/{%*<>"]+$/;
   // Filter out invalid characters from the string

From a87420c1552f27eddd4bd7464ad3a7e9e99d855e Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 1 Apr 2026 23:05:37 +0200
Subject: [PATCH 17/25] release notes updated

---
 CHANGELOG.md                    | 4 ++--
 options/mzta-release-notes.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e76e7b0..013130f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,9 @@
 
 
 
-<h2>Version 4.0.6 - ??/??/2026</h2>
+<h2>Version 4.0.6 - 01/04/2026</h2>
       <ul>
-        <li>...</li>
+        <li>Fix: Now it's possibile to create a tag also with accented characters in the label [<a href="https://github.com/micz/ThunderAI/issues/738">#738</a>].</li>
       </ul>
 <h2>Version 4.0.5 - 27/03/2026</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 41e57144..ef6ce82b 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,9 +7,9 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
-      <h2>Version 4.0.6 - ??/??/2026</h2>
+      <h2>Version 4.0.6 - 01/04/2026</h2>
       <ul>
-        <li>...</li>
+        <li>Fix: Now it's possibile to create a tag also with accented characters in the label [<a href="https://github.com/micz/ThunderAI/issues/738">#738</a>].</li>
       </ul>
       <h2>Version 4.0.5 - 27/03/2026</h2>
       <ul>

From 742034ce82ce45dda16297cae8ce61aa4f8e51ae Mon Sep 17 00:00:00 2001
From: Mic <micz@users.noreply.github.com>
Date: Wed, 1 Apr 2026 23:40:48 +0200
Subject: [PATCH 18/25] Add documentation section to README

Added documentation section with setup guides and custom prompt tutorial links.
---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 5ece8058..8993019a 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,14 @@ Using an API integration, you can activate some automatic features:
 
 
 
+<br>
+
+## Documentation
+
+[Setup Guides](https://micz.it/thunderbird-addon-thunderai/guides/) - Step-by-step guides to connect ThunderAI to the AI backend of your choice, from ChatGPT to local models with Ollama.
+
+[Custom Prompt Tutorial](https://micz.it/thunderbird-addon-thunderai/tutorial/) - Learn how to build your first custom prompt from scratch, combining placeholders and user input to automate your email replies.
+
 <br>
 
 ## Translations
@@ -67,6 +75,8 @@ Do you want to help translate this addon?
 
 [Find out how!](https://micz.it/thunderbird-addon-thunderai/translate/)
 
+
+
 <br>
 
 ## Changelog

From b17d094d0c3082758e36981f292381c991fb1dd7 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 6 Apr 2026 00:15:32 +0200
Subject: [PATCH 19/25] the trigger "edited" removed from the workflow.

---
 .github/workflows/prerelease_comment_issue.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prerelease_comment_issue.yml b/.github/workflows/prerelease_comment_issue.yml
index aca32a21..1edcfe10 100644
--- a/.github/workflows/prerelease_comment_issue.yml
+++ b/.github/workflows/prerelease_comment_issue.yml
@@ -2,7 +2,7 @@ name: pre-release comment issues
 
 on:
   release:
-    types: [published, edited]
+    types: [published]
 
 concurrency:
   group: ${{ github.workflow }}

From a92d2f4c551da4baebbc47ee20039d5ccc99f3c9 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 6 Apr 2026 23:06:59 +0200
Subject: [PATCH 20/25] HTML title removed because Thunderbird is setting its
 title and then changing it after the windows creation and we are already
 doing that see 
 https://github.com/micz/ThunderAI/issues/696#issuecomment-4190953876

---
 api_webchat/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api_webchat/index.html b/api_webchat/index.html
index 509c7017..4e5bfff3 100644
--- a/api_webchat/index.html
+++ b/api_webchat/index.html
@@ -3,7 +3,6 @@
 <head>
     <!-- Other meta tags and stylesheets -->
     <link rel="stylesheet" type="text/css" href="styles.css">
-    <title>ThunderAI Assistant</title>
 </head>
 <body>
     <!-- Use the custom tags directly -->

From fbedb7dfd986253f4201cb86b123a6a2585040d9 Mon Sep 17 00:00:00 2001
From: Mic <micz@users.noreply.github.com>
Date: Thu, 9 Apr 2026 21:28:29 +0200
Subject: [PATCH 21/25] Add ThunderAI Prompt Architect link to README

Added a section for ThunderAI Prompt Architect with attribution.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8993019a..f1c400de 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,8 @@ Using an API integration, you can activate some automatic features:
 
 [Custom Prompt Tutorial](https://micz.it/thunderbird-addon-thunderai/tutorial/) - Learn how to build your first custom prompt from scratch, combining placeholders and user input to automate your email replies.
 
+[ThunderAI Prompt Architect](https://chatgpt.com/g/g-69b6b11c89b88191a6798be6e97025f1-thunder-ai-prompt-architect) - Let ChatGPT help you crafting your custom prompts. Thanks to [Paweł](https://github.com/PawelKinczyk) for this tool!
+
 <br>
 
 ## Translations

From b235005911b53e7bfb211e570ca8c6dd17f0cb6c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 10 Apr 2026 23:36:21 +0200
Subject: [PATCH 22/25] release notes fixed

---
 CHANGELOG.md                    | 1 +
 options/mzta-release-notes.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 013130f7..0cead8df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
         <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are now not present in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
+        <li><i>[All APIs]</i> The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
       </ul>
 <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index ef6ce82b..6eee8f00 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -15,7 +15,7 @@
       <ul>
         <li>Fix: HTML part of the mail body used in prompt is displayed as HTML code and it is not rendered. This a display fix, there is no change on how the prompt is sent to the AI [<a href="https://github.com/micz/ThunderAI/issues/711">#711</a>].</li>
         <li>Fix: HTML elements added by ThunderAI (like the antispam banner) are now not present in HTML or text data placeholders [<a href="https://github.com/micz/ThunderAI/issues/710">#710</a>].</li>
-        <li><i>[All APIs]</i>The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
+        <li><i>[All APIs]</i> The API webchat window now has a dynamic title [<a href="https://github.com/micz/ThunderAI/issues/696">#696</a>]</li>
       </ul>
       <h2>Version 4.0.4 - 26/03/2026</h2>
       <ul>

From 8522f0b7f6c86ba26e525211e5d18a9eb8c64f1f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Sun, 12 Apr 2026 22:10:00 +0200
Subject: [PATCH 23/25] improved multipart html body decoding

---
 js/mzta-utils.js   | 44 +++++++++++++++++++++++++++++---------------
 mzta-background.js |  4 ++--
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index ab207bd5..e86927a1 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -145,38 +145,52 @@ export async function getMailSubject(tab){
 }
 
 function extractTextParts(fullMessage) {
-  const textParts = [];
-
+  const textParts = []
   function walkParts(parts) {
     for (const part of parts) {
       if (part.parts && part.parts.length > 0) {
-        // Recursively walk through sub-parts
-        walkParts(part.parts);
-      } else {
-        // Check if contentType starts with "text/"
-        if (part.contentType && part.contentType.startsWith("text/")) {
-          textParts.push(part);
-        }
+        walkParts(part.parts)
+      }
+      // console.log(">>>>>>>>>>>> extractTextParts: part.contentType: " + part.contentType + ", part.decryptionStatus: " + part.decryptionStatus + ", part.body: " + part.body);
+      if (part.contentType && part.contentType.startsWith('text/')) {
+        textParts.push(part)
       }
     }
   }
-
   if (fullMessage.parts && fullMessage.parts.length > 0) {
-    walkParts(fullMessage.parts);
+    walkParts(fullMessage.parts)
   }
+  return textParts
+}
 
-  return textParts;
+function smartDecode(buf) {
+  try {
+    return new TextDecoder('utf-8', { fatal: true }).decode(buf);
+  } catch (e) {
+    return new TextDecoder('windows-1252').decode(buf);
+  }
 }
   
-export function getMailBody(fullMessage){
+export async function getMailBody(fullMessage, messageId) {
   const textParts = extractTextParts(fullMessage);
   let text = "";
   let html = "";
+  // console.log(">>>>>>>>>>>>>> getMailBody: textParts: " + JSON.stringify(textParts));
+  // console.log(">>>>>>>>>>>>>> getMailBody: fullMessage: " + JSON.stringify(fullMessage));
   for (const part of textParts) {
+    let body = part.body;
+    if ((body === undefined || body === "") && messageId && part.partName) {
+      const file = await browser.messages.getAttachmentFile(messageId, part.partName);
+      const buf = await file.arrayBuffer();
+      //const buf = new TextDecoder('utf-8').decode(buf);
+      body = smartDecode(buf);
+    }
     if (part.contentType === "text/plain") {
-      text += part.body;
+      // console.log(">>>>>>>>>>>>>> getMailBody: part.body (TEXT): " + body);
+      text += body ?? "";
     } else if (part.contentType === "text/html") {
-      html += part.body;
+      // console.log(">>>>>>>>>>>>>> getMailBody: part.body (HTML): " + (body ? body.substring(0, 80) : body));
+      html += body ?? "";
     }
   }
   if(html === "") {
diff --git a/mzta-background.js b/mzta-background.js
index 7c901ac3..a6d4e840 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -1113,7 +1113,7 @@ async function processEmails(args) {
     
             if (addTagsAuto || spamFilter) {
                 curr_fullMessage = await browser.messages.getFull(message.id);
-                msg_text = getMailBody(curr_fullMessage);
+                msg_text = await getMailBody(curr_fullMessage);
                 taLog.log("Starting from the HTML body if present and converting to plain text...");
                 body_text = htmlBodyToPlainText(msg_text.html);
                 if( body_text.length == 0 ){
@@ -1283,7 +1283,7 @@ async function processEmails(args) {
           
             // extract body of current message as text
             const curr_message_full = await browser.messages.getFull(curr_message.id);
-            const curr_body_full_html = getMailBody(curr_message_full);
+            const curr_body_full_html = await getMailBody(curr_message_full);
             let curr_body_full_text = htmlBodyToPlainText(curr_body_full_html.html);
             if( curr_body_full_text.length === 0) {
                 taLog.log("No HTML found in the message body, using plain text...");

From 4d145db2820bdc3a7fbf3b7fe363bbc08ed51ec9 Mon Sep 17 00:00:00 2001
From: Mic <micz@users.noreply.github.com>
Date: Fri, 17 Apr 2026 00:09:25 +0200
Subject: [PATCH 24/25] Fix formatting for Swedish translation entry

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f1c400de..153853d4 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ Are you using this addon in your Thunderbird?
 - Polish - Polski (pl): [neexpl](https://github.com/neexpl), [makkacprzak](https://github.com/makkacprzak) <img src="https://micz.it/weblate/thunderai/pl.svg">
 - Russian - Russkiy (русский) (ru): [Maksim](https://hosted.weblate.org/user/law820314/) <img src="https://micz.it/weblate/thunderai/ru.svg">
 - Spanish - Español (es): [Gerardo Sobarzo](https://hosted.weblate.org/user/gerardo.sobarzo/), [Andrés Rendón Hernández](https://hosted.weblate.org/user/arendon/), [Erick Limon](https://hosted.weblate.org/user/ErickLimonG/) <img src="https://micz.it/weblate/thunderai/es.svg">
-- Swedish - Svenska (sv): [Andreas Pettersson](https://hosted.weblate.org/user/Andy_tb/) , [Luna Jernberg](https://hosted.weblate.org/user/bittin1ddc447d824349b2/) <img src="https://micz.it/weblate/thunderai/sv.svg">
+- Swedish - Svenska (sv): [Andreas Pettersson](https://hosted.weblate.org/user/Andy_tb/), [Luna Jernberg](https://hosted.weblate.org/user/bittin1ddc447d824349b2/) <img src="https://micz.it/weblate/thunderai/sv.svg">
 <br>
 
 Do you want to help translate this addon? [Find out how!](https://micz.it/thunderbird-addon-thunderai/translate/)  <br>

From d007ed37e904d9ce257c407d1ac5b42a05cc1fa3 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 17 Apr 2026 22:11:07 +0200
Subject: [PATCH 25/25] version set to 4.0.7. release notes updated

---
 CHANGELOG.md                    | 4 ++++
 manifest.json                   | 2 +-
 options/mzta-release-notes.html | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cead8df..6f54d221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 
 
+<h2>Version 4.0.7 - 17/04/2026</h2>
+      <ul>
+        <li>Fix: Correctly parsing the body of HTML base64 encoded mails [<a href="https://github.com/micz/ThunderAI/issues/757">#757</a>].</li>
+      </ul>
 <h2>Version 4.0.6 - 01/04/2026</h2>
       <ul>
         <li>Fix: Now it's possibile to create a tag also with accented characters in the label [<a href="https://github.com/micz/ThunderAI/issues/738">#738</a>].</li>
diff --git a/manifest.json b/manifest.json
index 729fb444..7d79fe89 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "4.0.6",
+    "version": "4.0.7",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 6eee8f00..71f83017 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,6 +7,10 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
+      <h2>Version 4.0.7 - 17/04/2026</h2>
+      <ul>
+        <li>Fix: Correctly parsing the body of HTML base64 encoded mails [<a href="https://github.com/micz/ThunderAI/issues/757">#757</a>].</li>
+      </ul>
       <h2>Version 4.0.6 - 01/04/2026</h2>
       <ul>
         <li>Fix: Now it's possibile to create a tag also with accented characters in the label [<a href="https://github.com/micz/ThunderAI/issues/738">#738</a>].</li>