From b7565cc4d14400643faf2d2871824ce1c40f72c1 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Apr 2025 22:16:52 +0200
Subject: [PATCH 01/33] Fix JSON stringification of original text in
 openChatGPT function. see #344

---
 mzta-background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mzta-background.js b/mzta-background.js
index 1e027f32..035de46d 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -366,7 +366,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
                 let mztaGPTModel="`+ _gpt_model +`";
                 let mztaDoDebug="`+(prefs.do_debug?'1':'0')+`";
                 let mztaUseDiffViewer="`+(prompt_info.use_diff_viewer=='1'?'1':'0')+`";
-                let mztaOriginalText="`+ originalText +`";
+                let mztaOriginalText="`+ JSON.stringify(originalText).slice(1, -1) +`";
                 `;
 
                 taLog.log("Waiting 1 sec");

From ed666cfd872947bb1074c1d17e37ba6ee3ef78ee Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Apr 2025 22:18:36 +0200
Subject: [PATCH 02/33] Version set to 3.3.4. Updated release notes for version
 3.3.4

---
 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 0b5aee93..2f63f2b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 
 
+<h2>Version 3.3.4 - 14/04/2025</h2>
+      <ul>
+        <li><i>[ChatGPT Web]</i> Fixed a blocking error with the " character in the mail text [<a href="https://github.com/micz/ThunderAI/issues/344">#344</a>].</li>
+      </ul>
 <h2>Version 3.3.3 - 12/04/2025</h2>
       <ul>
         <li><i>[All APIs]</i> Fix: Correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
diff --git a/manifest.json b/manifest.json
index bbad17cc..b332bc2f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "3.3.3",
+    "version": "3.3.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 f14c18b2..a06bc728 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 3.3.4 - 14/04/2025</h2>
+      <ul>
+        <li><i>[ChatGPT Web]</i> Fixed a blocking error with the " character in the mail text [<a href="https://github.com/micz/ThunderAI/issues/344">#344</a>].</li>
+      </ul>
       <h2>Version 3.3.3 - 12/04/2025</h2>
       <ul>
         <li><i>[All APIs]</i> Fix: Correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>

From a05cb2d4d77c62d861cf6ac62c685c9e3b237adf Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:29:00 +0200
Subject: [PATCH 03/33] Implement dynamic rendering of ChatGPT web model
 options in settings

---
 options/mzta-options.html |  2 +-
 options/mzta-options.js   | 62 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/options/mzta-options.html b/options/mzta-options.html
index 0423168f..cd835aab 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -123,7 +123,7 @@
       <tr class="conntype_chatgpt_web">
         <td><label>
           <span>__MSG_prefs_OptionText_chatgpt_web_model__</span>
-          <br><table title="__MSG_prefs_OptionText_chatgpt_web_model_tooltip__"><tr><td><i class="small_info"><nobr>__MSG_AllowedValues__:</nobr></i></td><td><i class="small_info"> &nbsp; <nobr class="conntype_chatgpt_web_option">gpt-4o</nobr> &nbsp; <nobr class="conntype_chatgpt_web_option">gpt-4o-mini</nobr> &nbsp; <nobr class="conntype_chatgpt_web_option">gpt-4</nobr> &nbsp; <nobr class="conntype_chatgpt_web_option">o1</nobr> &nbsp; <nobr class="conntype_chatgpt_web_option">o3-mini</nobr> &nbsp; <nobr class="conntype_chatgpt_web_option">o3-mini-high</nobr></i></td></tr></table>
+          <br><table title="__MSG_prefs_OptionText_chatgpt_web_model_tooltip__"><tr id="chatgpt_web_models_list"></tr></table>
         </label></td>
         <td>
           <label>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index 19994820..a4b58b39 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -28,6 +28,8 @@ let taLog = new taLogger("mzta-options",true);
 let _isThunderbird128OrGreater = true;
 let permission_all_urls = false;
 
+const ChatGPTWeb_models = ['gpt-4o', 'gpt-4o-mini', 'gpt-4', 'o1', 'o3-mini', 'o3-mini-high'];
+
 function saveOptions(e) {
   e.preventDefault();
   let options = {};
@@ -309,6 +311,48 @@ async function disable_GetCalendarEvent(){
   no_sparks_tr.style.display = (is_spark_present || (conntype_select.value === "chatgpt_web")) ? 'none' : 'table-row';
 }
 
+
+function getChatGPTWebModelsList_HTML(values, targetRowId) {
+  const rowElement = document.getElementById(targetRowId);
+  if (!rowElement) return;
+
+  // Clears any existing td elements
+  rowElement.innerHTML = '';
+
+  // First TD: label
+  const labelTd = document.createElement('td');
+  const label = document.createElement('i');
+  label.className = 'small_info';
+  const labelNobr = document.createElement('nobr');
+  labelNobr.textContent = browser.i18n.getMessage("AllowedValues") + ":";
+  label.appendChild(labelNobr);
+  labelTd.appendChild(label);
+
+  // Second TD: values
+  const valuesTd = document.createElement('td');
+  const valuesContainer = document.createElement('i');
+  valuesContainer.className = 'small_info';
+
+  values.forEach(value => {
+    const nbspBefore = document.createTextNode(' \u00A0 '); // " &nbsp; "
+    const valueNobr = document.createElement('nobr');
+    valueNobr.className = 'conntype_chatgpt_web_option';
+    valueNobr.textContent = value;
+    const nbspAfter = document.createTextNode(' \u00A0 ');
+
+    valuesContainer.appendChild(nbspBefore);
+    valuesContainer.appendChild(valueNobr);
+    valuesContainer.appendChild(nbspAfter);
+  });
+
+  valuesTd.appendChild(valuesContainer);
+
+  // Adds the td elements to the row
+  rowElement.appendChild(labelTd);
+  rowElement.appendChild(valuesTd);
+}
+  
+
 document.addEventListener('DOMContentLoaded', async () => {
   await restoreOptions();
 
@@ -327,14 +371,7 @@ document.addEventListener('DOMContentLoaded', async () => {
   document.querySelectorAll(".option-input").forEach(element => {
     element.addEventListener("change", saveOptions);
   });
-  document.querySelectorAll(".conntype_chatgpt_web_option").forEach(element => {
-    element.addEventListener("click", () => {
-      let el = document.getElementById("chatgpt_web_model");
-      el.value = element.textContent;
-      el.dispatchEvent(new Event('change'), { bubbles: true });
-    });
-  });
-
+  
   let addtags_el = document.getElementById('add_tags');
   let addtags_info_btn = document.getElementById('btnManageTagsInfo');
   addtags_el.addEventListener('click', (event) => {
@@ -456,6 +493,15 @@ document.addEventListener('DOMContentLoaded', async () => {
     permission_all_urls = await messenger.permissions.request({ origins: ["<all_urls>"] });
   });
 
+  getChatGPTWebModelsList_HTML(ChatGPTWeb_models, 'chatgpt_web_models_list');
+  document.querySelectorAll(".conntype_chatgpt_web_option").forEach(element => {
+    element.addEventListener("click", () => {
+      let el = document.getElementById("chatgpt_web_model");
+      el.value = element.textContent;
+      el.dispatchEvent(new Event('change'), { bubbles: true });
+    });
+  });
+
   let conntype_select = document.getElementById("connection_type");
   conntype_select.addEventListener("change", showConnectionOptions);
   conntype_select.addEventListener("change", warn_ChatGPT_APIKeyEmpty);

From f61791d58b0b9f70789939229c8ccedcd06e983f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:29:00 +0200
Subject: [PATCH 04/33] version set to 3.3.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 2f63f2b3..fff255f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 
 
+<h2>Version 3.3.5 - ??/??/2025</h2>
+      <ul>
+        <li>...</li>
+      </ul>
 <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Fixed a blocking error with the " character in the mail text [<a href="https://github.com/micz/ThunderAI/issues/344">#344</a>].</li>
diff --git a/manifest.json b/manifest.json
index b332bc2f..f41ec9ab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "3.3.4",
+    "version": "3.3.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 a06bc728..be3ba46c 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 3.3.5 - ??/??/2025</h2>
+      <ul>
+        <li>...</li>
+      </ul>
       <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Fixed a blocking error with the " character in the mail text [<a href="https://github.com/micz/ThunderAI/issues/344">#344</a>].</li>

From a598485bcbdac521b7e96b625b71214fbda2ba89 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:34:00 +0200
Subject: [PATCH 05/33] ChatGPT web models list updated

---
 options/mzta-options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/mzta-options.js b/options/mzta-options.js
index a4b58b39..b73b41e0 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -28,7 +28,7 @@ let taLog = new taLogger("mzta-options",true);
 let _isThunderbird128OrGreater = true;
 let permission_all_urls = false;
 
-const ChatGPTWeb_models = ['gpt-4o', 'gpt-4o-mini', 'gpt-4', 'o1', 'o3-mini', 'o3-mini-high'];
+const ChatGPTWeb_models = ['gpt-4o', 'o3', 'o4-mini', 'o4-mini-high', 'gpt-4o-mini'];
 
 function saveOptions(e) {
   e.preventDefault();

From 80061c84b07e158b106f2f3dbdf60a3f2a90b30f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:34:00 +0200
Subject: [PATCH 06/33] 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 fff255f1..d1594771 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,9 @@
 
 
 
-<h2>Version 3.3.5 - ??/??/2025</h2>
+<h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
-        <li>...</li>
+        <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
       </ul>
 <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index be3ba46c..3d287c90 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 3.3.5 - ??/??/2025</h2>
+      <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
-        <li>...</li>
+        <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
       </ul>
       <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>

From ea4a9a05853bf5d94a7c6866471d8e1b7f775587 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:49:00 +0200
Subject: [PATCH 07/33] Update preferences to include chatgpt_web_model and
 modify tab opening logic to append model parameter

---
 options/mzta-options.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/options/mzta-options.js b/options/mzta-options.js
index b73b41e0..2f319390 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -516,7 +516,7 @@ document.addEventListener('DOMContentLoaded', async () => {
   document.getElementById("openai_comp_host").addEventListener("change", warn_OpenAIComp_HostEmpty);
   document.getElementById("google_gemini_api_key").addEventListener("change", warn_GoogleGemini_APIKeyEmpty);
 
-  let prefs = await browser.storage.sync.get({chatgpt_model: '', ollama_model: '', openai_comp_model: '', google_gemini_model: '', chatgpt_win_height: 0, chatgpt_win_width: 0 });
+  let prefs = await browser.storage.sync.get({chatgpt_web_model: '', chatgpt_model: '', ollama_model: '', openai_comp_model: '', google_gemini_model: '', chatgpt_win_height: 0, chatgpt_win_width: 0 });
   
   // OpenAI API ChatGPT model fetching
   let select_chatgpt_model = document.getElementById('chatgpt_model');
@@ -740,8 +740,13 @@ document.addEventListener('DOMContentLoaded', async () => {
   });
 
   const btnChatGPTWeb_Tab = document.getElementById('btnChatGPTWeb_Tab');
-  btnChatGPTWeb_Tab.addEventListener('click', () => {
-    browser.tabs.create({ url: 'https://chatgpt.com/' });
+  btnChatGPTWeb_Tab.addEventListener('click', async () => {
+    let prefs_mod = await browser.storage.sync.get({chatgpt_web_model: ''});
+    let model_opt = '';
+    if((prefs_mod.chatgpt_web_model != '') && (prefs_mod.chatgpt_web_model != undefined)){
+      model_opt = '?model=' + encodeURIComponent(prefs_mod.chatgpt_web_model).toLowerCase();
+    }
+    browser.tabs.create({ url: 'https://chatgpt.com/' + model_opt });
   });
 
   browser.runtime.getPlatformInfo().then(info => {

From 3be8d24255b159eb793ec239d8740a606b873269 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:49:00 +0200
Subject: [PATCH 08/33] 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 d1594771..d9c1bd30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
+        <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
       </ul>
 <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 3d287c90..a762e1c0 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -10,6 +10,7 @@
       <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
+        <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
       </ul>
       <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>

From 5ccc3126957b6d47df8f7cdc440d858f3cfa9917 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Apr 2025 23:49:00 +0200
Subject: [PATCH 09/33] Refactor getGPTWebModelString function to update model
 conversion logic

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

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index 02009edd..e5a846a1 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -175,6 +175,8 @@ export function sanitizeHtml(input) {
   return input.replace(/<(?!br\s*\/?)[^>]+>/gi, '');
 }
 
+// This method is used to convert the model string id used in the URL
+// to the model string used in the webpage
 export function getGPTWebModelString(model) {
   model = model.toLowerCase().trim();
   switch (model) {
@@ -183,14 +185,6 @@ export function getGPTWebModelString(model) {
       return '4o';
     case 'gpt-4o-mini':
       return '4o mini';
-    case 'gpt-4':
-      return 'gpt-4';
-    case 'o1':
-      return 'o1';
-    case 'o3-mini':
-      return 'o3-mini';
-    case 'o3-mini-high':
-      return 'o3-mini-high';
     default:
       return model;
   }

From 904550f6e69e6b36db9e7f3d2f12f2353a1c9fc9 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 17 Apr 2025 21:25:14 +0200
Subject: [PATCH 10/33] Enhance placeholder replacement logic to ensure valid
 placeholders are used

---
 js/mzta-placeholders.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index d8f2079b..0ac39dad 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -263,8 +263,12 @@ export const placeholdersUtils = {
           if (skip_additional_text && (p1 === 'additional_text')) {
             return match;
           }
+          const currPlaceholder = defaultPlaceholders.find(ph => ph.id === p1);
+          if (!currPlaceholder) {
+            return match;
+          }
           // Replace if found, otherwise keep the original or substitute with default value
-          return replacements[p1] || (use_default_value ? defaultPlaceholders.find(ph => ph.id === p1).default_value : match);
+          return replacements[p1] || (use_default_value ? currPlaceholder.default_value : match);
         });
     },
 

From 6494a4f48f3218d03e390e16aac79a9aeffb8cfe Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 18 Apr 2025 14:02:25 +0200
Subject: [PATCH 11/33] Refactor getMailBody function to work also with
 annidated multiparts. see #335

---
 js/mzta-utils.js   | 58 +++++++++++++++++++++++-----------------------
 mzta-background.js |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index e5a846a1..23142a85 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -108,41 +108,41 @@ export async function getMailSubject(tab){
   }
 }
 
-export async function getMailBody(fullMessage){
-  let text = '';
-  let html = '';
+function extractTextParts(fullMessage) {
+  const textParts = [];
 
-  // console.log(">>>>>>>>>> fullMessage.contentType.trim().toLowerCase(): " + fullMessage.contentType.trim().toLowerCase());
-  // console.log(">>>>>>>>>> fullMessage.body: " + fullMessage.body);
-
-  if (fullMessage.contentType.trim().toLowerCase() === "text/plain") {
-    text = fullMessage.body;
-  }
-  if (fullMessage.contentType.trim().toLowerCase() === "text/html") {
-    html = fullMessage.body;
-  }
-
-  if((text == undefined || text == null || text == '') && (html == undefined || html == null || html == '')) {
-    for (let part of fullMessage.parts) {
-      if (part.contentType.trim().toLowerCase() === "text/plain") {
-        text = part.body;
-      }
-      if (part.contentType.trim().toLowerCase() === "text/html") {
-        html = part.body;
-      }
-      if((text == undefined || text == null || text == '') && (html == undefined || html == null || html == '')) {
-        for (let subpart of part.parts) {
-          if (subpart.contentType.trim().toLowerCase() === "text/plain") {
-            text = subpart.body;
-          }
-          if (subpart.contentType.trim().toLowerCase() === "text/html") {
-            html = subpart.body;
-          }
+  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);
         }
       }
     }
   }
+
+  if (fullMessage.parts && fullMessage.parts.length > 0) {
+    walkParts(fullMessage.parts);
+  }
+
+  return textParts;
+}
   
+export function getMailBody(fullMessage){
+  const textParts = extractTextParts(fullMessage);
+  let text = "";
+  let html = "";
+  for (const part of textParts) {
+    if (part.contentType === "text/plain") {
+      text += part.body;
+    } else if (part.contentType === "text/html") {
+      html += part.body;
+    }
+  }
   return {text, html};
 }
 
diff --git a/mzta-background.js b/mzta-background.js
index 035de46d..aaeaa2fc 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -808,7 +808,7 @@ async function processEmails(messages, addTagsAuto, spamFilter) {
 
         if (addTagsAuto || spamFilter) {
             curr_fullMessage = await browser.messages.getFull(message.id);
-            msg_text = await getMailBody(curr_fullMessage);
+            msg_text = getMailBody(curr_fullMessage);
             body_text = msg_text.text.replace(/\s+/g, ' ').trim();
         }
 

From a14a15307990ed7393adc2cbd05788cbe8d8b583 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Fri, 18 Apr 2025 14:05:47 +0200
Subject: [PATCH 12/33] release notes updated

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9c1bd30..b8c565c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
       <ul>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
+        <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
+        <li>Minor improvements.</li>
       </ul>
 <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index a762e1c0..87ffd466 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -11,6 +11,8 @@
       <ul>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
+        <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
+        <li>Minor improvements.</li>
       </ul>
       <h2>Version 3.3.4 - 14/04/2025</h2>
       <ul>

From d49e6d65e78b0fbe47493ae867437817d78e703d Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 20 Apr 2025 22:15:10 +0200
Subject: [PATCH 13/33] a "do_reply" from the compose window is changed in a
 "substitute text". see #353

---
 api_webchat/messagesArea.js | 5 ++++-
 js/mzta-chatgpt.js          | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api_webchat/messagesArea.js b/api_webchat/messagesArea.js
index 56148817..186c0ec2 100644
--- a/api_webchat/messagesArea.js
+++ b/api_webchat/messagesArea.js
@@ -232,6 +232,9 @@ class MessagesArea extends HTMLElement {
         const fullTextHTMLAtAssignment = this.fullTextHTML.trim().replace(/^"|"$/g, '').replace(/^<p>&quot;/, '<p>').replace(/&quot;<\/p>$/, '</p>'); // strip quotation marks
         //console.log(">>>>>>>>>>>> fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
         actionButton.addEventListener('click', async () => {
+            if(promptData.mailMessageId == -1) {    // we are using the reply from the compose window!
+                promptData.action = "2"; // replace text
+            }
             switch(promptData.action) {
                 case "1":     // do reply
                     // console.log("[ThunderAI] (do reply) fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
@@ -239,7 +242,7 @@ class MessagesArea extends HTMLElement {
                     browser.runtime.sendMessage({command: "chatgpt_close", window_id: (await browser.windows.getCurrent()).id});
                     break;
                 case "2":     // replace text
-                    // console.log("[ThunderAI] (replace text) fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
+                     console.log("[ThunderAI] (replace text) fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
                     await browser.runtime.sendMessage({command: "chatgpt_replaceSelectedText", text: fullTextHTMLAtAssignment, tabId: promptData.tabId, mailMessageId: promptData.mailMessageId});
                     browser.runtime.sendMessage({command: "chatgpt_close", window_id: (await browser.windows.getCurrent()).id});
                     break;
diff --git a/js/mzta-chatgpt.js b/js/mzta-chatgpt.js
index 9325e146..9bfc2f5e 100644
--- a/js/mzta-chatgpt.js
+++ b/js/mzta-chatgpt.js
@@ -647,6 +647,9 @@ browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
             current_message = message;
             current_tabId = message.tabId;
             current_mailMessageId = message.mailMessageId;
+            if(current_mailMessageId == -1) {    // we are using the reply from the compose window!
+                current_action = '2'; // replace text
+            }
             run();
             break;
         case "chatgpt_alive":

From c15fcb466e49a67f34c340f9be5899c9f8317620 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 20 Apr 2025 22:16:20 +0200
Subject: [PATCH 14/33] 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 b8c565c3..cd705150 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
+        <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text" [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 87ffd466..63e91627 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -9,6 +9,7 @@
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
       <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
+        <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text" [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>

From 70e89e52d2cb066dc1b8922187bef2f63b602545 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 20 Apr 2025 22:25:34 +0200
Subject: [PATCH 15/33] Add option for composing emails in plain text format.
 see #350

---
 _locales/en/messages.json       |  8 ++++++++
 options/mzta-options-default.js |  1 +
 options/mzta-options.html       | 11 +++++++++++
 3 files changed, 20 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0bc539b2..b111175c 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1270,5 +1270,13 @@
   "CORS_give_allurls_perm": {
     "message": "Give \"all URLs\" permission",
     "description": ""
+  },
+  "prefs_OptionText_composing_plain_text": {
+    "message": "Composing in plain text",
+    "description": ""
+  },
+  "prefs_OptionText_composing_plain_text_Info": {
+    "message": "Check this option if you're composing the emails in plain text format.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index 573d2085..62dda293 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -22,6 +22,7 @@ export const prefs_default = {
     chatgpt_win_width: 700,
     default_chatgpt_lang: '',
     default_sign_name: '',
+    composing_plain_text: false,
     connection_type: 'chatgpt_web',     //Other values: 'chatgpt_api', 'ollama_api', 'openai_comp_api', 'google_gemini_api'
     chatgpt_web_model: '',
     chatgpt_web_tempchat: false,
diff --git a/options/mzta-options.html b/options/mzta-options.html
index cd835aab..7d49c0fe 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -101,6 +101,17 @@
           </label>
         </td>
       </tr>
+      <tr>
+        <td><label>
+          <span>__MSG_prefs_OptionText_composing_plain_text__</span>
+        </label></td>
+        <td>
+          <label>
+            <input type="checkbox" id="composing_plain_text" name="composing_plain_text" class="option-input" />
+            &nbsp;<span>__MSG_prefs_OptionText_composing_plain_text_info__</span>
+          </label>
+        </td>
+      </tr>
       <tr>
         <td>
           <label>

From 7d1760f1b828fc97c973fe164af94e5b9c234c61 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 20 Apr 2025 22:43:10 +0200
Subject: [PATCH 16/33] Enhance plain text handling by integrating default
 preferences and adding HTML stripping functionality. see #350

---
 api_webchat/controller.js   | 13 +++++++++----
 api_webchat/messagesArea.js | 12 +++++++++++-
 js/mzta-utils.js            | 10 ++++++++++
 mzta-background.js          |  9 ++++++---
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index ec23e569..06d3e79e 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -21,6 +21,7 @@
  */
 
 import { placeholdersUtils } from '../js/mzta-placeholders.js';
+import { prefs_default } from '../options/mzta-options-default.js';
 
 // Get the LLM to be used
 const urlParams = new URLSearchParams(window.location.search);
@@ -66,48 +67,52 @@ messageInput.setMessagesArea(messagesArea);
 
 switch (llm) {
     case "chatgpt_api": {
-        let prefs_api = await browser.storage.sync.get({chatgpt_api_key: '', chatgpt_model: '', chatgpt_developer_messages:'', do_debug: false});
+        let prefs_api = await browser.storage.sync.get({chatgpt_api_key: prefs_default.chatgpt_api_key, chatgpt_model: prefs_default.chatgpt_model, chatgpt_developer_messages:prefs_default.chatgpt_developer_messages, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
         let i18nStrings = {};
         i18nStrings["chatgpt_api_request_failed"] = browser.i18n.getMessage('chatgpt_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.chatgpt_model);
         messagesArea.setLLMName("ChatGPT");
+        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', chatgpt_api_key: prefs_api.chatgpt_api_key, chatgpt_model: prefs_api.chatgpt_model, chatgpt_developer_messages: prefs_api.chatgpt_developer_messages, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("chagpt_api_connecting") + " " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.chatgpt_model + "\"...", "info");
         browser.runtime.sendMessage({command: "openai_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         break;
     }
     case "google_gemini_api": {
-        let prefs_api = await browser.storage.sync.get({google_gemini_api_key: '', google_gemini_model: '', google_gemini_system_instruction: '', do_debug: false});
+        let prefs_api = await browser.storage.sync.get({google_gemini_api_key: prefs_default.google_gemini_api_key, google_gemini_model: prefs_default.google_gemini_model, google_gemini_system_instruction: prefs_default.google_gemini_system_instruction, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
         let i18nStrings = {};
         i18nStrings["google_gemini_api_request_failed"] = browser.i18n.getMessage('google_gemini_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.google_gemini_model);
         messagesArea.setLLMName("Google Gemini");
+        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', google_gemini_api_key: prefs_api.google_gemini_api_key, google_gemini_model: prefs_api.google_gemini_model, google_gemini_system_instruction: prefs_api.google_gemini_system_instruction, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("google_gemini_api_connecting") + " " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.google_gemini_model + "\"...", "info");
         browser.runtime.sendMessage({command: "google_gemini_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         break;
     }
     case "ollama_api": {
-        let prefs_api = await browser.storage.sync.get({ollama_host: '', ollama_model: '', do_debug: false});
+        let prefs_api = await browser.storage.sync.get({ollama_host: prefs_default.ollama_host, ollama_model: prefs_default.ollama_model, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
         let i18nStrings = {};
         i18nStrings["ollama_api_request_failed"] = browser.i18n.getMessage('ollama_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.ollama_model);
         messagesArea.setLLMName("Ollama Local");
+        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', ollama_host: prefs_api.ollama_host, ollama_model: prefs_api.ollama_model, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         browser.runtime.sendMessage({command: "ollama_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         messagesArea.appendUserMessage(browser.i18n.getMessage("ollama_api_connecting") + " \"" + prefs_api.ollama_host + "\" " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.ollama_model + "\"...", "info");
         break;
     }
     case "openai_comp_api": {
-        let prefs_api = await browser.storage.sync.get({openai_comp_host: '', openai_comp_model: '', openai_comp_api_key: '', openai_comp_use_v1: true, openai_comp_chat_name: '', do_debug: false});
+        let prefs_api = await browser.storage.sync.get({openai_comp_host: prefs_default.openai_comp_host, openai_comp_model: prefs_default.openai_comp_model, openai_comp_api_key: prefs_default.openai_comp_api_key, openai_comp_use_v1: prefs_default.openai_comp_use_v1, openai_comp_chat_name: prefs_default.openai_comp_chat_name, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
         let i18nStrings = {};
         i18nStrings["OpenAIComp_api_request_failed"] = browser.i18n.getMessage('OpenAIComp_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.openai_comp_model);
         messagesArea.setLLMName(prefs_api.openai_comp_chat_name);
+        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', openai_comp_host: prefs_api.openai_comp_host, openai_comp_model: prefs_api.openai_comp_model, openai_comp_api_key: prefs_api.openai_comp_api_key, openai_comp_use_v1: prefs_api.openai_comp_use_v1, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("OpenAIComp_api_connecting") + " \"" + prefs_api.openai_comp_host + "\" " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.openai_comp_model + "\"...", "info");
         browser.runtime.sendMessage({command: "openai_comp_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
diff --git a/api_webchat/messagesArea.js b/api_webchat/messagesArea.js
index 186c0ec2..240875cf 100644
--- a/api_webchat/messagesArea.js
+++ b/api_webchat/messagesArea.js
@@ -20,6 +20,8 @@
  *  The original code has been released under the Apache License, Version 2.0.
  */
 
+import { stripHtmlKeepLines } from '../js/mzta-utils.js';
+
 const messagesAreaTemplate = document.createElement('template');
 
 const messagesAreaStyle = document.createElement('style');
@@ -118,6 +120,7 @@ class MessagesArea extends HTMLElement {
 
     fullTextHTML = "";
     llmName = "LLM";
+    plainTextMode = false;
 
     constructor() {
         super();
@@ -152,6 +155,10 @@ class MessagesArea extends HTMLElement {
         this.llmName = llmName;
     }
 
+    setPlainTextMode(plainTextMode) {
+        this.plainTextMode = plainTextMode;
+    }
+
     handleTokensDone(promptData = null) {
         this.flushAccumulatingMessage();
         this.addActionButtons(promptData);
@@ -229,7 +236,10 @@ class MessagesArea extends HTMLElement {
         actionButtons.classList.add('action-buttons');
         const actionButton = document.createElement('button');
         actionButton.textContent = browser.i18n.getMessage("apiwebchat_use_this_answer");
-        const fullTextHTMLAtAssignment = this.fullTextHTML.trim().replace(/^"|"$/g, '').replace(/^<p>&quot;/, '<p>').replace(/&quot;<\/p>$/, '</p>'); // strip quotation marks
+        let fullTextHTMLAtAssignment = this.fullTextHTML.trim().replace(/^"|"$/g, '').replace(/^<p>&quot;/, '<p>').replace(/&quot;<\/p>$/, '</p>'); // strip quotation marks
+        if(this.plainTextMode) {
+            fullTextHTMLAtAssignment = stripHtmlKeepLines(fullTextHTMLAtAssignment);
+        }
         //console.log(">>>>>>>>>>>> fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
         actionButton.addEventListener('click', async () => {
             if(promptData.mailMessageId == -1) {    // we are using the reply from the compose window!
diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index 23142a85..e02e6070 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -175,6 +175,16 @@ export function sanitizeHtml(input) {
   return input.replace(/<(?!br\s*\/?)[^>]+>/gi, '');
 }
 
+export function stripHtmlKeepLines(htmlString) {
+  // Replaces <p> tags with a newline at the beginning
+  // and removes all other HTML tags
+  return htmlString
+    .replace(/<p>/gi, '')                  // removes <p> tags
+    .replace(/<\/p>/gi, '\n')              // replaces </p> tags with newline
+    .replace(/<[^>]*>/g, '')               // removes any other HTML tags
+    .trim();                               // removes leading/trailing whitespace
+}
+
 // This method is used to convert the model string id used in the URL
 // to the model string used in the webpage
 export function getGPTWebModelString(model) {
diff --git a/mzta-background.js b/mzta-background.js
index aaeaa2fc..674ce236 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -20,7 +20,7 @@ import { mzta_script } from './js/mzta-chatgpt.js';
 import { prefs_default } from './options/mzta-options-default.js';
 import { mzta_Menus } from './js/mzta-menus.js';
 import { taLogger } from './js/mzta-logger.js';
-import { getCurrentIdentity, getOriginalBody, replaceBody, setBody, i18nConditionalGet, generateCallID, migrateCustomPromptsStorage, migrateDefaultPromptsPropStorage, getGPTWebModelString, getTagsList, createTag, assignTagsToMessage, checkIfTagExists, getActiveSpecialPromptsIDs, checkSparksPresence, getMessages, getMailBody, extractJsonObject, contextMenuID_AddTags, contextMenuID_Spamfilter } from './js/mzta-utils.js';
+import { getCurrentIdentity, getOriginalBody, replaceBody, setBody, i18nConditionalGet, generateCallID, migrateCustomPromptsStorage, migrateDefaultPromptsPropStorage, getGPTWebModelString, getTagsList, createTag, assignTagsToMessage, checkIfTagExists, getActiveSpecialPromptsIDs, checkSparksPresence, getMessages, getMailBody, extractJsonObject, contextMenuID_AddTags, contextMenuID_Spamfilter, stripHtmlKeepLines } from './js/mzta-utils.js';
 import { taPromptUtils } from './js/mzta-utils-prompt.js';
 import { mzta_specialCommand } from './js/mzta-special-commands.js';
 import { getSpamFilterPrompt } from './js/mzta-prompts.js';
@@ -200,9 +200,12 @@ messenger.runtime.onMessage.addListener((message, sender, sendResponse) => {
                 return _replaceSelectedText(message.tabId, message.text);
             case 'chatgpt_replyMessage':
                 async function _replyMessage(message) {
-                    const paragraphsHtmlString = message.text;
+                    let paragraphsHtmlString = message.text;
                     //console.log(">>>>>>>>>>>> paragraphsHtmlString: " + paragraphsHtmlString);
-                    let prefs = await browser.storage.sync.get({reply_type: 'reply_all'});
+                    let prefs = await browser.storage.sync.get({reply_type: prefs_default.reply_type, composing_plain_text: prefs_default.composing_plain_text});
+                    if(prefs.composing_plain_text){
+                        paragraphsHtmlString = stripHtmlKeepLines(paragraphsHtmlString);
+                    }
                     //console.log('reply_type: ' + prefs.reply_type);
                     let replyType = 'replyToAll';
                     if(prefs.reply_type === 'reply_sender'){

From 5fea9f985e2e706768e05e2fb0d404291d4c9c9c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 20 Apr 2025 22:44:26 +0200
Subject: [PATCH 17/33] updated release notes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd705150..4647a6f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text" [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
+        <li>Added an option when composing in plain text to remove the extra empty lines [<a href="https://github.com/micz/ThunderAI/issues/350">#350</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 63e91627..2e5ff5a2 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -10,6 +10,7 @@
       <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text" [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
+        <li>Added an option when composing in plain text to remove the extra empty lines [<a href="https://github.com/micz/ThunderAI/issues/350">#350</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>

From 81a1bfb9c8ec0e8c0bfd1be146ab923ce99212cb Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 21 Apr 2025 21:20:01 +0200
Subject: [PATCH 18/33] Add confirmation prompt for inserting AI response when
 no text is selected. See #353

---
 _locales/en/messages.json |  4 ++++
 js/mzta-compose-script.js | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0bc539b2..48b6b602 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1270,5 +1270,9 @@
   "CORS_give_allurls_perm": {
     "message": "Give \"all URLs\" permission",
     "description": ""
+  },
+  "Replace_No_Selected_Text": {
+    "message": "No text selected, would you like to insert the AI's response at the beginning of the email?",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index 13f93708..b0289e38 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -24,12 +24,19 @@ switch (message.command) {
 
   case "replaceSelectedText": {
     const selectedText = window.getSelection().toString();
+    let force_insert = false;
     if (selectedText === '') {
-      return Promise.resolve(false);
+      if(!confirm(browser.i18n.getMessage("Replace_No_Selected_Text"))) {
+        return Promise.resolve(false);
+      }else{
+        force_insert = true;
+      }
     }
     const sel = window.getSelection();
     if (!sel || sel.type !== "Range" || !sel.rangeCount) {
-      return Promise.resolve(false);
+      if(!force_insert) {
+        return Promise.resolve(false);
+      }
     }
     const r = sel.getRangeAt(0);
     r.deleteContents();

From 4f317556bc1e813e8af29f54c443200322761729 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 21 Apr 2025 21:29:34 +0200
Subject: [PATCH 19/33] Improved plain text mode. See #350

---
 api_webchat/controller.js   | 13 ++++---------
 api_webchat/messagesArea.js | 12 +-----------
 mzta-background.js          |  4 ++++
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index 06d3e79e..ec23e569 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -21,7 +21,6 @@
  */
 
 import { placeholdersUtils } from '../js/mzta-placeholders.js';
-import { prefs_default } from '../options/mzta-options-default.js';
 
 // Get the LLM to be used
 const urlParams = new URLSearchParams(window.location.search);
@@ -67,52 +66,48 @@ messageInput.setMessagesArea(messagesArea);
 
 switch (llm) {
     case "chatgpt_api": {
-        let prefs_api = await browser.storage.sync.get({chatgpt_api_key: prefs_default.chatgpt_api_key, chatgpt_model: prefs_default.chatgpt_model, chatgpt_developer_messages:prefs_default.chatgpt_developer_messages, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
+        let prefs_api = await browser.storage.sync.get({chatgpt_api_key: '', chatgpt_model: '', chatgpt_developer_messages:'', do_debug: false});
         let i18nStrings = {};
         i18nStrings["chatgpt_api_request_failed"] = browser.i18n.getMessage('chatgpt_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.chatgpt_model);
         messagesArea.setLLMName("ChatGPT");
-        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', chatgpt_api_key: prefs_api.chatgpt_api_key, chatgpt_model: prefs_api.chatgpt_model, chatgpt_developer_messages: prefs_api.chatgpt_developer_messages, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("chagpt_api_connecting") + " " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.chatgpt_model + "\"...", "info");
         browser.runtime.sendMessage({command: "openai_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         break;
     }
     case "google_gemini_api": {
-        let prefs_api = await browser.storage.sync.get({google_gemini_api_key: prefs_default.google_gemini_api_key, google_gemini_model: prefs_default.google_gemini_model, google_gemini_system_instruction: prefs_default.google_gemini_system_instruction, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
+        let prefs_api = await browser.storage.sync.get({google_gemini_api_key: '', google_gemini_model: '', google_gemini_system_instruction: '', do_debug: false});
         let i18nStrings = {};
         i18nStrings["google_gemini_api_request_failed"] = browser.i18n.getMessage('google_gemini_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.google_gemini_model);
         messagesArea.setLLMName("Google Gemini");
-        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', google_gemini_api_key: prefs_api.google_gemini_api_key, google_gemini_model: prefs_api.google_gemini_model, google_gemini_system_instruction: prefs_api.google_gemini_system_instruction, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("google_gemini_api_connecting") + " " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.google_gemini_model + "\"...", "info");
         browser.runtime.sendMessage({command: "google_gemini_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         break;
     }
     case "ollama_api": {
-        let prefs_api = await browser.storage.sync.get({ollama_host: prefs_default.ollama_host, ollama_model: prefs_default.ollama_model, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
+        let prefs_api = await browser.storage.sync.get({ollama_host: '', ollama_model: '', do_debug: false});
         let i18nStrings = {};
         i18nStrings["ollama_api_request_failed"] = browser.i18n.getMessage('ollama_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.ollama_model);
         messagesArea.setLLMName("Ollama Local");
-        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', ollama_host: prefs_api.ollama_host, ollama_model: prefs_api.ollama_model, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         browser.runtime.sendMessage({command: "ollama_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         messagesArea.appendUserMessage(browser.i18n.getMessage("ollama_api_connecting") + " \"" + prefs_api.ollama_host + "\" " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.ollama_model + "\"...", "info");
         break;
     }
     case "openai_comp_api": {
-        let prefs_api = await browser.storage.sync.get({openai_comp_host: prefs_default.openai_comp_host, openai_comp_model: prefs_default.openai_comp_model, openai_comp_api_key: prefs_default.openai_comp_api_key, openai_comp_use_v1: prefs_default.openai_comp_use_v1, openai_comp_chat_name: prefs_default.openai_comp_chat_name, do_debug: prefs_default.do_debug, composing_plain_text: prefs_default.composing_plain_text});
+        let prefs_api = await browser.storage.sync.get({openai_comp_host: '', openai_comp_model: '', openai_comp_api_key: '', openai_comp_use_v1: true, openai_comp_chat_name: '', do_debug: false});
         let i18nStrings = {};
         i18nStrings["OpenAIComp_api_request_failed"] = browser.i18n.getMessage('OpenAIComp_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.openai_comp_model);
         messagesArea.setLLMName(prefs_api.openai_comp_chat_name);
-        messagesArea.setPlainTextMode(prefs_api.composing_plain_text);
         worker.postMessage({ type: 'init', openai_comp_host: prefs_api.openai_comp_host, openai_comp_model: prefs_api.openai_comp_model, openai_comp_api_key: prefs_api.openai_comp_api_key, openai_comp_use_v1: prefs_api.openai_comp_use_v1, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("OpenAIComp_api_connecting") + " \"" + prefs_api.openai_comp_host + "\" " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.openai_comp_model + "\"...", "info");
         browser.runtime.sendMessage({command: "openai_comp_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
diff --git a/api_webchat/messagesArea.js b/api_webchat/messagesArea.js
index 240875cf..186c0ec2 100644
--- a/api_webchat/messagesArea.js
+++ b/api_webchat/messagesArea.js
@@ -20,8 +20,6 @@
  *  The original code has been released under the Apache License, Version 2.0.
  */
 
-import { stripHtmlKeepLines } from '../js/mzta-utils.js';
-
 const messagesAreaTemplate = document.createElement('template');
 
 const messagesAreaStyle = document.createElement('style');
@@ -120,7 +118,6 @@ class MessagesArea extends HTMLElement {
 
     fullTextHTML = "";
     llmName = "LLM";
-    plainTextMode = false;
 
     constructor() {
         super();
@@ -155,10 +152,6 @@ class MessagesArea extends HTMLElement {
         this.llmName = llmName;
     }
 
-    setPlainTextMode(plainTextMode) {
-        this.plainTextMode = plainTextMode;
-    }
-
     handleTokensDone(promptData = null) {
         this.flushAccumulatingMessage();
         this.addActionButtons(promptData);
@@ -236,10 +229,7 @@ class MessagesArea extends HTMLElement {
         actionButtons.classList.add('action-buttons');
         const actionButton = document.createElement('button');
         actionButton.textContent = browser.i18n.getMessage("apiwebchat_use_this_answer");
-        let fullTextHTMLAtAssignment = this.fullTextHTML.trim().replace(/^"|"$/g, '').replace(/^<p>&quot;/, '<p>').replace(/&quot;<\/p>$/, '</p>'); // strip quotation marks
-        if(this.plainTextMode) {
-            fullTextHTMLAtAssignment = stripHtmlKeepLines(fullTextHTMLAtAssignment);
-        }
+        const fullTextHTMLAtAssignment = this.fullTextHTML.trim().replace(/^"|"$/g, '').replace(/^<p>&quot;/, '<p>').replace(/&quot;<\/p>$/, '</p>'); // strip quotation marks
         //console.log(">>>>>>>>>>>> fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
         actionButton.addEventListener('click', async () => {
             if(promptData.mailMessageId == -1) {    // we are using the reply from the compose window!
diff --git a/mzta-background.js b/mzta-background.js
index 674ce236..7cff4363 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -194,6 +194,10 @@ messenger.runtime.onMessage.addListener((message, sender, sendResponse) => {
                 async function _replaceSelectedText(tabId, text) {
                     //console.log('chatgpt_replaceSelectedText: [' + tabId +'] ' + text)
                     original_html = await getOriginalBody(tabId);
+                    let prefs_repl = await browser.storage.sync.get({composing_plain_text: prefs_default.composing_plain_text});
+                    if(prefs_repl.composing_plain_text){
+                        text = stripHtmlKeepLines(text);
+                    }
                     await browser.tabs.sendMessage(tabId, { command: "replaceSelectedText", text: text, tabId: tabId });
                     return true;
                 }

From 71f5aaf6b2605683030b07307f035cbde9ee40b8 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Apr 2025 00:06:00 +0200
Subject: [PATCH 20/33] 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 cd705150..cf456d6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
-        <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text" [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
+        <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 63e91627..e6127d31 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -9,7 +9,7 @@
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
       <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
-        <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text" [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
+        <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>

From fc7854bb6962a9d2dd28734c817703634a1f83be Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Apr 2025 00:06:00 +0200
Subject: [PATCH 21/33] Enhance Ollama class constructor to accept num_ctx
 parameter and include it in API request if greater than zero. see #351

---
 js/api/ollama.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/api/ollama.js b/js/api/ollama.js
index 0f300243..c08fc2e5 100644
--- a/js/api/ollama.js
+++ b/js/api/ollama.js
@@ -21,11 +21,13 @@ export class Ollama {
     host = '';
     model = '';
     stream = false;
+    num_ctx = 0;
   
-    constructor(host, model, stream = false) {
+    constructor(host, model, stream = false, num_ctx = 0) {
       this.host = host.trim().replace(/\/+$/, "");
       this.model = model;
       this.stream = stream;
+      this.num_ctx = num_ctx;
     }
 
     fetchModels = async () => {
@@ -78,6 +80,7 @@ export class Ollama {
                 model: this.model, 
                 messages: messages,
                 stream: this.stream,
+                ...(this.num_ctx > 0 ? { num_ctx: parseInt(this.num_ctx) } : {})
             }),
         });
         return response;

From 16d374046ee818dbad6435250c6361f040d6f877 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Apr 2025 00:11:00 +0200
Subject: [PATCH 22/33] Add Ollama context token preferences to options and UI.
 see #351

---
 _locales/en/messages.json       |  8 ++++++++
 options/mzta-options-default.js |  1 +
 options/mzta-options.html       | 11 +++++++++++
 3 files changed, 20 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 48b6b602..01f9a265 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1274,5 +1274,13 @@
   "Replace_No_Selected_Text": {
     "message": "No text selected, would you like to insert the AI's response at the beginning of the email?",
     "description": ""
+  },
+  "prefs_ollama_num_ctx": {
+    "message": "Number of context tokens",
+    "description": ""
+  },
+  "prefs_ollama_num_ctx_Info": {
+    "message": "The number of context tokens to use for the Ollama API. Set to 0 if you don't want to pass it as a parameter to the server.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index 573d2085..47cb2314 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -30,6 +30,7 @@ export const prefs_default = {
     chatgpt_developer_messages: '',
     ollama_host: '',
     ollama_model: '',
+    ollama_num_ctx: 0,
     openai_comp_host: '',   // For OpenAI Compatible API as LM-Studio
     openai_comp_model: '',
     openai_comp_api_key: '',
diff --git a/options/mzta-options.html b/options/mzta-options.html
index cd835aab..9083d20c 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -250,6 +250,17 @@
             <br><br><button id="btnGiveAllUrlsPermission_ollama_api">__MSG_CORS_give_allurls_perm__</button>
         </td>
       </tr>
+      <tr class="conntype_ollama_api">
+        <td><label>
+          <span>__MSG_prefs_ollama_num_ctx__</span>
+        </label></td>
+        <td>
+          <label>
+            <input type="number" id="ollama_num_ctx" name="ollama_num_ctx" class="option-input"/>
+            <br>__MSG_prefs_ollama_num_ctx_Info__
+          </label>
+        </td>
+      </tr>
       <tr class="conntype_ollama_api">
         <td>
           <label>

From 377fc67a1890064184d74f00eebcdc24203d7726 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Apr 2025 00:11:00 +0200
Subject: [PATCH 23/33] Add ollama_num_ctx support in API and worker
 initialization. see #351

---
 api_webchat/controller.js         | 4 ++--
 js/workers/model-worker-ollama.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index ec23e569..5e3e6b22 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -90,13 +90,13 @@ switch (llm) {
         break;
     }
     case "ollama_api": {
-        let prefs_api = await browser.storage.sync.get({ollama_host: '', ollama_model: '', do_debug: false});
+        let prefs_api = await browser.storage.sync.get({ollama_host: '', ollama_model: '', ollama_num_ctx: 0, do_debug: false});
         let i18nStrings = {};
         i18nStrings["ollama_api_request_failed"] = browser.i18n.getMessage('ollama_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.ollama_model);
         messagesArea.setLLMName("Ollama Local");
-        worker.postMessage({ type: 'init', ollama_host: prefs_api.ollama_host, ollama_model: prefs_api.ollama_model, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
+        worker.postMessage({ type: 'init', ollama_host: prefs_api.ollama_host, ollama_model: prefs_api.ollama_model, ollama_num_ctx: prefs_api.ollama_num_ctx, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         browser.runtime.sendMessage({command: "ollama_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         messagesArea.appendUserMessage(browser.i18n.getMessage("ollama_api_connecting") + " \"" + prefs_api.ollama_host + "\" " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.ollama_model + "\"...", "info");
         break;
diff --git a/js/workers/model-worker-ollama.js b/js/workers/model-worker-ollama.js
index 21396f5d..f29bab62 100644
--- a/js/workers/model-worker-ollama.js
+++ b/js/workers/model-worker-ollama.js
@@ -25,6 +25,7 @@ import { taLogger } from '../mzta-logger.js';
 
 let ollama_host = null;
 let ollama_model = '';
+let ollama_num_ctx = 0;
 let ollama = null;
 let stopStreaming = false;
 let i18nStrings = null;
@@ -39,8 +40,9 @@ self.onmessage = async function(event) {
         case 'init':
             ollama_host = event.data.ollama_host;
             ollama_model = event.data.ollama_model;
+            ollama_num_ctx = event.data.ollama_num_ctx;
             //console.log(">>>>>>>>>>> ollama_host: " + ollama_host);
-            ollama = new Ollama(ollama_host, ollama_model, true);
+            ollama = new Ollama(ollama_host, ollama_model, true, ollama_num_ctx);
             do_debug = event.data.do_debug;
             i18nStrings = event.data.i18nStrings;
             taLog = new taLogger('model-worker-ollama', do_debug);

From 6d27931a4bfa04289541d74dc6ff2d133f9d583f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Apr 2025 00:16:00 +0200
Subject: [PATCH 24/33] 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 cf456d6e..55a94444 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
+        <li><i>[Ollama API]</i> It's now possibile to define the default context length (the <i>num_ctx</i> parameter) in the options page [<a href="https://github.com/micz/ThunderAI/issues/351">#351</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index e6127d31..a9c686d7 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -10,6 +10,7 @@
       <h2>Version 3.3.5 - 17/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
+        <li><i>[Ollama API]</i> It's now possibile to define the default context length (the <i>num_ctx</i> parameter) in the options page [<a href="https://github.com/micz/ThunderAI/issues/351">#351</a>].</li>
         <li><i>[ChatGPT Web]</i> Updated the list of available models in the option page.</li>
         <li><i>[ChatGPT Web]</i> Opening the ChatGPT webpage from the options now enforce the selected model, if any.</li>
         <li><i>[All APIs]</i> Fix: Really correctly getting the message body even in multilevel subpart messages when processing incoming messages for tags or spam [<a href="https://github.com/micz/ThunderAI/issues/335">#335</a>].</li>

From 81af669007a06de63bb14fcb750b1e61da2c6881 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Apr 2025 21:09:41 +0200
Subject: [PATCH 25/33] typo fixed

---
 _locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a2a5dec2..8f94920a 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1278,7 +1278,7 @@
   "prefs_OptionText_composing_plain_text_Info": {
     "message": "Check this option if you're composing the emails in plain text format.",
     "description": ""
-  }
+  },
   "Replace_No_Selected_Text": {
     "message": "No text selected, would you like to insert the AI's response at the beginning of the email?",
     "description": ""

From 3226a351844323436c130c4691d1a03eecf64e62 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Apr 2025 21:10:07 +0200
Subject: [PATCH 26/33] release date 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 57ddee8d..b58c6385 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 
 
-<h2>Version 3.3.5 - 17/04/2025</h2>
+<h2>Version 3.3.5 - 22/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
         <li>Added an option when composing in plain text to remove the extra empty lines [<a href="https://github.com/micz/ThunderAI/issues/350">#350</a>].</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 153576dd..5060c721 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,7 +7,7 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
-      <h2>Version 3.3.5 - 17/04/2025</h2>
+      <h2>Version 3.3.5 - 22/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
         <li>Added an option when composing in plain text to remove the extra empty lines [<a href="https://github.com/micz/ThunderAI/issues/350">#350</a>].</li>

From 594c5a7c8a67c7fdd7dd17937b991466cd06f54e Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Apr 2025 21:24:03 +0200
Subject: [PATCH 27/33] refactor: update fetchResponse to nest num_ctx within
 options. see #351

---
 js/api/ollama.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/api/ollama.js b/js/api/ollama.js
index c08fc2e5..5cc41215 100644
--- a/js/api/ollama.js
+++ b/js/api/ollama.js
@@ -80,7 +80,7 @@ export class Ollama {
                 model: this.model, 
                 messages: messages,
                 stream: this.stream,
-                ...(this.num_ctx > 0 ? { num_ctx: parseInt(this.num_ctx) } : {})
+                ...(this.num_ctx > 0 ? { options: { num_ctx: parseInt(this.num_ctx) } } : {})
             }),
         });
         return response;

From 6fa022ff8132a03f58e33fc1ca47e37bf10eaaa3 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Apr 2025 21:37:21 +0200
Subject: [PATCH 28/33] fix: add [num_ctx] indicator to ollama context label in
 options

---
 options/mzta-options.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/mzta-options.html b/options/mzta-options.html
index 2cb1636a..cd52df1f 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -263,7 +263,7 @@
       </tr>
       <tr class="conntype_ollama_api">
         <td><label>
-          <span>__MSG_prefs_ollama_num_ctx__</span>
+          <span>__MSG_prefs_ollama_num_ctx__ <i>[num_ctx]</i></span>
         </label></td>
         <td>
           <label>

From 7bca844d58a1c72a957bf58f02330508eafe3c3b Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Apr 2025 21:43:34 +0200
Subject: [PATCH 29/33]  German, French, and Italian locales updated

---
 _locales/de/messages.json | 15 +++++++++++++++
 _locales/fr/messages.json | 15 +++++++++++++++
 _locales/it/messages.json | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 880e48fb..76aa089e 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -953,5 +953,20 @@
     },
     "maybe_CORS_openai_comp": {
         "message": "Die Verwendung einer mit OpenAI kompatiblen API kann erfordern, die CORS-Einstellungen auf dem Server zu konfigurieren."
+    },
+    "prefs_ollama_num_ctx_Info": {
+        "message": "Die Anzahl der Kontext-Token, die für die Ollama-API verwendet werden sollen. Auf 0 setzen, wenn Sie sie nicht als Parameter an den Server übergeben möchten."
+    },
+    "prefs_ollama_num_ctx": {
+        "message": "Anzahl der Kontext-Token"
+    },
+    "prefs_OptionText_composing_plain_text": {
+        "message": "Verfassen im Nur-Text-Format"
+    },
+    "Replace_No_Selected_Text": {
+        "message": "Kein Text ausgewählt. Möchten Sie die Antwort der KI am Anfang der E-Mail einfügen?"
+    },
+    "prefs_OptionText_composing_plain_text_Info": {
+        "message": "Aktivieren Sie diese Option, wenn Sie E-Mails im Nur-Text-Format verfassen."
     }
 }
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 88443dbf..9d2a45bb 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -953,5 +953,20 @@
     },
     "maybe_CORS_openai_comp": {
         "message": "L'utilisation d'une API compatible avec OpenAI peut nécessiter la configuration des paramètres CORS sur le serveur."
+    },
+    "prefs_OptionText_composing_plain_text_Info": {
+        "message": "Cochez cette option si vous rédigez les e-mails au format texte brut."
+    },
+    "prefs_ollama_num_ctx": {
+        "message": "Nombre de jetons de contexte"
+    },
+    "Replace_No_Selected_Text": {
+        "message": "Aucun texte sélectionné, souhaitez-vous insérer la réponse de l'IA au début de l'e-mail ?"
+    },
+    "prefs_ollama_num_ctx_Info": {
+        "message": "Le nombre de jetons de contexte à utiliser pour l'API Ollama. Mettez 0 si vous ne souhaitez pas le passer comme paramètre au serveur."
+    },
+    "prefs_OptionText_composing_plain_text": {
+        "message": "Rédaction en texte brut"
     }
 }
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index af58e235..d9c6f7c2 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -956,5 +956,20 @@
     },
     "maybe_CORS_openai_comp": {
         "message": "L'utilizzo di un'API compatibile con OpenAI potrebbe richiedere la configurazione delle impostazioni CORS sul server."
+    },
+    "prefs_OptionText_composing_plain_text": {
+        "message": "Composizione in testo semplice"
+    },
+    "prefs_OptionText_composing_plain_text_Info": {
+        "message": "Seleziona questa opzione se stai scrivendo le email in formato testo semplice."
+    },
+    "prefs_ollama_num_ctx": {
+        "message": "Numero di token del contesto"
+    },
+    "prefs_ollama_num_ctx_Info": {
+        "message": "Il numero di token del contesto da usare per l'API di Ollama. Imposta a 0 se non vuoi passarli come parametro al server."
+    },
+    "Replace_No_Selected_Text": {
+        "message": "Nessun testo selezionato, vuoi inserire la risposta dell'IA all'inizio dell'email?"
     }
 }

From a17d855ee565cf7f987c32c5ac7d131f1a8fb4a9 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 23 Apr 2025 18:24:09 +0200
Subject: [PATCH 30/33] fix: ensure HTML body is generated from plain text if
 no parts are available

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

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index e02e6070..b3d786c4 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -143,6 +143,9 @@ export function getMailBody(fullMessage){
       html += part.body;
     }
   }
+  if(html === "") {
+    html = text.replace(/\n/g, "<br>");
+  }
   return {text, html};
 }
 

From ad0ca54adeebc07370290fdb7216a89f4fceafe1 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 23 Apr 2025 18:24:54 +0200
Subject: [PATCH 31/33] version set to 3.3.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 b58c6385..6950ce23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 
 
+<h2>Version 3.3.6 - ??/??/2025</h2>
+      <ul>
+        <li>...</li>
+      </ul>
 <h2>Version 3.3.5 - 22/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>
diff --git a/manifest.json b/manifest.json
index f41ec9ab..af911a4c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "3.3.5",
+    "version": "3.3.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 5060c721..6170ec75 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 3.3.6 - ??/??/2025</h2>
+      <ul>
+        <li>...</li>
+      </ul>
       <h2>Version 3.3.5 - 22/04/2025</h2>
       <ul>
         <li>Using a prompt from the compose window with a "Do reply" action is changed in "Substitute Text", asking also to insert text if none is selected [<a href="https://github.com/micz/ThunderAI/issues/353">#353</a>].</li>

From 8ddde5de75df998e2971953858e6869732ce6fa2 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 23 Apr 2025 18:26:19 +0200
Subject: [PATCH 32/33] 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 6950ce23..10b1646c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 <h2>Version 3.3.6 - ??/??/2025</h2>
       <ul>
+        <li><i>[All APIs]</i> Fix: Ensure HTML body is generated from plain text if no parts are available when processing incoming messages for tags or spam.</li>
         <li>...</li>
       </ul>
 <h2>Version 3.3.5 - 22/04/2025</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 6170ec75..31765a99 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -9,6 +9,7 @@
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
       <h2>Version 3.3.6 - ??/??/2025</h2>
       <ul>
+        <li><i>[All APIs]</i> Fix: Ensure HTML body is generated from plain text if no parts are available when processing incoming messages for tags or spam.</li>
         <li>...</li>
       </ul>
       <h2>Version 3.3.5 - 22/04/2025</h2>

From 0214885a9f254ec8e1211aac2f23a8487ac6d71c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 27 Apr 2025 21:33:30 +0200
Subject: [PATCH 33/33] commented out debug console logs for Intl.Segmenter in
 tb115_loader.js and messagesArea.js

---
 api_webchat/messagesArea.js        | 2 +-
 js/tb115_segmenter/tb115_loader.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api_webchat/messagesArea.js b/api_webchat/messagesArea.js
index 186c0ec2..7a8e46b5 100644
--- a/api_webchat/messagesArea.js
+++ b/api_webchat/messagesArea.js
@@ -242,7 +242,7 @@ class MessagesArea extends HTMLElement {
                     browser.runtime.sendMessage({command: "chatgpt_close", window_id: (await browser.windows.getCurrent()).id});
                     break;
                 case "2":     // replace text
-                     console.log("[ThunderAI] (replace text) fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
+                    //  console.log("[ThunderAI] (replace text) fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
                     await browser.runtime.sendMessage({command: "chatgpt_replaceSelectedText", text: fullTextHTMLAtAssignment, tabId: promptData.tabId, mailMessageId: promptData.mailMessageId});
                     browser.runtime.sendMessage({command: "chatgpt_close", window_id: (await browser.windows.getCurrent()).id});
                     break;
diff --git a/js/tb115_segmenter/tb115_loader.js b/js/tb115_segmenter/tb115_loader.js
index 005ec0e1..0c2fc7da 100644
--- a/js/tb115_segmenter/tb115_loader.js
+++ b/js/tb115_segmenter/tb115_loader.js
@@ -18,7 +18,7 @@
 // Firefox 115 and, consequently, Thunderbird 115 are not compatible with Intl.Segmenter.
 // ChatGPT is using Intl.Segmenter, so we have to do something about it or it won't work...
 
-console.log("[ThunderAI] Intl.Segmenter: " + Intl.Segmenter);
+// console.log("[ThunderAI] Intl.Segmenter: " + Intl.Segmenter);
 
 (function() {
     if('Segmenter' in Intl){
