From b40c1477bceac82fb916ebe37998e52f9c5145c6 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 20:29:19 +0200
Subject: [PATCH 01/68] version set to 2.3.0

---
 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 86836e60..fadd702c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 
 
 
+<h2>Version 2.3.0 - ??/??/2024</h2>
+      <ul>
+        <li>...</li>
+      </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Added a workaround to login in ChatGPT. See the new button in the options page.</li>
diff --git a/manifest.json b/manifest.json
index 40f4334e..a597c0a5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "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 5050bec5..7d3fc642 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 2.3.0 - ??/??/2024</h2>
+      <ul>
+        <li>...</li>
+      </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Added a workaround to login in ChatGPT. See the new button in the options page.</li>

From c1935966896d104ab37d8693e7121a1b30cc3f1d Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 20:52:19 +0200
Subject: [PATCH 02/68] new i18n strings added

---
 _locales/en/messages.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0905b0ac..0b8931fa 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -590,5 +590,21 @@
   "OpenChatGPTTab_Info": {
     "message": "In case of login issues in the ThunderAI window, open ChatGPT in a new tab using the button on the right, log in, then close the tab and continue using ThunderAI.",
     "description": ""
+  },
+  "placeholder_mail_body": {
+    "message": "Mail body",
+    "description": ""
+  },
+  "placeholder_mail_subject": {
+    "message": "Mail subject",
+    "description": ""
+  },
+  "placeholder_selected_text": {
+    "message": "Selected text",
+    "description": ""
+  },
+  "placeholder_additional_text": {
+    "message": "Additional text",
+    "description": ""
   }
 }
\ No newline at end of file

From 9bccfb1b2ac4a8d0b7ef79f2b9b44856104cf128 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 20:53:55 +0200
Subject: [PATCH 03/68] defaultPlaceholders manger added see #146

---
 js/mzta-placeholders.js | 110 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 js/mzta-placeholders.js

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
new file mode 100644
index 00000000..7bec5f68
--- /dev/null
+++ b/js/mzta-placeholders.js
@@ -0,0 +1,110 @@
+/*
+ *  ThunderAI [https://micz.it/thunderbird-addon-thunderai/]
+ *  Copyright (C) 2024  Mic (m@micz.it)
+
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const defaultPlaceholders = [
+    {
+        id: 'mail_body',
+        name: "__MSG_placeholder_mail_body__",
+        text: "",
+        is_default: "1",
+    },
+    {
+        id: 'mail_subject',
+        name: "__MSG_placeholder_mail_subject__",
+        text: "",
+        is_default: "1",
+    },
+    {
+        id: 'selected_text',
+        name: "__MSG_placeholder_selected_text__",
+        text: "",
+        is_default: "1",
+    },
+    {
+        id: 'additional_text',
+        name: "__MSG_placeholder_additional_text__",
+        text: "",
+        is_default: "1",
+    },
+];
+
+
+export async function getPlaceholders(onlyEnabled = false){
+    const _defaultPlaceholders = await getDefaultPlaceholders_withProps();
+    // console.log('>>>>>>>>>>>> getPlaceholders _defaultPlaceholders: ' + JSON.stringify(_defaultPlaceholders));
+    const customPlaceholders = await getCustomPlaceholders();
+    // console.log('>>>>>>>>>>>> getPlaceholders customPlaceholders: ' + JSON.stringify(customPlaceholders));
+    let output = _defaultPlaceholders.concat(customPlaceholders);
+    if(onlyEnabled){
+        output = output.filter(obj => obj.enabled != 0);
+    }else{  // order only if we are not filtering, the filtering is for the automplete and we are ordering there after i18n
+        output.sort((a, b) => a.id.localeCompare(b.id));
+    }
+    for(let i=1; i<=output.length; i++){
+        output[i-1].idnum = i;
+    }
+    // console.log('>>>>>>>>>>>> getPlaceholders output: ' + JSON.stringify(output));
+    return output;
+}
+
+async function getDefaultPlaceholders_withProps() {
+    let prefs = await browser.storage.local.get({_default_placeholders_properties: null});
+    // console.log('>>>>>>>>>>>> getDefaultPlaceholders_withProps prefs: ' + JSON.stringify(prefs));
+    //let defaultPlaceholders_prop = [...defaultPlaceholders];
+    let defaultPlaceholders_prop = JSON.parse(JSON.stringify(defaultPlaceholders));
+    // console.log('>>>>>>>>>>>> getDefaultPlaceholders_withProps defaultPlaceholders: ' + JSON.stringify(defaultPlaceholders));
+    // console.log('>>>>>>>>>>>> getDefaultPlaceholders_withProps defaultPlaceholders_prop: ' + JSON.stringify(defaultPlaceholders_prop));
+    if(prefs._default_placeholders_properties === null){     // no default Placeholders properties saved
+        defaultPlaceholders_prop.forEach((placeholder) => {
+            placeholder.enabled = 1;
+        })
+        // console.log('>>>>>>>>>>>> getDefaultPlaceholders_withProps [no prop saved] defaultPlaceholders_prop: ' + JSON.stringify(defaultPlaceholders_prop));
+    } else {    // we have saved default Placeholders properties
+        defaultPlaceholders_prop.forEach((placeholder) => {
+            if(prefs._default_Placeholders_properties?.[placeholder.id]){
+                placeholder.enabled = prefs._default_Placeholders_properties[placeholder.id].enabled;
+            }else{
+                placeholder.enabled = 1;
+            }
+        })
+        // console.log('>>>>>>>>>>>> getDefaultPlaceholders_withProps [prop saved] defaultPlaceholders_prop: ' + JSON.stringify(defaultPlaceholders_prop));
+    }
+    return defaultPlaceholders_prop;
+}
+
+async function getCustomPlaceholders() {
+    let prefs = await browser.storage.local.get({_custom_placeholder: null});
+    if(prefs._custom_placeholder === null){
+        return [];
+    } else {
+        return prefs._custom_placeholder;
+    }
+}
+
+export async function setDefaultPlaceholdersProperties(placeholders) {
+    let default_placeholders_properties = {};
+    placeholders.forEach((placeholder) => {
+        default_placeholders_properties[placeholder.id] = {enabled: placeholder.enabled};
+    });
+    //console.log('>>>>>>>>>>>>>> default_placeholders_properties: ' + JSON.stringify(default_placeholders_properties));
+    await browser.storage.local.set({_default_placeholders_properties: default_placeholders_properties});
+}
+
+export async function setCustomPlaceholders(placeholders) {
+    await browser.storage.local.set({_custom_placeholder: placeholders});
+}
\ No newline at end of file

From 0c40dc4a1242392a8628bfa39791be66dcdb8d06 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 20:54:29 +0200
Subject: [PATCH 04/68] taStore useless import removed

---
 mzta-background.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mzta-background.js b/mzta-background.js
index 2373ef07..6b81f782 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -20,7 +20,6 @@ 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 { taStore } from './js/mzta-store.js';
 import { getCurrentIdentity, getOriginalBody, replaceBody, setBody, i18nConditionalGet, generateCallID, migrateCustomPromptsStorage, migrateDefaultPromptsPropStorage } from './js/mzta-utils.js';
 
 await migrateCustomPromptsStorage();

From 97faed5ac9c2e9b6857fc216949cfe5d86bdd446 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 21:04:57 +0200
Subject: [PATCH 05/68] placeholdersUtils added. see #146

---
 js/mzta-placeholders.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 7bec5f68..52856fff 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -107,4 +107,31 @@ export async function setDefaultPlaceholdersProperties(placeholders) {
 
 export async function setCustomPlaceholders(placeholders) {
     await browser.storage.local.set({_custom_placeholder: placeholders});
+}
+
+
+export const placeholdersUtils = {
+
+    extractPlacehodlers(text) {
+        // Regular expression to match patterns like {%...%}
+        const regex = /{%\s*(.*?)\s*%}/g;
+        let matches = [];
+        let match;
+      
+        // Use exec to find all matches
+        while ((match = regex.exec(text)) !== null) {
+          matches.push(match[1]); // Push only the string inside {%...%}
+        }
+      
+        return matches;
+    },
+
+    replacePlaceholders(text, replacements) {
+        // Regular expression to match patterns like {%...%}
+        return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
+          // p1 contains the key inside {% %}
+          return replacements[p1] || match; // Replace if found, otherwise keep the original
+        });
+    },
+
 }
\ No newline at end of file

From b8c956cadd29673b05713c6c836f0a8b6102aaa9 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 21:09:09 +0200
Subject: [PATCH 06/68] hasPlaceholder method added. see #146

---
 js/mzta-placeholders.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 52856fff..f1cfb3a0 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -134,4 +134,20 @@ export const placeholdersUtils = {
         });
     },
 
+    hasPlaceholder(text, placeholder = "") {
+        let regex;
+      
+        // If a specific placeholder is provided, we search for it
+        if (placeholder !== "") {
+          // Dynamically build the regex for the specific placeholder
+          regex = new RegExp(`{%\s*${placeholder}\s*%}`);
+        } else {
+          // Otherwise, we search for any placeholder in the format {% ... %}
+          regex = /{%\s*(.*?)\s*%}/;
+        }
+      
+        // Check if the specific or any placeholder is present in the text
+        return regex.test(text);
+      },
+
 }
\ No newline at end of file

From 8481315e0e9eebf46cf87e4fdb5977e881213f8a Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:13:10 +0200
Subject: [PATCH 07/68] 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 0b8931fa..fb98ea82 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -388,7 +388,7 @@
     "description": ""
   },
   "customprompts_form_label_define_response_lang": {
-    "message": "Define the reponse languange in the prompt",
+    "message": "Define the reponse language in the prompt",
     "description": ""
   },
   "prefs_Connection_type": {

From 5aef7a4e140f9c2ddf88e7e015ff2aa5e601eb33 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:15:32 +0200
Subject: [PATCH 08/68] typo fixed

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

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index f1cfb3a0..87f0d3b6 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -112,7 +112,7 @@ export async function setCustomPlaceholders(placeholders) {
 
 export const placeholdersUtils = {
 
-    extractPlacehodlers(text) {
+    extractPlaceholders(text) {
         // Regular expression to match patterns like {%...%}
         const regex = /{%\s*(.*?)\s*%}/g;
         let matches = [];

From 0b09e2e3a5552f6ceed66597413ba5c26e342d15 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:16:12 +0200
Subject: [PATCH 09/68] getMailSubject method added

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

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index b9e65846..3c046e71 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -63,6 +63,26 @@ function extractEmail(text) {
   return match ? match[0] : '';
 }
 
+export async function getMailSubject(tab){
+  // console.log(">>>>>>>>>> getMailSubject tab: " + JSON.stringify(tab));
+  if(!["mail", "messageCompose","messageDisplay"].includes(tab.type)){
+    return "";
+  }
+  switch(tab.type){
+    case "mail":
+      let messages_list = await browser.mailTabs.getSelectedMessages(tab.id);
+      return messages_list.messages[0].subject;
+    case "messageDisplay":
+      let message = await messenger.messageDisplay.getDisplayedMessage(tab.id);
+      return message.subject;
+    case "messageCompose":
+      let msg_details = await browser.compose.getComposeDetails(tab.id)
+      return msg_details.subject;
+    default:
+      return "";
+  }
+}
+
 export async function reloadBody(tabId){
   let composeDetails = await messenger.compose.getComposeDetails(tabId);
   let originalHtmlBody = composeDetails.body + " ";

From 1e20dc3ba52ccd256c13104ce4e0045c8c82cecb Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:29:33 +0200
Subject: [PATCH 10/68] various improvements

---
 js/mzta-placeholders.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 87f0d3b6..9b253e0e 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -55,9 +55,6 @@ export async function getPlaceholders(onlyEnabled = false){
     }else{  // order only if we are not filtering, the filtering is for the automplete and we are ordering there after i18n
         output.sort((a, b) => a.id.localeCompare(b.id));
     }
-    for(let i=1; i<=output.length; i++){
-        output[i-1].idnum = i;
-    }
     // console.log('>>>>>>>>>>>> getPlaceholders output: ' + JSON.stringify(output));
     return output;
 }
@@ -112,15 +109,20 @@ export async function setCustomPlaceholders(placeholders) {
 
 export const placeholdersUtils = {
 
-    extractPlaceholders(text) {
+    async extractPlaceholders(text) {
         // Regular expression to match patterns like {%...%}
         const regex = /{%\s*(.*?)\s*%}/g;
         let matches = [];
         let match;
+
+        let activePHs = await getPlaceholders(true);
       
         // Use exec to find all matches
         while ((match = regex.exec(text)) !== null) {
-          matches.push(match[1]); // Push only the string inside {%...%}
+          const foundPH = activePHs.find(ph => ph.id === match[1].trim());
+          if (foundPH) {
+            matches.push(foundPH);
+          }
         }
       
         return matches;
@@ -130,7 +132,7 @@ export const placeholdersUtils = {
         // Regular expression to match patterns like {%...%}
         return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
           // p1 contains the key inside {% %}
-          return replacements[p1] || match; // Replace if found, otherwise keep the original
+          return replacements[p1] ? "\"" + replacements[p1] + "\"" : match; // Replace if found, otherwise keep the original
         });
     },
 

From 4842b623d165bca0169a462a20e7800da5a6e9b5 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:30:13 +0200
Subject: [PATCH 11/68] first working substitution. see #146

---
 js/mzta-menus.js | 59 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 64028c50..2f5cac7b 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -19,9 +19,10 @@
 // Some original methods are derived from https://github.com/ali-raheem/Aify/blob/cfadf52f576b7be3720b5b73af7c8d3129c054da/plugin/html/actions.js
 
 import { getPrompts } from './mzta-prompts.js';
-import { getLanguageDisplayName, getMenuContextCompose, getMenuContextDisplay, i18nConditionalGet } from './mzta-utils.js'
+import { getLanguageDisplayName, getMenuContextCompose, getMenuContextDisplay, i18nConditionalGet, getMailSubject } from './mzta-utils.js'
 import { taLogger } from './mzta-logger.js';
-
+import { placeholdersUtils, getPlaceholders } from './mzta-placeholders.js';
+ 
 export class mzta_Menus {
 
     allPrompts = [];
@@ -73,8 +74,8 @@ export class mzta_Menus {
 
         let curr_menu_entry = {id: curr_prompt.id, is_default: curr_prompt.is_default, name: curr_prompt.name};
     
-        const getHighlight = async () => {
-            const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+        const getHighlight = async (tabs) => {
+            //const tabs = await browser.tabs.query({ active: true, currentWindow: true });
             return {tabId: tabs[0].id, 
                 selection: await browser.tabs.sendMessage(tabs[0].id, { command: "getSelectedText" }),
                 text: await browser.tabs.sendMessage(tabs[0].id, { command: "getTextOnly" })
@@ -82,23 +83,21 @@ export class mzta_Menus {
         };
     
         curr_menu_entry.act = async () => {
-            const msg_text = await getHighlight();
+            const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+            const msg_text = await getHighlight(tabs);
     
             //check if a selection is needed
             if(String(curr_prompt.need_selected) == "1" && (msg_text.selection==='')){
                 //A selection is needed, but nothing is selected!
                 //alert(browser.i18n.getMessage('prompt_selection_needed'));
-                const tabs = await browser.tabs.query({ active: true, currentWindow: true });
                 browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", message : browser.i18n.getMessage('prompt_selection_needed') });
                 return;
             }
     
-            var body_text = '';
-            if (msg_text.selection!=='') {
-                body_text = msg_text.selection.replace(/\s+/g, ' ').trim();
-            } else {
-                body_text = msg_text.text.replace(/\s+/g, ' ').trim();
-            }
+            let body_text = '';
+            let selection_text = '';
+            selection_text = msg_text.selection.replace(/\s+/g, ' ').trim();
+            body_text = msg_text.text.replace(/\s+/g, ' ').trim();
             //open chatgpt window
             //console.log("Click menu item...");
             let chatgpt_lang = '';
@@ -112,9 +111,39 @@ export class mzta_Menus {
                     chatgpt_lang = browser.i18n.getMessage("prompt_lang") + " " + chatgpt_lang + ".";
                 }
             }
+
+            // let mail_subject = await getMailSubject(tabs[0]);
+            // console.log(">>>>>>>>>>>>>>> mail_subject: " + mail_subject);
     
-            var fullPrompt = curr_prompt.text + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang + " \"" + body_text + "\" ";
-    
+            let fullPrompt = '';
+            if(!placeholdersUtils.hasPlaceholder(curr_prompt.text)){
+                // no placeholders, do as usual
+                fullPrompt = curr_prompt.text + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang + " \"" + (selection_text=='' ? body_text : selection_text) + "\" ";
+            }else{
+                let mail_subject = await getMailSubject(tabs[0]);
+                // we have at least a placeholder, do the magic!
+                let currPHs = await placeholdersUtils.extractPlaceholders(curr_prompt.text);
+                // console.log(">>>>>>>>>> currPHs: " + JSON.stringify(currPHs));
+                let finalSubs = {};
+                for(let currPH of currPHs){
+                    switch(currPH.id){
+                        case 'mail_body':
+                            finalSubs['mail_body'] = body_text;
+                            break;
+                        case 'mail_subject':
+                            finalSubs['mail_subject'] = mail_subject;
+                            break;
+                        case 'selected_text':
+                            finalSubs['selected_text'] = selection_text;
+                            break;
+                        default:    // TODO Manage custom placeholders
+                            break;
+                    }
+                }
+                // console.log(">>>>>>>>>> finalSubs: " + JSON.stringify(finalSubs));
+                fullPrompt = placeholdersUtils.replacePlaceholders(curr_prompt.text, finalSubs) + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang;
+            }
+            
             switch(curr_prompt.id){
                 case 'prompt_translate_this':
                     let prefs2 = await browser.storage.sync.get({default_chatgpt_lang: getLanguageDisplayName(browser.i18n.getUILanguage())});
@@ -131,7 +160,7 @@ export class mzta_Menus {
                     break;
             }
 
-            const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+            // const tabs = await browser.tabs.query({ active: true, currentWindow: true });
             // add custom text if needed
             //browser.runtime.sendMessage({command: "chatgpt_open", prompt: fullPrompt, action: curr_prompt.action, tabId: tabs[0].id});
             this.openChatGPT(fullPrompt, curr_prompt.action, tabs[0].id, curr_prompt.name, curr_prompt.need_custom_text);

From 4b96ba99cf59656f052301548961d110a15209ac Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:31:39 +0200
Subject: [PATCH 12/68] removed a useless import

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

diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 2f5cac7b..bb7793ba 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -21,7 +21,7 @@
 import { getPrompts } from './mzta-prompts.js';
 import { getLanguageDisplayName, getMenuContextCompose, getMenuContextDisplay, i18nConditionalGet, getMailSubject } from './mzta-utils.js'
 import { taLogger } from './mzta-logger.js';
-import { placeholdersUtils, getPlaceholders } from './mzta-placeholders.js';
+import { placeholdersUtils } from './mzta-placeholders.js';
  
 export class mzta_Menus {
 

From ed596041ed5fde332acac4426b5fdfee787cf68c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 22:33:45 +0200
Subject: [PATCH 13/68] not forcing doublequotes

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

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 9b253e0e..86020dce 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -132,7 +132,7 @@ export const placeholdersUtils = {
         // Regular expression to match patterns like {%...%}
         return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
           // p1 contains the key inside {% %}
-          return replacements[p1] ? "\"" + replacements[p1] + "\"" : match; // Replace if found, otherwise keep the original
+          return replacements[p1] || match; // Replace if found, otherwise keep the original
         });
     },
 

From 4230318b10a82830ee2584a6d09c2e0f243e05b4 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sun, 13 Oct 2024 23:31:11 +0200
Subject: [PATCH 14/68] first version of autocomplete. see #157

---
 customprompts/mzta-custom-prompts.css  |  52 +++++++++++-
 customprompts/mzta-custom-prompts.html |   5 +-
 customprompts/mzta-custom-prompts.js   | 107 ++++++++++++++++++++++++-
 3 files changed, 160 insertions(+), 4 deletions(-)

diff --git a/customprompts/mzta-custom-prompts.css b/customprompts/mzta-custom-prompts.css
index 4d7fb217..5a8e9bb1 100644
--- a/customprompts/mzta-custom-prompts.css
+++ b/customprompts/mzta-custom-prompts.css
@@ -163,6 +163,44 @@ table .sort.desc {
     margin-bottom: 0px;
 }
 
+.autocomplete-container {
+    position: relative;
+}
+
+.autocomplete-list {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    background-color: white;
+    border: 1px solid #ccc;
+    z-index: 1000;
+    max-height: 200px;
+    overflow-y: auto;
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    font-size: small;
+}
+
+.autocomplete-list li {
+    padding: 8px;
+    cursor: pointer;
+}
+
+.autocomplete-list li:hover {
+    background-color: #f0f0f0;
+}
+
+.autocomplete-list li.active {
+    background-color: #ddd;
+}
+
+.hidden {
+    display: none;
+}
+  
+
 
 @media (prefers-color-scheme: dark) {
     body {
@@ -196,6 +234,18 @@ table .sort.desc {
 
     .storage_space{
         color: rgb(182, 182, 182);
-    }    
+    }
 
+    .autocomplete-list {
+        background-color: #2E2F36;
+        border: 1px solid #2E2F36;
+    }
+    
+    .autocomplete-list li:hover {
+        background-color: #4c4e58;
+    }
+    
+    .autocomplete-list li.active {
+        background-color: #4c4e58;
+    }
 }
\ No newline at end of file
diff --git a/customprompts/mzta-custom-prompts.html b/customprompts/mzta-custom-prompts.html
index 22055da4..513ec5e9 100644
--- a/customprompts/mzta-custom-prompts.html
+++ b/customprompts/mzta-custom-prompts.html
@@ -34,7 +34,10 @@
             <td rowspan="2" class="w25">
                 <label for="txtTextNew">*__MSG_customPrompts_form_label_Text__:</label>
                 <br>
-                <textarea id="txtTextNew" name="text" class="input_new text_output" tabindex="3"></textarea>
+                <div class="autocomplete-container">
+                    <textarea id="txtTextNew" name="text" class="input_new text_output editor" tabindex="3"></textarea>
+                    <ul class="autocomplete-list hidden"></ul>
+                </div>
             </td>
             <td class="w19">
                 <label for="selectTypeNew">__MSG_customPrompts_add_to_menu__:</label>
diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index 50dc438a..443fc8b0 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -19,6 +19,7 @@
 import { getPrompts, setDefaultPromptsProperties, setCustomPrompts, preparePromptsForExport, preparePromptsForImport } from "../js/mzta-prompts.js";
 import { isThunderbird128OrGreater, getCustomPromptsUsedSpace } from "../js/mzta-utils.js";
 import { taLogger } from "../js/mzta-logger.js";
+import { getPlaceholders } from "../js/mzta-placeholders.js";
 
 var promptsList = null;
 var somethingChanged = false;
@@ -27,6 +28,7 @@ var positionMax_display = 0;
 var idnumMax = 0;
 var msgTimeout = null;
 let taLog = null;
+let autocompleteSuggestions = [];
 
 document.addEventListener('DOMContentLoaded', async () => {
 
@@ -111,6 +113,13 @@ document.addEventListener('DOMContentLoaded', async () => {
         });
     }
 
+    const textareas = document.querySelectorAll('.editor');
+    autocompleteSuggestions = (await getPlaceholders(true)).map(p => '{%'+p.id+'%}');
+
+    // console.log('>>>>>>>>>>> suggestions: ' + JSON.stringify(suggestions));
+    
+    textareas.forEach(textarea => textareaAutocomplete(textarea, autocompleteSuggestions));
+
     i18n.updateDocument();
 
     //To add a new item
@@ -274,7 +283,9 @@ function showItemRowEditor(tr) {
     tr.querySelector('.id_show').style.display = 'none';
     tr.querySelector('.name_output').style.display = 'inline';
     tr.querySelector('.name_show').style.display = 'none';
-    tr.querySelector('.text_output').style.display = 'inline';
+    const text_output = tr.querySelector('.text_output');
+    text_output.style.display = 'inline';
+    textareaAutocomplete(text_output, autocompleteSuggestions)
     tr.querySelector('.text_show').style.display = 'none';
     tr.querySelector('.type_output').style.display = 'inline';
     tr.querySelector('.type_show').style.display = 'none';
@@ -399,7 +410,7 @@ function loadPromptsList(values){
             let output = `<tr ` + ((values.is_default == 1) ? 'class="is_default"':'') + `>
                 <td class="w08"><span class="id id_show"></span><input type="text" class="hiddendata id_output" value="` + values.id + `" /></td>
                 <td class="w08"><span class="name name_show"></span><input type="text" class="hiddendata name_output" value="` + values.name + `" /></td>
-                <td class="w40"><span class="text text_show"></span><textarea class="hiddendata text_output">` + values.text + `</textarea></td>
+                <td class="w40"><span class="text text_show"></span><div class="autocomplete-container"><textarea class="hiddendata text_output editor">` + values.text + `</textarea><ul class="autocomplete-list hidden"></ul></div></td>
                 <td class="w08"><span class="type_show">` + type_output + `</span>
                 <select class="type_output hiddendata">
                 <option value="0"` + ((values.type == "0") ? ' selected':'') + `>__MSG_customPrompts_add_to_menu_always__</option>
@@ -642,3 +653,95 @@ if(await isThunderbird128OrGreater()){
         }
     });    
 }
+
+function textareaAutocomplete(textarea, suggestions) {
+    const container = textarea.closest('.autocomplete-container');
+    const autocompleteList = container.querySelector('.autocomplete-list');
+    let activeIndex = -1;
+
+    textarea.addEventListener('input', () => {
+      const cursorPosition = textarea.selectionStart;
+      const text = textarea.value.substring(0, cursorPosition);
+      const match = text.match(/{%[^\s]*$/);
+
+      if (match) {
+        const lastWord = match[0];
+        const matches = suggestions.filter(s => s.startsWith(lastWord));
+        showSuggestions(matches, autocompleteList);
+      } else {
+        hideSuggestions(autocompleteList);
+      }
+    });
+
+    textarea.addEventListener('keydown', (e) => {
+      const items = autocompleteList.querySelectorAll('li');
+      if (items.length > 0) {
+        if (e.key === 'ArrowDown') {
+          e.preventDefault();
+          activeIndex = (activeIndex + 1) % items.length;
+          updateActiveSuggestion(items, activeIndex);
+        } else if (e.key === 'ArrowUp') {
+          e.preventDefault();
+          activeIndex = (activeIndex - 1 + items.length) % items.length;
+          updateActiveSuggestion(items, activeIndex);
+        } else if (e.key === 'Enter') {
+          e.preventDefault();
+          if (activeIndex >= 0 && activeIndex < items.length) {
+            insertAutocomplete(items[activeIndex].textContent, textarea);
+            hideSuggestions(autocompleteList);
+          }
+        } else if (e.key === 'Escape') {
+          hideSuggestions(autocompleteList);
+        }
+      }
+    });
+
+    function showSuggestions(matches, autocompleteList) {
+      autocompleteList.innerHTML = '';
+      activeIndex = -1;
+      if (matches.length === 0) {
+        hideSuggestions(autocompleteList);
+        return;
+      }
+      matches.forEach(match => {
+        const li = document.createElement('li');
+        li.textContent = match;
+        li.addEventListener('click', () => {
+          insertAutocomplete(match, textarea);
+          hideSuggestions(autocompleteList);
+        });
+        autocompleteList.appendChild(li);
+      });
+      autocompleteList.classList.remove('hidden');
+    }
+
+    function hideSuggestions(autocompleteList) {
+      autocompleteList.classList.add('hidden');
+      activeIndex = -1;
+    }
+
+    function updateActiveSuggestion(items, activeIndex) {
+      items.forEach((item, index) => {
+        item.classList.remove('active');
+        if (index === activeIndex) {
+          item.classList.add('active');
+          item.scrollIntoView({ block: 'nearest' });
+        }
+      });
+    }
+
+    function insertAutocomplete(suggestion, textarea) {
+      const cursorPosition = textarea.selectionStart;
+      const textBefore = textarea.value.substring(0, cursorPosition);
+      const textAfter = textarea.value.substring(cursorPosition);
+      const match = textBefore.match(/{%[^\s]*$/);
+      if (match) {
+        const lastWord = match[0];
+        const completion = suggestion.substring(lastWord.length);
+        const newText = textBefore + completion + textAfter;
+        textarea.value = newText;
+        const newCursorPosition = cursorPosition + completion.length;
+        textarea.setSelectionRange(newCursorPosition, newCursorPosition);
+      }
+    }
+}
\ No newline at end of file

From 2216dd0f8cb3f2a4635cac57d1414c0013fb28b7 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 20:41:54 +0200
Subject: [PATCH 15/68] placeholders now have a type prop. Added more default
 placeholders. see #153

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

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 86020dce..93f906e9 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -16,29 +16,70 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*  ================= PROMPTS PROPERTIES ========================================
+
+    ================ BASE PROPERTIES
+
+    Types (type attribute):
+    0: always show (when composing a part of the text must be selected if need_selected = 1)
+    1: show when reading an email
+    2: show when composing a mail (a part of the text must be selected if need_selected = 1)
+
+    ================ USER PROPERTIES
+    Enabled (enabled attribute):
+    0: Disabled
+    1: Enabled
+
+*/
+
 const defaultPlaceholders = [
     {
         id: 'mail_body',
         name: "__MSG_placeholder_mail_body__",
         text: "",
+        type: 0,
         is_default: "1",
     },
     {
         id: 'mail_subject',
         name: "__MSG_placeholder_mail_subject__",
         text: "",
+        type: 0,
         is_default: "1",
     },
     {
         id: 'selected_text',
         name: "__MSG_placeholder_selected_text__",
         text: "",
+        type: 0,
         is_default: "1",
     },
     {
-        id: 'additional_text',
+        id: 'additional_text',  //TODO
         name: "__MSG_placeholder_additional_text__",
         text: "",
+        type: 0,
+        is_default: "1",
+    },
+    {
+        id: 'junk_score',  //TODO
+        name: "__MSG_placeholder_junk_score__",
+        text: "",
+        type: 1,
+        is_default: "1",
+    },
+    {
+        id: 'recipients',  //TODO
+        name: "__MSG_placeholder_recipients__",
+        text: "",
+        type: 0,
+        is_default: "1",
+    },
+    {
+        id: 'author',  //TODO
+        name: "__MSG_placeholder_author__",
+        text: "",
+        type: 0,
         is_default: "1",
     },
 ];

From a5e8f606182979ef9dd15fe3ef84b567ef1109f8 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 20:44:48 +0200
Subject: [PATCH 16/68] new i18n strings added to en locale

---
 _locales/en/messages.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index fb98ea82..49d1afa2 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -606,5 +606,17 @@
   "placeholder_additional_text": {
     "message": "Additional text",
     "description": ""
+  },
+  "placeholder_junk_score": {
+    "message": "Junk score",
+    "description": ""
+  },
+  "placeholder_recipients": {
+    "message": "Recipients",
+    "description": ""
+  },
+  "placeholder_author": {
+    "message": "Author",
+    "description": ""
   }
 }
\ No newline at end of file

From 4fc698e3be6ea657f0c6a5adbae41ae9fbf5ed99 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 22:06:28 +0200
Subject: [PATCH 17/68] html_body placeholder added. see #153

---
 _locales/en/messages.json | 4 ++++
 js/mzta-placeholders.js   | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 49d1afa2..d5918bd9 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -595,6 +595,10 @@
     "message": "Mail body",
     "description": ""
   },
+  "placeholder_html_body": {
+    "message": "HTML mail body",
+    "description": ""
+  },
   "placeholder_mail_subject": {
     "message": "Mail subject",
     "description": ""
diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 93f906e9..48d2aa0f 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -40,6 +40,13 @@ const defaultPlaceholders = [
         type: 0,
         is_default: "1",
     },
+    {
+        id: 'html_body',
+        name: "__MSG_placeholder_html_body__",
+        text: "",
+        type: 0,
+        is_default: "1",
+    },
     {
         id: 'mail_subject',
         name: "__MSG_placeholder_mail_subject__",

From 871d7746a6da4d880fd4ef02bc228d45ffddba30 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 22:21:15 +0200
Subject: [PATCH 18/68] autocomplete. closing suggestions when clicking outside
 the list. see #157

---
 customprompts/mzta-custom-prompts.html |  2 +-
 customprompts/mzta-custom-prompts.js   | 37 ++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/customprompts/mzta-custom-prompts.html b/customprompts/mzta-custom-prompts.html
index 513ec5e9..6293cac8 100644
--- a/customprompts/mzta-custom-prompts.html
+++ b/customprompts/mzta-custom-prompts.html
@@ -42,7 +42,7 @@
             <td class="w19">
                 <label for="selectTypeNew">__MSG_customPrompts_add_to_menu__:</label>
                 <br>
-                <select id="selectTypeNew" name="type" tabindex="4">
+                <select id="selectTypeNew" name="type" tabindex="4" class="type_selector">
                     <option value="0">__MSG_customPrompts_add_to_menu_always__</option>
                     <option value="1">__MSG_customPrompts_add_to_menu_reading__</option>
                     <option value="2">__MSG_customPrompts_add_to_menu_composing__</option>
diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index 443fc8b0..9a571fe9 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -118,7 +118,21 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     // console.log('>>>>>>>>>>> suggestions: ' + JSON.stringify(suggestions));
     
-    textareas.forEach(textarea => textareaAutocomplete(textarea, autocompleteSuggestions));
+    textareas.forEach(textarea => textareaAutocomplete(textarea, autocompleteSuggestions, textarea.closest('.type_selector')?.value));
+
+    // document.addEventListener('click', (e) => {
+    //     // Check if the click was outside the textarea or suggestion list
+    //     const isClickInsideTextarea = e.target.closest('.editor');
+    //     const isClickInsideAutocompleteList = e.target.closest('.autocomplete-list');
+      
+    //     if (!isClickInsideTextarea && !isClickInsideAutocompleteList) {
+    //       textareas.forEach(textarea => {
+    //         const container = textarea.closest('.autocomplete-container');
+    //         const autocompleteList = container.querySelector('.autocomplete-list');
+    //         hideSuggestions(autocompleteList);
+    //       });
+    //     }
+    // });
 
     i18n.updateDocument();
 
@@ -285,7 +299,7 @@ function showItemRowEditor(tr) {
     tr.querySelector('.name_show').style.display = 'none';
     const text_output = tr.querySelector('.text_output');
     text_output.style.display = 'inline';
-    textareaAutocomplete(text_output, autocompleteSuggestions)
+    textareaAutocomplete(text_output, autocompleteSuggestions, tr.closest('.type_selector').value)
     tr.querySelector('.text_show').style.display = 'none';
     tr.querySelector('.type_output').style.display = 'inline';
     tr.querySelector('.type_show').style.display = 'none';
@@ -411,7 +425,7 @@ function loadPromptsList(values){
                 <td class="w08"><span class="id id_show"></span><input type="text" class="hiddendata id_output" value="` + values.id + `" /></td>
                 <td class="w08"><span class="name name_show"></span><input type="text" class="hiddendata name_output" value="` + values.name + `" /></td>
                 <td class="w40"><span class="text text_show"></span><div class="autocomplete-container"><textarea class="hiddendata text_output editor">` + values.text + `</textarea><ul class="autocomplete-list hidden"></ul></div></td>
-                <td class="w08"><span class="type_show">` + type_output + `</span>
+                <td class="w08"><span class="type_show" class="type_selector">` + type_output + `</span>
                 <select class="type_output hiddendata">
                 <option value="0"` + ((values.type == "0") ? ' selected':'') + `>__MSG_customPrompts_add_to_menu_always__</option>
                 <option value="1"` + ((values.type == "1") ? ' selected':'') + `>__MSG_customPrompts_add_to_menu_reading__</option>
@@ -654,7 +668,7 @@ if(await isThunderbird128OrGreater()){
     });    
 }
 
-function textareaAutocomplete(textarea, suggestions) {
+function textareaAutocomplete(textarea, suggestions, type) { console.log(">>>>>>>>> textareaAutocomplete type: " + type);
     const container = textarea.closest('.autocomplete-container');
     const autocompleteList = container.querySelector('.autocomplete-list');
     let activeIndex = -1;
@@ -666,7 +680,7 @@ function textareaAutocomplete(textarea, suggestions) {
 
       if (match) {
         const lastWord = match[0];
-        const matches = suggestions.filter(s => s.startsWith(lastWord));
+        const matches = suggestions.filter(s => s.startsWith(lastWord) && s.type === type);
         showSuggestions(matches, autocompleteList);
       } else {
         hideSuggestions(autocompleteList);
@@ -744,4 +758,17 @@ function textareaAutocomplete(textarea, suggestions) {
         textarea.setSelectionRange(newCursorPosition, newCursorPosition);
       }
     }
+
+    document.addEventListener('click', (e) => {
+        // Check if the click was outside the textarea or suggestion list
+        const isClickInsideTextarea = e.target.closest('.editor');
+        const isClickInsideAutocompleteList = e.target.closest('.autocomplete-list');
+      
+        if (!isClickInsideTextarea && !isClickInsideAutocompleteList) {
+            const container = textarea.closest('.autocomplete-container');
+            const autocompleteList = container.querySelector('.autocomplete-list');
+            hideSuggestions(autocompleteList);
+        }
+    });
+
 }
\ No newline at end of file

From c5b1d44fe09da53922a1c100b76a024ee1c82409 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 22:39:38 +0200
Subject: [PATCH 19/68] filtering placeholders by type in autocomplete. see
 #157

---
 customprompts/mzta-custom-prompts.html |  2 +-
 customprompts/mzta-custom-prompts.js   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/customprompts/mzta-custom-prompts.html b/customprompts/mzta-custom-prompts.html
index 6293cac8..0da8e41d 100644
--- a/customprompts/mzta-custom-prompts.html
+++ b/customprompts/mzta-custom-prompts.html
@@ -42,7 +42,7 @@
             <td class="w19">
                 <label for="selectTypeNew">__MSG_customPrompts_add_to_menu__:</label>
                 <br>
-                <select id="selectTypeNew" name="type" tabindex="4" class="type_selector">
+                <select id="selectTypeNew" name="type" tabindex="4" class="type_output">
                     <option value="0">__MSG_customPrompts_add_to_menu_always__</option>
                     <option value="1">__MSG_customPrompts_add_to_menu_reading__</option>
                     <option value="2">__MSG_customPrompts_add_to_menu_composing__</option>
diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index 9a571fe9..6e72b4a3 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -114,11 +114,11 @@ document.addEventListener('DOMContentLoaded', async () => {
     }
 
     const textareas = document.querySelectorAll('.editor');
-    autocompleteSuggestions = (await getPlaceholders(true)).map(p => '{%'+p.id+'%}');
+    autocompleteSuggestions = (await getPlaceholders(true)).map(p => ({command: '{%'+p.id+'%}', type: p.type}));
 
     // console.log('>>>>>>>>>>> suggestions: ' + JSON.stringify(suggestions));
     
-    textareas.forEach(textarea => textareaAutocomplete(textarea, autocompleteSuggestions, textarea.closest('.type_selector')?.value));
+    textareas.forEach(textarea => textareaAutocomplete(textarea, autocompleteSuggestions));
 
     // document.addEventListener('click', (e) => {
     //     // Check if the click was outside the textarea or suggestion list
@@ -299,7 +299,7 @@ function showItemRowEditor(tr) {
     tr.querySelector('.name_show').style.display = 'none';
     const text_output = tr.querySelector('.text_output');
     text_output.style.display = 'inline';
-    textareaAutocomplete(text_output, autocompleteSuggestions, tr.closest('.type_selector').value)
+    textareaAutocomplete(text_output, autocompleteSuggestions)
     tr.querySelector('.text_show').style.display = 'none';
     tr.querySelector('.type_output').style.display = 'inline';
     tr.querySelector('.type_show').style.display = 'none';
@@ -425,7 +425,7 @@ function loadPromptsList(values){
                 <td class="w08"><span class="id id_show"></span><input type="text" class="hiddendata id_output" value="` + values.id + `" /></td>
                 <td class="w08"><span class="name name_show"></span><input type="text" class="hiddendata name_output" value="` + values.name + `" /></td>
                 <td class="w40"><span class="text text_show"></span><div class="autocomplete-container"><textarea class="hiddendata text_output editor">` + values.text + `</textarea><ul class="autocomplete-list hidden"></ul></div></td>
-                <td class="w08"><span class="type_show" class="type_selector">` + type_output + `</span>
+                <td class="w08"><span class="type_show">` + type_output + `</span>
                 <select class="type_output hiddendata">
                 <option value="0"` + ((values.type == "0") ? ' selected':'') + `>__MSG_customPrompts_add_to_menu_always__</option>
                 <option value="1"` + ((values.type == "1") ? ' selected':'') + `>__MSG_customPrompts_add_to_menu_reading__</option>
@@ -668,7 +668,7 @@ if(await isThunderbird128OrGreater()){
     });    
 }
 
-function textareaAutocomplete(textarea, suggestions, type) { console.log(">>>>>>>>> textareaAutocomplete type: " + type);
+function textareaAutocomplete(textarea, suggestions) {
     const container = textarea.closest('.autocomplete-container');
     const autocompleteList = container.querySelector('.autocomplete-list');
     let activeIndex = -1;
@@ -680,7 +680,12 @@ function textareaAutocomplete(textarea, suggestions, type) { console.log(">>>>>>
 
       if (match) {
         const lastWord = match[0];
-        const matches = suggestions.filter(s => s.startsWith(lastWord) && s.type === type);
+        const tr = textarea.parentNode.parentNode.parentNode;
+        let type = tr.querySelector('.type_output').value
+        console.log(">>>>>>>>> type: " + type);
+        const matches = suggestions.filter(s => s.command.startsWith(lastWord) && (String(s.type) == String(type) || String(s.type) == '0' )).map(s => s.command);
+        // const matches = suggestions.filter(s => s.startsWith(lastWord));
+        console.log(">>>>>>>>> matches: " + JSON.stringify(matches));
         showSuggestions(matches, autocompleteList);
       } else {
         hideSuggestions(autocompleteList);

From 6cc0a63b94dce493fc9d57347c6d41b32a567ecc Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 22:43:20 +0200
Subject: [PATCH 20/68] log statement commented out

---
 customprompts/mzta-custom-prompts.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index 6e72b4a3..294d6d76 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -682,10 +682,11 @@ function textareaAutocomplete(textarea, suggestions) {
         const lastWord = match[0];
         const tr = textarea.parentNode.parentNode.parentNode;
         let type = tr.querySelector('.type_output').value
-        console.log(">>>>>>>>> type: " + type);
+        // console.log(">>>>>>>>> type: " + type);
+        // console.log(">>>>>>>>> suggestions: " + JSON.stringify(suggestions));
+        // console.log(">>>>>>>>> lastWord: " + lastWord);
         const matches = suggestions.filter(s => s.command.startsWith(lastWord) && (String(s.type) == String(type) || String(s.type) == '0' )).map(s => s.command);
-        // const matches = suggestions.filter(s => s.startsWith(lastWord));
-        console.log(">>>>>>>>> matches: " + JSON.stringify(matches));
+        // console.log(">>>>>>>>> matches: " + JSON.stringify(matches));
         showSuggestions(matches, autocompleteList);
       } else {
         hideSuggestions(autocompleteList);

From 01f5376bd840aed25a67dad803e19fd37984c17d Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 22:48:54 +0200
Subject: [PATCH 21/68] custom prompts row cancel and edit again fixed. the
 values are now set to the saved ones

---
 customprompts/mzta-custom-prompts.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index 294d6d76..a38ef1a2 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -349,6 +349,13 @@ function handleCancelClick(e) {
 //        tr.querySelector('.btnCancelItem').style.display = 'none';   // Cancel btn
     tr.querySelector('.btnEditItem').style.display = 'inline';   // Edit btn
     tr.querySelector('.btnDeleteItem').style.display = 'inline';   // Delete btn
+    tr.querySelector('.id_output').value = tr.querySelector('.id_show').innerText.toLocaleUpperCase();
+    tr.querySelector('.name_output').value = tr.querySelector('.name_show').innerText;
+    tr.querySelector('.text_output').value = tr.querySelector('.text_show').innerText;
+    tr.querySelector('.type_output').value = tr.querySelector('.type').innerText;
+    // tr.querySelector('.type_output').selectedOptions[0].text = tr.querySelector('.type_show').innerText;
+    tr.querySelector('.action_output').value = tr.querySelector('.action').innerText;
+    // tr.querySelector('.action_output').selectedOptions[0].text = tr.querySelector('.action_show').innerText;
     hideItemRowEditor(tr);
 }
 

From 2c5e893da4330a4b3b9d6e8f9c3d0dbbdd36ee66 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 22:50:33 +0200
Subject: [PATCH 22/68] 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 fadd702c..1c89293f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 <h2>Version 2.3.0 - ??/??/2024</h2>
       <ul>
+        <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 7d3fc642..6fd9e5d4 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 2.3.0 - ??/??/2024</h2>
       <ul>
+        <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From 04005b42bf1b84967b4e54770d04fe319ff11615 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 23:06:53 +0200
Subject: [PATCH 23/68] html_body placeholder implemented

---
 js/mzta-compose-script.js | 3 +++
 js/mzta-menus.js          | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index b5bdbdd6..05c958b6 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -55,6 +55,9 @@ switch (message.command) {
   case "getTextOnly":
       return Promise.resolve(window.document.body.innerText);
 
+  case "getFullHtml":
+      return Promise.resolve(window.document.body.innerHTML);
+
   case 'promptTooLong':
     alert(browser.i18n.getMessage('msg_prompt_too_long'));
     return Promise.resolve(true);
diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index bb7793ba..de17a0dc 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -78,7 +78,8 @@ export class mzta_Menus {
             //const tabs = await browser.tabs.query({ active: true, currentWindow: true });
             return {tabId: tabs[0].id, 
                 selection: await browser.tabs.sendMessage(tabs[0].id, { command: "getSelectedText" }),
-                text: await browser.tabs.sendMessage(tabs[0].id, { command: "getTextOnly" })
+                text: await browser.tabs.sendMessage(tabs[0].id, { command: "getTextOnly" }),
+                html: await browser.tabs.sendMessage(tabs[0].id, { command: "getFullHtml" }),
             };
         };
     
@@ -130,6 +131,9 @@ export class mzta_Menus {
                         case 'mail_body':
                             finalSubs['mail_body'] = body_text;
                             break;
+                        case 'html_body': console.log(">>>>>>>>>> html_body: " + msg_text.html);
+                            finalSubs['html_body'] = msg_text.html;
+                            break;
                         case 'mail_subject':
                             finalSubs['mail_subject'] = mail_subject;
                             break;

From e256684b9835058e05171505c77083c05941ca15 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 21:18:29 +0200
Subject: [PATCH 24/68] getHighlight renamed to getMailData

---
 js/mzta-menus.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index de17a0dc..7c2215af 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -74,7 +74,7 @@ export class mzta_Menus {
 
         let curr_menu_entry = {id: curr_prompt.id, is_default: curr_prompt.is_default, name: curr_prompt.name};
     
-        const getHighlight = async (tabs) => {
+        const getMailData = async (tabs) => {
             //const tabs = await browser.tabs.query({ active: true, currentWindow: true });
             return {tabId: tabs[0].id, 
                 selection: await browser.tabs.sendMessage(tabs[0].id, { command: "getSelectedText" }),
@@ -85,7 +85,7 @@ export class mzta_Menus {
     
         curr_menu_entry.act = async () => {
             const tabs = await browser.tabs.query({ active: true, currentWindow: true });
-            const msg_text = await getHighlight(tabs);
+            const msg_text = await getMailData(tabs);
     
             //check if a selection is needed
             if(String(curr_prompt.need_selected) == "1" && (msg_text.selection==='')){
@@ -140,7 +140,7 @@ export class mzta_Menus {
                         case 'selected_text':
                             finalSubs['selected_text'] = selection_text;
                             break;
-                        default:    // TODO Manage custom placeholders
+                        default:    // TODO Manage custom placeholders https://github.com/micz/ThunderAI/issues/156
                             break;
                     }
                 }

From 829a68fb0270c17ca8b7c9912dcaed2c54b4d5bb Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 21:35:21 +0200
Subject: [PATCH 25/68] getMailData renamed to getMailBody

---
 js/mzta-menus.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 7c2215af..16b39fea 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -74,7 +74,7 @@ export class mzta_Menus {
 
         let curr_menu_entry = {id: curr_prompt.id, is_default: curr_prompt.is_default, name: curr_prompt.name};
     
-        const getMailData = async (tabs) => {
+        const getMailBody = async (tabs) => {
             //const tabs = await browser.tabs.query({ active: true, currentWindow: true });
             return {tabId: tabs[0].id, 
                 selection: await browser.tabs.sendMessage(tabs[0].id, { command: "getSelectedText" }),
@@ -85,7 +85,7 @@ export class mzta_Menus {
     
         curr_menu_entry.act = async () => {
             const tabs = await browser.tabs.query({ active: true, currentWindow: true });
-            const msg_text = await getMailData(tabs);
+            const msg_text = await getMailBody(tabs);
     
             //check if a selection is needed
             if(String(curr_prompt.need_selected) == "1" && (msg_text.selection==='')){

From 969360e89f04d95e0fb8be1980467fef631225f3 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 21:51:37 +0200
Subject: [PATCH 26/68] added many default placeholders. see #153

---
 _locales/en/messages.json |  4 ++++
 js/mzta-menus.js          | 21 ++++++++++++++++-----
 js/mzta-placeholders.js   | 13 ++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index d5918bd9..cdd3ad4d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -619,6 +619,10 @@
     "message": "Recipients",
     "description": ""
   },
+  "placeholder_cc_list": {
+    "message": "CC list",
+    "description": ""
+  },
   "placeholder_author": {
     "message": "Author",
     "description": ""
diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 16b39fea..62c3502e 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -113,33 +113,44 @@ export class mzta_Menus {
                 }
             }
 
-            // let mail_subject = await getMailSubject(tabs[0]);
-            // console.log(">>>>>>>>>>>>>>> mail_subject: " + mail_subject);
-    
             let fullPrompt = '';
             if(!placeholdersUtils.hasPlaceholder(curr_prompt.text)){
                 // no placeholders, do as usual
                 fullPrompt = curr_prompt.text + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang + " \"" + (selection_text=='' ? body_text : selection_text) + "\" ";
             }else{
-                let mail_subject = await getMailSubject(tabs[0]);
                 // we have at least a placeholder, do the magic!
                 let currPHs = await placeholdersUtils.extractPlaceholders(curr_prompt.text);
                 // console.log(">>>>>>>>>> currPHs: " + JSON.stringify(currPHs));
                 let finalSubs = {};
+                let curr_messages = await browser.mailTabs.getSelectedMessages();
+                let curr_message = curr_messages.messages[0];
                 for(let currPH of currPHs){
                     switch(currPH.id){
                         case 'mail_body':
                             finalSubs['mail_body'] = body_text;
                             break;
-                        case 'html_body': console.log(">>>>>>>>>> html_body: " + msg_text.html);
+                        case 'html_body':
                             finalSubs['html_body'] = msg_text.html;
                             break;
                         case 'mail_subject':
+                            let mail_subject = await getMailSubject(tabs[0]);
                             finalSubs['mail_subject'] = mail_subject;
                             break;
                         case 'selected_text':
                             finalSubs['selected_text'] = selection_text;
                             break;
+                        case 'author':
+                            finalSubs['author'] = curr_message.author;
+                            break;
+                        case 'recipients':
+                            finalSubs['recipients'] = curr_message.recipients.join(", ");
+                            break;
+                        case 'cc_list':
+                            finalSubs['cc_list'] = curr_message.ccList.join(", ");
+                            break;
+                        case 'junk_score':
+                            finalSubs['junk_score'] = curr_message.junkScore;
+                            break;
                         default:    // TODO Manage custom placeholders https://github.com/micz/ThunderAI/issues/156
                             break;
                     }
diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 48d2aa0f..60851f37 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -69,21 +69,28 @@ const defaultPlaceholders = [
         is_default: "1",
     },
     {
-        id: 'junk_score',  //TODO
+        id: 'junk_score',
         name: "__MSG_placeholder_junk_score__",
         text: "",
         type: 1,
         is_default: "1",
     },
     {
-        id: 'recipients',  //TODO
+        id: 'recipients',
         name: "__MSG_placeholder_recipients__",
         text: "",
         type: 0,
         is_default: "1",
     },
     {
-        id: 'author',  //TODO
+        id: 'cc_list',
+        name: "__MSG_placeholder_cc_list__",
+        text: "",
+        type: 0,
+        is_default: "1",
+    },
+    {
+        id: 'author',
         name: "__MSG_placeholder_author__",
         text: "",
         type: 0,

From 58f92610d554e23796ee80180a1e1aa8e5348221 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 22:03:02 +0200
Subject: [PATCH 27/68] placeholders_use_default_value option added and
 implemented. see #146

---
 _locales/en/messages.json       |  8 ++++++++
 js/mzta-menus.js                |  3 ++-
 js/mzta-placeholders.js         | 23 ++++++++++++-----------
 options/mzta-options-default.js |  1 +
 options/mzta-options.html       | 11 +++++++++++
 5 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index cdd3ad4d..4552126c 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -626,5 +626,13 @@
   "placeholder_author": {
     "message": "Author",
     "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value": {
+    "message": "Placeholders: Use default value",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value_info": {
+    "message": "If checked, the placeholders will be filled with the default values when no value is provided. Otherwise, the placeholders will be kept in place.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 62c3502e..f1f54425 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -156,7 +156,8 @@ export class mzta_Menus {
                     }
                 }
                 // console.log(">>>>>>>>>> finalSubs: " + JSON.stringify(finalSubs));
-                fullPrompt = placeholdersUtils.replacePlaceholders(curr_prompt.text, finalSubs) + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang;
+                let prefs_ph = await browser.storage.sync.get({placeholders_use_default_value: false});
+                fullPrompt = placeholdersUtils.replacePlaceholders(curr_prompt.text, finalSubs, prefs_ph.placeholders_use_default_value) + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang;
             }
             
             switch(curr_prompt.id){
diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 60851f37..98ce7e30 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -36,63 +36,63 @@ const defaultPlaceholders = [
     {
         id: 'mail_body',
         name: "__MSG_placeholder_mail_body__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'html_body',
         name: "__MSG_placeholder_html_body__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'mail_subject',
         name: "__MSG_placeholder_mail_subject__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'selected_text',
         name: "__MSG_placeholder_selected_text__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'additional_text',  //TODO
         name: "__MSG_placeholder_additional_text__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'junk_score',
         name: "__MSG_placeholder_junk_score__",
-        text: "",
+        default_value: "0",
         type: 1,
         is_default: "1",
     },
     {
         id: 'recipients',
         name: "__MSG_placeholder_recipients__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'cc_list',
         name: "__MSG_placeholder_cc_list__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
     {
         id: 'author',
         name: "__MSG_placeholder_author__",
-        text: "",
+        default_value: "",
         type: 0,
         is_default: "1",
     },
@@ -183,11 +183,12 @@ export const placeholdersUtils = {
         return matches;
     },
 
-    replacePlaceholders(text, replacements) {
+    replacePlaceholders(text, replacements, use_dafault_value = false) {
         // Regular expression to match patterns like {%...%}
         return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
           // p1 contains the key inside {% %}
-          return replacements[p1] || match; // Replace if found, otherwise keep the original
+          // Replace if found, otherwise keep the original or substitute with default value
+          return replacements[p1] || use_dafault_value ? defaultPlaceholders.find(ph => ph.id === p1).default_value : match;
         });
     },
 
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index 1f055670..f3b41862 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -32,4 +32,5 @@ export const prefs_default = {
     openai_comp_chat_name: 'OpenAI Comp',
     dynamic_menu_force_enter: false,
     dynamic_menu_order_alphabet: true,
+    placeholders_use_default_value: false,
 }
\ No newline at end of file
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 050d87b5..70ed66ac 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -81,6 +81,17 @@
           </label>
         </td>
       </tr>
+      <tr>
+        <td><label>
+          <span>__MSG_prefs_OptionText_placeholders_use_default_value__</span>
+        </label></td>
+        <td>
+          <label>
+            <input type="checkbox" id="placeholders_use_default_value" name="placeholders_use_default_value" class="option-input" />
+            &nbsp;<span>__MSG_prefs_OptionText_placeholders_use_default_value_info__</span>
+          </label>
+        </td>
+      </tr>
       <tr>
         <td>
           <label>

From a5600cdf75d129dd0e0d4ddf3403c6a539106ed6 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 22:06:05 +0200
Subject: [PATCH 28/68] statement fixed

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

diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 98ce7e30..910ea016 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -188,7 +188,7 @@ export const placeholdersUtils = {
         return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
           // p1 contains the key inside {% %}
           // Replace if found, otherwise keep the original or substitute with default value
-          return replacements[p1] || use_dafault_value ? defaultPlaceholders.find(ph => ph.id === p1).default_value : match;
+          return replacements[p1] || (use_dafault_value ? defaultPlaceholders.find(ph => ph.id === p1).default_value : match);
         });
     },
 

From 57e45b3df8eb4da9e694bfe6a51023d90750aaec Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 22:14:54 +0200
Subject: [PATCH 29/68] better autocomplete keyboard interaction. see #157

---
 customprompts/mzta-custom-prompts.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index a38ef1a2..34930c0f 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -701,6 +701,9 @@ function textareaAutocomplete(textarea, suggestions) {
     });
 
     textarea.addEventListener('keydown', (e) => {
+      if (autocompleteList.classList.contains('hidden')) {
+        return;
+      }
       const items = autocompleteList.querySelectorAll('li');
       if (items.length > 0) {
         if (e.key === 'ArrowDown') {
@@ -713,6 +716,7 @@ function textareaAutocomplete(textarea, suggestions) {
           updateActiveSuggestion(items, activeIndex);
         } else if (e.key === 'Enter') {
           e.preventDefault();
+          if(activeIndex === -1) activeIndex = 0;
           if (activeIndex >= 0 && activeIndex < items.length) {
             insertAutocomplete(items[activeIndex].textContent, textarea);
             hideSuggestions(autocompleteList);

From b29d9034c68f6c8199a6a10af5664ec6e8858832 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 22:24:15 +0200
Subject: [PATCH 30/68] sanitizeHtml method added

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

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index 3c046e71..ef604ba0 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -107,6 +107,11 @@ export async function replaceBody(tabId, replyHtml) {
   await messenger.compose.setComposeDetails(tabId, {body: fullBody});
 }
 
+export function sanitizeHtml(input) {
+  // Keep only <br> tags and remove all other HTML tags
+  return input.replace(/<(?!br\s*\/?)[^>]+>/gi, '');
+}
+
 export function i18nConditionalGet(str) {
   // if we are getting a string that starts with '__MSG_' and ends with '__' we return the translated string
   // using the browser.i18n API

From 15fb0c6e7205ad42f74bb84cafb527ce5783ad95 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 22:26:20 +0200
Subject: [PATCH 31/68] fixed handling of new lines in prompts textareas

---
 customprompts/mzta-custom-prompts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index 34930c0f..f105427d 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -17,7 +17,7 @@
  */
 
 import { getPrompts, setDefaultPromptsProperties, setCustomPrompts, preparePromptsForExport, preparePromptsForImport } from "../js/mzta-prompts.js";
-import { isThunderbird128OrGreater, getCustomPromptsUsedSpace } from "../js/mzta-utils.js";
+import { isThunderbird128OrGreater, getCustomPromptsUsedSpace, sanitizeHtml } from "../js/mzta-utils.js";
 import { taLogger } from "../js/mzta-logger.js";
 import { getPlaceholders } from "../js/mzta-placeholders.js";
 
@@ -351,7 +351,7 @@ function handleCancelClick(e) {
     tr.querySelector('.btnDeleteItem').style.display = 'inline';   // Delete btn
     tr.querySelector('.id_output').value = tr.querySelector('.id_show').innerText.toLocaleUpperCase();
     tr.querySelector('.name_output').value = tr.querySelector('.name_show').innerText;
-    tr.querySelector('.text_output').value = tr.querySelector('.text_show').innerText;
+    tr.querySelector('.text_output').value = sanitizeHtml(tr.querySelector('.text_show').innerHTML).replace(/<br\s*\/?>/gi, "\n");
     tr.querySelector('.type_output').value = tr.querySelector('.type').innerText;
     // tr.querySelector('.type_output').selectedOptions[0].text = tr.querySelector('.type_show').innerText;
     tr.querySelector('.action_output').value = tr.querySelector('.action').innerText;
@@ -431,7 +431,7 @@ function loadPromptsList(values){
             let output = `<tr ` + ((values.is_default == 1) ? 'class="is_default"':'') + `>
                 <td class="w08"><span class="id id_show"></span><input type="text" class="hiddendata id_output" value="` + values.id + `" /></td>
                 <td class="w08"><span class="name name_show"></span><input type="text" class="hiddendata name_output" value="` + values.name + `" /></td>
-                <td class="w40"><span class="text text_show"></span><div class="autocomplete-container"><textarea class="hiddendata text_output editor">` + values.text + `</textarea><ul class="autocomplete-list hidden"></ul></div></td>
+                <td class="w40"><span class="text text_show"></span><div class="autocomplete-container"><textarea class="hiddendata text_output editor">` + values.text.replace(/<br\s*\/?>/gi, "\n") + `</textarea><ul class="autocomplete-list hidden"></ul></div></td>
                 <td class="w08"><span class="type_show">` + type_output + `</span>
                 <select class="type_output hiddendata">
                 <option value="0"` + ((values.type == "0") ? ' selected':'') + `>__MSG_customPrompts_add_to_menu_always__</option>

From 1d718b3797277e4805dc97ff54a5658b2bfaa662 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 23:43:13 +0200
Subject: [PATCH 32/68] additional_text implemented for api calls. see #153

---
 api_webchat/controller.js | 14 +++++++++++++-
 js/mzta-placeholders.js   |  2 +-
 mzta-background.js        |  6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index 6555c78b..c14e0403 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -20,10 +20,13 @@
  *  The original code has been released under the Apache License, Version 2.0.
  */
 
+import { placeholdersUtils } from '../js/mzta-placeholders.js';
+
 // Get the LLM to be used
 const urlParams = new URLSearchParams(window.location.search);
 const llm = urlParams.get('llm');
 const call_id = urlParams.get('call_id');
+const ph_def_val = urlParams.get('ph_def_val');
 
 // Data received from the user
 let promptData = null;
@@ -93,6 +96,7 @@ switch (llm) {
     }
 }
 
+//let prefs_ph = await browser.storage.sync.get({placeholders_use_default_value: false});
 
 // Event listeners for worker messages
 worker.onmessage = function(event) {
@@ -126,7 +130,15 @@ browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
             if(message.do_custom_text=="1") {
                 let userInput = prompt(browser.i18n.getMessage("chatgpt_win_custom_text"));
                 if(userInput !== null) {
-                    message.prompt += " " + userInput;
+                    if(!placeholdersUtils.hasPlaceholder(message.prompt, 'additional_text')){
+                        // no additional_text placeholder, do as usual
+                        message.prompt += " " + userInput;
+                    }else{
+                        // we have the additional_text placeholder, do the magic!
+                        let finalSubs = {};
+                        finalSubs["additional_text"] = userInput;
+                        message.prompt = placeholdersUtils.replacePlaceholders(message.prompt, finalSubs, ph_def_val==='1')
+                    }
                 }
             }
             promptData = message;
diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 910ea016..5b11d664 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -62,7 +62,7 @@ const defaultPlaceholders = [
         is_default: "1",
     },
     {
-        id: 'additional_text',  //TODO
+        id: 'additional_text',
         name: "__MSG_placeholder_additional_text__",
         default_value: "",
         type: 0,
diff --git a/mzta-background.js b/mzta-background.js
index 6b81f782..69c45785 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -342,7 +342,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
         browser.runtime.onMessage.addListener(listener2);
 
         let win_options2 = {
-            url: browser.runtime.getURL('api_webchat/index.html?llm='+prefs.connection_type+'&call_id='+rand_call_id2),
+            url: browser.runtime.getURL('api_webchat/index.html?llm='+prefs.connection_type+'&call_id='+rand_call_id2+'&ph_def_val='+(prefs.placeholders_use_default_value?'1':'0')),
             type: "popup",
         }
 
@@ -399,7 +399,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
             browser.runtime.onMessage.addListener(listener3);
 
             let win_options3 = {
-                url: browser.runtime.getURL('api_webchat/index.html?llm='+prefs.connection_type+'&call_id='+rand_call_id3),
+                url: browser.runtime.getURL('api_webchat/index.html?llm='+prefs.connection_type+'&call_id='+rand_call_id3+'&ph_def_val='+(prefs.placeholders_use_default_value?'1':'0')),
                 type: "popup",
             }
 
@@ -450,7 +450,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
                 browser.runtime.onMessage.addListener(listener4);
 
                 let win_options4 = {
-                    url: browser.runtime.getURL('api_webchat/index.html?llm='+prefs.connection_type+'&call_id='+rand_call_id4),
+                    url: browser.runtime.getURL('api_webchat/index.html?llm='+prefs.connection_type+'&call_id='+rand_call_id4+'&ph_def_val='+(prefs.placeholders_use_default_value?'1':'0')),
                     type: "popup",
                 }
 

From 7544699422bb3fd7262ad941117140531e4e7ade Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 16 Oct 2024 00:20:54 +0200
Subject: [PATCH 33/68] additional_text implemented for chatgpt_web. see #153

---
 js/mzta-chatgpt.js      | 16 +++++++++++++++-
 js/mzta-menus.js        |  2 +-
 js/mzta-placeholders.js |  7 +++++--
 mzta-background.js      |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/js/mzta-chatgpt.js b/js/mzta-chatgpt.js
index cf50b4a9..b6bcd255 100644
--- a/js/mzta-chatgpt.js
+++ b/js/mzta-chatgpt.js
@@ -256,7 +256,21 @@ function showCustomTextField(){
 }
 
 async function doProceed(message, customText = ''){
-    let send_result = await chatgpt_sendMsg(message.prompt+' '+customText,'click');
+    let final_prompt = message.prompt;
+// console.log(">>>>>>>>>>>> doProceed customText: " + customText);
+// console.log(">>>>>>>>>>>> doProceed final_prompt: " + final_prompt);
+// console.log(">>>>>>>>>>>> doProceed mztaPhDefVal: " + JSON.stringify(mztaPhDefVal));
+    //check if there is che additional_text placeholder
+    if(final_prompt.includes('{%additional_text%}')){
+        // console.log(">>>>>>>>>>>> found ph customText: " + customText);
+        final_prompt = final_prompt.replace('{%additional_text%}', customText || (mztaPhDefVal == '1'?'':'{%additional_text%}'));
+    }else{
+        if(customText != ''){
+            final_prompt += ' '+customText;
+        }
+    }
+
+    let send_result = await chatgpt_sendMsg(final_prompt,'click');
     //console.log(">>>>>>>>>>> send_result: " + send_result);
     switch(send_result){
         case -1:        // send button not found
diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index f1f54425..071c7476 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -157,7 +157,7 @@ export class mzta_Menus {
                 }
                 // console.log(">>>>>>>>>> finalSubs: " + JSON.stringify(finalSubs));
                 let prefs_ph = await browser.storage.sync.get({placeholders_use_default_value: false});
-                fullPrompt = placeholdersUtils.replacePlaceholders(curr_prompt.text, finalSubs, prefs_ph.placeholders_use_default_value) + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang;
+                fullPrompt = placeholdersUtils.replacePlaceholders(curr_prompt.text, finalSubs, prefs_ph.placeholders_use_default_value, true) + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang;
             }
             
             switch(curr_prompt.id){
diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 5b11d664..51a846a5 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -183,12 +183,15 @@ export const placeholdersUtils = {
         return matches;
     },
 
-    replacePlaceholders(text, replacements, use_dafault_value = false) {
+    replacePlaceholders(text, replacements, use_default_value = false, skip_additional_text = false) {
         // Regular expression to match patterns like {%...%}
         return text.replace(/{%\s*(.*?)\s*%}/g, function(match, p1) {
           // p1 contains the key inside {% %}
+          if (skip_additional_text && (p1 === 'additional_text')) {
+            return match;
+          }
           // Replace if found, otherwise keep the original or substitute with default value
-          return replacements[p1] || (use_dafault_value ? defaultPlaceholders.find(ph => ph.id === p1).default_value : match);
+          return replacements[p1] || (use_default_value ? defaultPlaceholders.find(ph => ph.id === p1).default_value : match);
         });
     },
 
diff --git a/mzta-background.js b/mzta-background.js
index 69c45785..b91d2ee5 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -281,6 +281,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
                 let mztaForceCompletionTitle="`+ browser.i18n.getMessage("chatgpt_force_completion_title") +`";
                 let mztaDoCustomText=`+ do_custom_text +`;
                 let mztaPromptName="[`+ i18nConditionalGet(prompt_name) +`]";
+                let mztaPhDefVal="`+(prefs.placeholders_use_default_value?'1':'0')+`";
                 `;
 
                 taLog.log("Waiting 1 sec");

From 65aa865ff644acaa852782a02b3648126aef36c4 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Oct 2024 18:00:17 +0200
Subject: [PATCH 34/68] added a warning red border when adding placeholders
 without the right prompt configuration. see #146

---
 customprompts/mzta-custom-prompts.css  |  4 +++-
 customprompts/mzta-custom-prompts.html |  4 ++--
 customprompts/mzta-custom-prompts.js   | 33 ++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/customprompts/mzta-custom-prompts.css b/customprompts/mzta-custom-prompts.css
index 5a8e9bb1..d96b29ca 100644
--- a/customprompts/mzta-custom-prompts.css
+++ b/customprompts/mzta-custom-prompts.css
@@ -199,8 +199,10 @@ table .sort.desc {
 .hidden {
     display: none;
 }
-  
 
+.need_custom_text_span, .need_selected_span{
+    padding-right: 2px;
+}
 
 @media (prefers-color-scheme: dark) {
     body {
diff --git a/customprompts/mzta-custom-prompts.html b/customprompts/mzta-custom-prompts.html
index 0da8e41d..885501c1 100644
--- a/customprompts/mzta-custom-prompts.html
+++ b/customprompts/mzta-custom-prompts.html
@@ -49,11 +49,11 @@
                 </select>
             </td>
             <td rowspan="2" class="w19">
-                <input type="checkbox" id="checkboxNeedSelectedNew" name="need_selected" value="1" tabindex="6"> <label for="checkboxNeedSelectedNew">__MSG_customPrompts_form_label_need_selected__</label>
+                <span class="need_selected_span"><input type="checkbox" id="checkboxNeedSelectedNew" name="need_selected" class="need_selected_new" value="1" tabindex="6"> <label for="checkboxNeedSelectedNew">__MSG_customPrompts_form_label_need_selected__</label></span>
                 <br>
                 <input type="checkbox" id="checkboxNeedSignatureNew" name="need_signature" value="1" tabindex="7"> <label for="checkboxNeedSignatureNew">__MSG_customPrompts_form_label_need_signature__</label>
                 <br>
-                <input type="checkbox" id="checkboxNeedCustomTextNew" name="need_custom_text" value="1" tabindex="8"> <label for="checkboxNeedCustomTextNew">__MSG_customPrompts_form_label_need_custom_text__</label>
+                <span class="need_custom_text_span"><input type="checkbox" id="checkboxNeedCustomTextNew" name="need_custom_text" class="need_custom_text_new" value="1" tabindex="8"> <label for="checkboxNeedCustomTextNew">__MSG_customPrompts_form_label_need_custom_text__</label></span>
                 <br>
                 <input type="checkbox" id="checkboxDefineResponseLangNew" name="define_response_lang" value="1" tabindex="8"> <label for="checkboxDefineResponseLangNew">__MSG_customPrompts_form_label_define_response_lang__</label>
             </td>
diff --git a/customprompts/mzta-custom-prompts.js b/customprompts/mzta-custom-prompts.js
index f105427d..36874407 100644
--- a/customprompts/mzta-custom-prompts.js
+++ b/customprompts/mzta-custom-prompts.js
@@ -385,6 +385,11 @@ function handleCheckboxChange(e) {
     e.preventDefault();
     e.target.setAttribute('checked_val', e.target.checked ? '1' : '0');
     //console.log('>>>>>>>> checked_val: ' + e.target.getAttribute('checked_val'));
+    if (e.target.classList.contains('need_selected') || e.target.classList.contains('need_custom_text') || e.target.classList.contains('need_selected_new') || e.target.classList.contains('need_custom_text_new')) {
+        let textarea = e.target.closest('tr').querySelector('.text_output');
+        checkPromptsConfigForPlaceholders(textarea);
+    }
+    
 }
 
 // Enable save button on input change
@@ -449,11 +454,11 @@ function loadPromptsList(values){
                   </select>` +
                   `<span class="action hiddendata"></span>
                     <br>
-                    <input type="checkbox" class="need_selected" disabled> __MSG_customPrompts_form_label_need_selected__
+                    <span class="need_selected_span"><input type="checkbox" class="need_selected" disabled> __MSG_customPrompts_form_label_need_selected__</span>
                     <br>
                     <input type="checkbox" class="need_signature" disabled> __MSG_customPrompts_form_label_need_signature__
                     <br>
-                    <input type="checkbox" class="need_custom_text` + ((values.is_default == 1) ? ' input_mod':'') + `"` + ((values.is_default == 0) ? ' disabled':'') + ` > __MSG_customPrompts_form_label_need_custom_text__
+                    <span class="need_custom_text_span"><input type="checkbox" class="need_custom_text` + ((values.is_default == 1) ? ' input_mod':'') + `"` + ((values.is_default == 0) ? ' disabled':'') + ` > __MSG_customPrompts_form_label_need_custom_text__</span>
                     <br>
                     <input type="checkbox" class="define_response_lang" disabled> __MSG_customPrompts_form_label_define_response_lang__
                     <br>
@@ -685,6 +690,8 @@ function textareaAutocomplete(textarea, suggestions) {
       const text = textarea.value.substring(0, cursorPosition);
       const match = text.match(/{%[^\s]*$/);
 
+      checkPromptsConfigForPlaceholders(textarea);
+
       if (match) {
         const lastWord = match[0];
         const tr = textarea.parentNode.parentNode.parentNode;
@@ -788,4 +795,26 @@ function textareaAutocomplete(textarea, suggestions) {
         }
     });
 
+}
+
+function checkPromptsConfigForPlaceholders(textarea){
+    // check additional_text and selected_text placeholders presence and the corrispondent checkboxes
+    if(String(textarea.value).indexOf('{%additional_text%}') != -1){
+        let tr_ancestor = textarea.closest('tr');
+        let need_custom_text_element = tr_ancestor.querySelector('.need_custom_text') || tr_ancestor.querySelector('.need_custom_text_new');
+        if(!need_custom_text_element.checked){
+            need_custom_text_element.closest('.need_custom_text_span').style.border = '2px solid red';
+        }else{
+            need_custom_text_element.closest('.need_custom_text_span').style.border = '';
+        }
+      }
+      if(String(textarea.value).indexOf('{%selected_text%}') != -1){
+        let tr_ancestor = textarea.closest('tr');
+        let selected_text_element = tr_ancestor.querySelector('.need_selected') || tr_ancestor.querySelector('.need_selected_new');
+        if(!selected_text_element.checked){
+            selected_text_element.closest('.need_selected_span').style.border = '2px solid red';
+        }else{
+            selected_text_element.closest('.need_selected_span').style.border = '';
+        }
+      }
 }
\ No newline at end of file

From 0f8f45f8edf4ff0d72bed884f75ba1a8dec0d00c Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 16 Oct 2024 18:22:08 +0200
Subject: [PATCH 35/68] Renamed mail_body and html_body placeholders. fixes
 #164

---
 _locales/en/messages.json | 4 ++--
 js/mzta-menus.js          | 8 ++++----
 js/mzta-placeholders.js   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 4552126c..b6f79275 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -591,11 +591,11 @@
     "message": "In case of login issues in the ThunderAI window, open ChatGPT in a new tab using the button on the right, log in, then close the tab and continue using ThunderAI.",
     "description": ""
   },
-  "placeholder_mail_body": {
+  "placeholder_mail_text_body": {
     "message": "Mail body",
     "description": ""
   },
-  "placeholder_html_body": {
+  "placeholder_mail_html_body": {
     "message": "HTML mail body",
     "description": ""
   },
diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 071c7476..10e0b8cc 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -126,11 +126,11 @@ export class mzta_Menus {
                 let curr_message = curr_messages.messages[0];
                 for(let currPH of currPHs){
                     switch(currPH.id){
-                        case 'mail_body':
-                            finalSubs['mail_body'] = body_text;
+                        case 'mail_text_body':
+                            finalSubs['mail_text_body'] = body_text;
                             break;
-                        case 'html_body':
-                            finalSubs['html_body'] = msg_text.html;
+                        case 'mail_html_body':
+                            finalSubs['mail_html_body'] = msg_text.html;
                             break;
                         case 'mail_subject':
                             let mail_subject = await getMailSubject(tabs[0]);
diff --git a/js/mzta-placeholders.js b/js/mzta-placeholders.js
index 51a846a5..5c1fbff8 100644
--- a/js/mzta-placeholders.js
+++ b/js/mzta-placeholders.js
@@ -34,15 +34,15 @@
 
 const defaultPlaceholders = [
     {
-        id: 'mail_body',
-        name: "__MSG_placeholder_mail_body__",
+        id: 'mail_text_body',
+        name: "__MSG_placeholder_mail_text_body__",
         default_value: "",
         type: 0,
         is_default: "1",
     },
     {
-        id: 'html_body',
-        name: "__MSG_placeholder_html_body__",
+        id: 'mail_html_body',
+        name: "__MSG_placeholder_mail_html_body__",
         default_value: "",
         type: 0,
         is_default: "1",

From 3cee7a2490cb9a71bdf813babc1ad7d44c81a87e Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 16 Oct 2024 20:46:17 +0200
Subject: [PATCH 36/68] prompt_reply improved

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

diff --git a/js/mzta-prompts.js b/js/mzta-prompts.js
index e39f65d1..8244783b 100644
--- a/js/mzta-prompts.js
+++ b/js/mzta-prompts.js
@@ -65,7 +65,7 @@ const defaultPrompts = [
     {
         id: 'prompt_reply',
         name: "__MSG_prompt_reply__",
-        text: "Reply to the following email.",
+        text: "Reply to the following email. Reply with only the needed text and with no extra comments or other text.",
         type: "1",
         action: "1",
         need_selected: "0",

From ecbcb578a36c0129fa193a020d9d4219df84e463 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 16 Oct 2024 20:47:31 +0200
Subject: [PATCH 37/68] 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 1c89293f..fbe98d93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 <h2>Version 2.3.0 - ??/??/2024</h2>
       <ul>
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
+        <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
+        <li>Text improved for "Reply to this" prompt.</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 6fd9e5d4..46f74646 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -10,6 +10,8 @@
       <h2>Version 2.3.0 - ??/??/2024</h2>
       <ul>
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
+        <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
+        <li>Text improved for "Reply to this" prompt.</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From 00cafc64d62d01597d0b94db9e85fe772533535f Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 16 Oct 2024 20:47:48 +0200
Subject: [PATCH 38/68] version set to 2.3.0pre1

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index a597c0a5..0650bd9b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "2.3.0",
+    "version": "2.3.0pre1",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {

From 01073a728e831750c7be5643d21df38e9deadb59 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 16 Oct 2024 22:56:32 +0200
Subject: [PATCH 39/68] working on using a dialog as a workaround

---
 js/mzta-compose-script.js | 60 +++++++++++++++++++++++++++++++++++++--
 js/mzta-menus.js          |  2 +-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index 05c958b6..b3460729 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -59,12 +59,68 @@ switch (message.command) {
       return Promise.resolve(window.document.body.innerHTML);
 
   case 'promptTooLong':
-    alert(browser.i18n.getMessage('msg_prompt_too_long'));
+    const dialog1 = window.document.createElement('dialog');
+    dialog1.classList.add('mzta_dialog');
+    const overlay1 = window.document.createElement('div');
+    overlay1.classList.add('mzta_dialog_overlay');
+
+    const content1 = window.document.createElement('div');
+    content1.classList.add('mzta_dialog_content');
+
+    const closeButton1 = window.document.createElement('div');
+    closeButton1.classList.add('mzta_dialog_close');
+    closeButton1.id = 'mzta_dialog_close';
+    closeButton1.textContent = 'x';
+
+    const message1 = window.document.createElement('div');
+    message1.textContent = browser.i18n.getMessage('msg_prompt_too_long');
+
+    content1.appendChild(closeButton1);
+    content1.appendChild(message1);
+    dialog1.appendChild(overlay1);
+    dialog1.appendChild(content1);
+    window.document.body.appendChild(dialog1);
+    dialog1.showModal();
+    const closeDialog1 = window.document.getElementById('mzta_dialog_close');
+    closeDialog1.onclick = () => {
+      dialog1.close();
+    };
+    // alert(browser.i18n.getMessage('msg_prompt_too_long'));
     return Promise.resolve(true);
     break;
 
   case 'sendAlert':
-    alert(message.message);
+    console.log(">>>>>> message.curr_tab_type: " + JSON.stringify(message.curr_tab_type));
+    if(message.curr_tab_type == 'mail'){  // workaround for Thunderbird bug not showing the alert
+      const dialog2 = window.document.createElement('dialog');
+      dialog2.classList.add('mzta_dialog');
+      const overlay2 = window.document.createElement('div');
+      overlay2.classList.add('mzta_dialog_overlay');
+
+      const content2 = window.document.createElement('div');
+      content2.classList.add('mzta_dialog_content');
+
+      const closeButton2 = window.document.createElement('div');
+      closeButton2.classList.add('mzta_dialog_close');
+      closeButton2.id = 'mzta_dialog_close';
+      closeButton2.textContent = 'x';
+
+      const message2 = window.document.createElement('div');
+      message2.textContent = message.message;
+
+      content2.appendChild(closeButton2);
+      content2.appendChild(message2);
+      dialog2.appendChild(overlay2);
+      dialog2.appendChild(content2);
+      window.document.body.appendChild(dialog2);
+      dialog2.showModal();
+      const closeDialog2 = window.document.getElementById('mzta_dialog_close');
+      closeDialog2.onclick = () => {
+        dialog2.close();
+      };
+    }else{
+      alert(message.message);
+    }
     return Promise.resolve(true);
     break;
 
diff --git a/js/mzta-menus.js b/js/mzta-menus.js
index 10e0b8cc..036af6dd 100644
--- a/js/mzta-menus.js
+++ b/js/mzta-menus.js
@@ -91,7 +91,7 @@ export class mzta_Menus {
             if(String(curr_prompt.need_selected) == "1" && (msg_text.selection==='')){
                 //A selection is needed, but nothing is selected!
                 //alert(browser.i18n.getMessage('prompt_selection_needed'));
-                browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", message : browser.i18n.getMessage('prompt_selection_needed') });
+                browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", curr_tab_type: tabs[0].type, message : browser.i18n.getMessage('prompt_selection_needed') });
                 return;
             }
     

From 3370fbf5e95675fc3e0506d4883320ad0f82c793 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Thu, 17 Oct 2024 17:10:32 +0200
Subject: [PATCH 40/68] Implemented a workaround for a Thunderbird bug, see
 #166

---
 js/mzta-compose-script.js | 163 +++++++++++++++++++++++++-------------
 mzta-background.js        |   3 +-
 2 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index b3460729..c7da261d 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -24,11 +24,11 @@ switch (message.command) {
   case "replaceSelectedText":
     const selectedText = window.getSelection().toString();
     if (selectedText === '') {
-      return false;
+      return Promise.resolve(false);
     }
     const sel = window.getSelection();
     if (!sel || sel.type !== "Range" || !sel.rangeCount) {
-      return false;
+      return Promise.resolve(false);
     }
     const r = sel.getRangeAt(0);
     r.deleteContents();
@@ -58,66 +58,117 @@ switch (message.command) {
   case "getFullHtml":
       return Promise.resolve(window.document.body.innerHTML);
 
-  case 'promptTooLong':
-    const dialog1 = window.document.createElement('dialog');
-    dialog1.classList.add('mzta_dialog');
-    const overlay1 = window.document.createElement('div');
-    overlay1.classList.add('mzta_dialog_overlay');
-
-    const content1 = window.document.createElement('div');
-    content1.classList.add('mzta_dialog_content');
-
-    const closeButton1 = window.document.createElement('div');
-    closeButton1.classList.add('mzta_dialog_close');
-    closeButton1.id = 'mzta_dialog_close';
-    closeButton1.textContent = 'x';
-
-    const message1 = window.document.createElement('div');
-    message1.textContent = browser.i18n.getMessage('msg_prompt_too_long');
-
-    content1.appendChild(closeButton1);
-    content1.appendChild(message1);
-    dialog1.appendChild(overlay1);
-    dialog1.appendChild(content1);
-    window.document.body.appendChild(dialog1);
-    dialog1.showModal();
-    const closeDialog1 = window.document.getElementById('mzta_dialog_close');
-    closeDialog1.onclick = () => {
-      dialog1.close();
-    };
-    // alert(browser.i18n.getMessage('msg_prompt_too_long'));
-    return Promise.resolve(true);
-    break;
-
   case 'sendAlert':
     console.log(">>>>>> message.curr_tab_type: " + JSON.stringify(message.curr_tab_type));
     if(message.curr_tab_type == 'mail'){  // workaround for Thunderbird bug not showing the alert
-      const dialog2 = window.document.createElement('dialog');
-      dialog2.classList.add('mzta_dialog');
-      const overlay2 = window.document.createElement('div');
-      overlay2.classList.add('mzta_dialog_overlay');
+// Create dialog elements
+const dialog_sendAlert = window.document.createElement('dialog');
+dialog_sendAlert.classList.add('mzta_dialog');
 
-      const content2 = window.document.createElement('div');
-      content2.classList.add('mzta_dialog_content');
+const content_sendAlert = window.document.createElement('div');
+content_sendAlert.classList.add('mzta_dialog_content');
 
-      const closeButton2 = window.document.createElement('div');
-      closeButton2.classList.add('mzta_dialog_close');
-      closeButton2.id = 'mzta_dialog_close';
-      closeButton2.textContent = 'x';
+// Create close button
+const closeButton_sendAlert = window.document.createElement('button');
+closeButton_sendAlert.classList.add('mzta_dialog_close');
+closeButton_sendAlert.id = 'mzta_dialog_close';
+closeButton_sendAlert.textContent = 'Close';
 
-      const message2 = window.document.createElement('div');
-      message2.textContent = message.message;
+// Create message element
+const message_sendAlert = window.document.createElement('div');
+message_sendAlert.classList.add('mzta_dialog_message');
+message_sendAlert.textContent = message.message;
+
+// Append elements to the dialog
+content_sendAlert.appendChild(message_sendAlert);
+content_sendAlert.appendChild(closeButton_sendAlert);
+dialog_sendAlert.appendChild(content_sendAlert);
+window.document.body.appendChild(dialog_sendAlert);
+
+// Show the dialog
+dialog_sendAlert.showModal();
+
+// Close dialog on button click and remove elements from the DOM
+closeButton_sendAlert.onclick = () => {
+  dialog_sendAlert.close();
+  dialog_sendAlert.addEventListener('close', () => {
+    dialog_sendAlert.remove();
+    style.remove();
+  });
+};
+
+// CSS styles for Thunderbird with support for light and dark themes
+const style = document.createElement('style');
+style.textContent = `
+  .mzta_dialog {
+    border: none;
+    border-radius: 8px;
+    padding: 0;
+    width: 300px;
+    max-width: 90%;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+    background-color: var(--dialog-bg-color, #fff);
+    color: var(--dialog-text-color, #000);
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 1001;
+  }
+
+  .mzta_dialog_content {
+    position: relative;
+    padding: 20px;
+  }
+
+  .mzta_dialog_close {
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+    background: #007bff;
+    border: none;
+    color: #ffffff;
+    font-size: 14px;
+    padding: 8px 12px;
+    cursor: pointer;
+    border-radius: 4px;
+  }
+
+  .mzta_dialog_close:hover {
+    background: #0056b3;
+  }
+
+  .mzta_dialog_message {
+    margin-bottom: 40px;
+    font-size: 14px;
+  }
+
+  /* Theme support */
+  :root {
+    --dialog-bg-color: #ffffff;
+    --dialog-text-color: #000000;
+  }
+
+  @media (prefers-color-scheme: dark) {
+    :root {
+      --dialog-bg-color: #2e2e2e;
+      --dialog-text-color: #ffffff;
+    }
+  }
+
+  /* Darker overlay for the page background */
+  .mzta_dialog_overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.7);
+    z-index: 1000;
+  }
+`;
+document.head.appendChild(style);
 
-      content2.appendChild(closeButton2);
-      content2.appendChild(message2);
-      dialog2.appendChild(overlay2);
-      dialog2.appendChild(content2);
-      window.document.body.appendChild(dialog2);
-      dialog2.showModal();
-      const closeDialog2 = window.document.getElementById('mzta_dialog_close');
-      closeDialog2.onclick = () => {
-        dialog2.close();
-      };
     }else{
       alert(message.message);
     }
@@ -126,7 +177,7 @@ switch (message.command) {
 
   default:
     // do nothing
-    return false;
+    return Promise.resolve(false);
     break;
 }    
 });
\ No newline at end of file
diff --git a/mzta-background.js b/mzta-background.js
index b91d2ee5..147a993c 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -247,7 +247,8 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
     taLog.log("[ThunderAI] Prompt length: " + promptText.length);
     if(promptText.length > 30000 ){
         // Prompt too long for ChatGPT
-        browser.tabs.sendMessage(curr_tabId, { command: "promptTooLong" });
+        let tabs = await browser.tabs.query({ active: true, currentWindow: true });
+        browser.tabs.sendMessage(curr_tabId, { command: "sendAlert", curr_tab_type: tabs[0].type, message: browser.i18n.getMessage('msg_prompt_too_long') });
         return;
     }
 

From 41d2405f2dc2e39dffeea5caa9bd36783f1cfbdb Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Thu, 17 Oct 2024 17:14:43 +0200
Subject: [PATCH 41/68] msg_prompt_too_long updated, we don't have only chatgpt
 now

---
 _locales/de/messages.json    | 2 +-
 _locales/en/messages.json    | 2 +-
 _locales/fr/messages.json    | 2 +-
 _locales/it/messages.json    | 2 +-
 _locales/pt-br/messages.json | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index ece5c7e0..05471f3b 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -260,7 +260,7 @@
     "description": ""
   },
   "msg_prompt_too_long": {
-    "message": "Der eingegebene Text ist zu lang. Sie müssen ihn verkürzen, um ChatGPT zu verwenden.",
+    "message": "Der von Ihnen bereitgestellte Text ist zu lang. Sie müssen ihn kürzen.",
     "description": ""
   },
   "prefs_OptionText_release_notes": {
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b6f79275..84e0f98d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -260,7 +260,7 @@
     "description": ""
   },
   "msg_prompt_too_long": {
-    "message": "The text you provided is too long. You need to reduce it to use ChatGPT.",
+    "message": "The text you provided is too long. You need to reduce it.",
     "description": ""
   },
   "prefs_OptionText_release_notes": {
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index e244852c..0dccfbd2 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -260,7 +260,7 @@
     "description": ""
   },
   "msg_prompt_too_long": {
-    "message": "Le texte que vous avez fourni est trop long. Vous devez le réduire pour utiliser ChatGPT.",
+    "message": "Le texte que vous avez fourni est trop long. Vous devez le raccourcir.",
     "description": ""
   },
   "prefs_OptionText_release_notes": {
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index e2d4bab6..1c0723ab 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -260,7 +260,7 @@
     "description": ""
   },
   "msg_prompt_too_long": {
-    "message": "Il testo che vuoi inviare a ChatGPT è troppo lungo. Devi ridurlo per poter procedere.",
+    "message": "Il testo che vuoi inviare è troppo lungo. Devi ridurlo per poter procedere.",
     "description": ""
   },
   "prefs_OptionText_release_notes": {
diff --git a/_locales/pt-br/messages.json b/_locales/pt-br/messages.json
index 580842f6..b9cd8689 100644
--- a/_locales/pt-br/messages.json
+++ b/_locales/pt-br/messages.json
@@ -260,7 +260,7 @@
     "description": ""
   },
   "msg_prompt_too_long": {
-    "message": "O texto que você forneceu é muito longo. Você precisa reduzi-lo para usar o ChatGPT.",
+    "message": "O texto que você forneceu é muito longo. Você precisa reduzi-lo.",
     "description": ""
   },
   "prefs_OptionText_release_notes": {

From 6808e3a81f367dbcd805409d8de95283279bd905 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Thu, 17 Oct 2024 17:35:36 +0200
Subject: [PATCH 42/68] max_prompt_length options added. fixes #165

---
 _locales/en/messages.json       | 8 ++++++++
 mzta-background.js              | 2 +-
 options/mzta-options-default.js | 1 +
 options/mzta-options.html       | 9 +++++++++
 options/mzta-options.js         | 8 ++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 84e0f98d..1dfe4efc 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -634,5 +634,13 @@
   "prefs_OptionText_placeholders_use_default_value_info": {
     "message": "If checked, the placeholders will be filled with the default values when no value is provided. Otherwise, the placeholders will be kept in place.",
     "description": ""
+  },
+  "prefs_OptionText_max_prompt_length" : {
+    "message": "Max prompt length",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length_Info" : {
+    "message": "This is the maximum number of characters that can be used in a prompt. Otherwise, an error message will be displayed. The value is not editable for the ChatGPT Web Interface.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/mzta-background.js b/mzta-background.js
index b91d2ee5..81ad08d7 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -245,7 +245,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
     prefs = checkScreenDimensions(prefs);
     //console.log(">>>>>>>>>>>>>>>> prefs: " + JSON.stringify(prefs));
     taLog.log("[ThunderAI] Prompt length: " + promptText.length);
-    if(promptText.length > 30000 ){
+    if(promptText.length > prefs.max_prompt_length){
         // Prompt too long for ChatGPT
         browser.tabs.sendMessage(curr_tabId, { command: "promptTooLong" });
         return;
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index f3b41862..1e5d97a6 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -33,4 +33,5 @@ export const prefs_default = {
     dynamic_menu_force_enter: false,
     dynamic_menu_order_alphabet: true,
     placeholders_use_default_value: false,
+    max_prompt_length: 30000,   // max string length for prompt
 }
\ No newline at end of file
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 70ed66ac..adcbc429 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -220,6 +220,15 @@
           </label>
         </td>
       </tr>
+      <tr>
+        <td><span>__MSG_prefs_OptionText_max_prompt_length__</span></td>
+        <td>
+          <label>
+            <input type="number" id="max_prompt_length" name="max_prompt_length" class="option-input" />
+            <br>__MSG_prefs_OptionText_max_prompt_length_Info__
+          </label>
+        </td>
+      </tr>
       <tr>
         <td style="width:20em"><label>
           <span>__MSG_Debug__</span>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index dcdc7d9b..a944b77a 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -93,6 +93,7 @@ async function restoreOptions() {
 }
 
 function showConnectionOptions() {
+  disable_MaxPromptLength();
   let chatgpt_web_display = 'table-row';
   let chatgpt_api_display = 'none';
   let ollama_api_display = 'none';
@@ -203,6 +204,12 @@ function warn_OpenAIComp_HostEmpty() {
   }
 }
 
+function disable_MaxPromptLength(){
+  let maxPromptLength = document.getElementById('max_prompt_length');
+  let conntype_select = document.getElementById("connection_type");
+  maxPromptLength.disabled = (conntype_select.value === "chatgpt_web");
+}
+
 document.addEventListener('DOMContentLoaded', async () => {
   await restoreOptions();
   i18n.updateDocument();
@@ -358,6 +365,7 @@ select_openai_comp_model.addEventListener("change", warn_OpenAIComp_HostEmpty);
   warn_ChatGPT_APIKeyEmpty();
   warn_Ollama_HostEmpty();
   warn_OpenAIComp_HostEmpty();
+  disable_MaxPromptLength();
 
   const passwordField_chatgpt_api_key = document.getElementById('chatgpt_api_key');
   const toggleIcon_chatgpt_api_key = document.getElementById('toggle_chatgpt_api_key');

From 327d5be4a1e7c1161720c10056cd2b4c226b327f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Thu, 17 Oct 2024 17:38:05 +0200
Subject: [PATCH 43/68] 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 fbe98d93..202f6134 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for "Reply to this" prompt.</li>
+        <li>Added an option to set the maximux number of characters in the prompt. [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 46f74646..8e3af071 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -12,6 +12,7 @@
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for "Reply to this" prompt.</li>
+        <li>Added an option to set the maximux number of characters in the prompt. [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From 8a471c44bed6c8af999e767d2698064f6b82b4bb Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Thu, 17 Oct 2024 17:49:36 +0200
Subject: [PATCH 44/68] max_prompt_length also hidden when using chatgpt_web.
 see #165

---
 options/mzta-options.html | 2 +-
 options/mzta-options.js   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/options/mzta-options.html b/options/mzta-options.html
index adcbc429..ab55973f 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -220,7 +220,7 @@
           </label>
         </td>
       </tr>
-      <tr>
+      <tr id="max_prompt_length_tr">
         <td><span>__MSG_prefs_OptionText_max_prompt_length__</span></td>
         <td>
           <label>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index a944b77a..62a4a55d 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -208,6 +208,8 @@ function disable_MaxPromptLength(){
   let maxPromptLength = document.getElementById('max_prompt_length');
   let conntype_select = document.getElementById("connection_type");
   maxPromptLength.disabled = (conntype_select.value === "chatgpt_web");
+  let maxPromptLength_tr = document.getElementById('max_prompt_length_tr');
+  maxPromptLength_tr.style.display = (maxPromptLength.disabled) ? 'none' : 'table-row';
 }
 
 document.addEventListener('DOMContentLoaded', async () => {

From 4f708f5297514fe1f9625a8ad1f93fd1021d911f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Thu, 17 Oct 2024 18:36:47 +0200
Subject: [PATCH 45/68] border fixed

---
 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 62a4a55d..8924b83a 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -177,7 +177,7 @@ function warn_Ollama_HostEmpty() {
     if((modelOllama.selectedIndex === -1)||(modelOllama.value === '')){
       modelOllama.style.border = '2px solid red';
     }else{
-      modelOllama.style.border = 'none';
+      modelOllama.style.border = '';
     }
   }
 }

From 1a80ab7991b9ccc6b8872fdfc18347a0743c7ac3 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 17 Oct 2024 20:55:07 +0200
Subject: [PATCH 46/68] formatting fixed

---
 js/mzta-compose-script.js | 188 +++++++++++++++++++-------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/js/mzta-compose-script.js b/js/mzta-compose-script.js
index c7da261d..17670396 100644
--- a/js/mzta-compose-script.js
+++ b/js/mzta-compose-script.js
@@ -59,115 +59,115 @@ switch (message.command) {
       return Promise.resolve(window.document.body.innerHTML);
 
   case 'sendAlert':
-    console.log(">>>>>> message.curr_tab_type: " + JSON.stringify(message.curr_tab_type));
+    //console.log(">>>>>> message.curr_tab_type: " + JSON.stringify(message.curr_tab_type));
     if(message.curr_tab_type == 'mail'){  // workaround for Thunderbird bug not showing the alert
-// Create dialog elements
-const dialog_sendAlert = window.document.createElement('dialog');
-dialog_sendAlert.classList.add('mzta_dialog');
+      // Create dialog elements
+      const dialog_sendAlert = window.document.createElement('dialog');
+      dialog_sendAlert.classList.add('mzta_dialog');
 
-const content_sendAlert = window.document.createElement('div');
-content_sendAlert.classList.add('mzta_dialog_content');
+      const content_sendAlert = window.document.createElement('div');
+      content_sendAlert.classList.add('mzta_dialog_content');
 
-// Create close button
-const closeButton_sendAlert = window.document.createElement('button');
-closeButton_sendAlert.classList.add('mzta_dialog_close');
-closeButton_sendAlert.id = 'mzta_dialog_close';
-closeButton_sendAlert.textContent = 'Close';
+      // Create close button
+      const closeButton_sendAlert = window.document.createElement('button');
+      closeButton_sendAlert.classList.add('mzta_dialog_close');
+      closeButton_sendAlert.id = 'mzta_dialog_close';
+      closeButton_sendAlert.textContent = 'Close';
 
-// Create message element
-const message_sendAlert = window.document.createElement('div');
-message_sendAlert.classList.add('mzta_dialog_message');
-message_sendAlert.textContent = message.message;
+      // Create message element
+      const message_sendAlert = window.document.createElement('div');
+      message_sendAlert.classList.add('mzta_dialog_message');
+      message_sendAlert.textContent = message.message;
 
-// Append elements to the dialog
-content_sendAlert.appendChild(message_sendAlert);
-content_sendAlert.appendChild(closeButton_sendAlert);
-dialog_sendAlert.appendChild(content_sendAlert);
-window.document.body.appendChild(dialog_sendAlert);
+      // Append elements to the dialog
+      content_sendAlert.appendChild(message_sendAlert);
+      content_sendAlert.appendChild(closeButton_sendAlert);
+      dialog_sendAlert.appendChild(content_sendAlert);
+      window.document.body.appendChild(dialog_sendAlert);
 
-// Show the dialog
-dialog_sendAlert.showModal();
+      // Show the dialog
+      dialog_sendAlert.showModal();
 
-// Close dialog on button click and remove elements from the DOM
-closeButton_sendAlert.onclick = () => {
-  dialog_sendAlert.close();
-  dialog_sendAlert.addEventListener('close', () => {
-    dialog_sendAlert.remove();
-    style.remove();
-  });
-};
+      // Close dialog on button click and remove elements from the DOM
+      closeButton_sendAlert.onclick = () => {
+        dialog_sendAlert.close();
+        dialog_sendAlert.addEventListener('close', () => {
+          dialog_sendAlert.remove();
+          style.remove();
+        });
+      };
 
-// CSS styles for Thunderbird with support for light and dark themes
-const style = document.createElement('style');
-style.textContent = `
-  .mzta_dialog {
-    border: none;
-    border-radius: 8px;
-    padding: 0;
-    width: 300px;
-    max-width: 90%;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-    background-color: var(--dialog-bg-color, #fff);
-    color: var(--dialog-text-color, #000);
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    z-index: 1001;
-  }
+      // CSS styles for Thunderbird with support for light and dark themes
+      const style = document.createElement('style');
+      style.textContent = `
+        .mzta_dialog {
+          border: none;
+          border-radius: 8px;
+          padding: 0;
+          width: 300px;
+          max-width: 90%;
+          box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+          background-color: var(--dialog-bg-color, #fff);
+          color: var(--dialog-text-color, #000);
+          position: fixed;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+          z-index: 1001;
+        }
 
-  .mzta_dialog_content {
-    position: relative;
-    padding: 20px;
-  }
+        .mzta_dialog_content {
+          position: relative;
+          padding: 20px;
+        }
 
-  .mzta_dialog_close {
-    position: absolute;
-    bottom: 10px;
-    right: 10px;
-    background: #007bff;
-    border: none;
-    color: #ffffff;
-    font-size: 14px;
-    padding: 8px 12px;
-    cursor: pointer;
-    border-radius: 4px;
-  }
+        .mzta_dialog_close {
+          position: absolute;
+          bottom: 10px;
+          right: 10px;
+          background: #007bff;
+          border: none;
+          color: #ffffff;
+          font-size: 14px;
+          padding: 8px 12px;
+          cursor: pointer;
+          border-radius: 4px;
+        }
 
-  .mzta_dialog_close:hover {
-    background: #0056b3;
-  }
+        .mzta_dialog_close:hover {
+          background: #0056b3;
+        }
 
-  .mzta_dialog_message {
-    margin-bottom: 40px;
-    font-size: 14px;
-  }
+        .mzta_dialog_message {
+          margin-bottom: 40px;
+          font-size: 14px;
+        }
 
-  /* Theme support */
-  :root {
-    --dialog-bg-color: #ffffff;
-    --dialog-text-color: #000000;
-  }
+        /* Theme support */
+        :root {
+          --dialog-bg-color: #ffffff;
+          --dialog-text-color: #000000;
+        }
 
-  @media (prefers-color-scheme: dark) {
-    :root {
-      --dialog-bg-color: #2e2e2e;
-      --dialog-text-color: #ffffff;
-    }
-  }
+        @media (prefers-color-scheme: dark) {
+          :root {
+            --dialog-bg-color: #2e2e2e;
+            --dialog-text-color: #ffffff;
+          }
+        }
 
-  /* Darker overlay for the page background */
-  .mzta_dialog_overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.7);
-    z-index: 1000;
-  }
-`;
-document.head.appendChild(style);
+        /* Darker overlay for the page background */
+        .mzta_dialog_overlay {
+          position: fixed;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          background: rgba(0, 0, 0, 0.7);
+          z-index: 1000;
+        }
+      `;
+      document.head.appendChild(style);
 
     }else{
       alert(message.message);

From 1842b120a3b69cc9546d00f56e3981bd39be242b Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 17 Oct 2024 21:03:25 +0200
Subject: [PATCH 47/68] release notes updated

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 202f6134..184a5fcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for "Reply to this" prompt.</li>
-        <li>Added an option to set the maximux number of characters in the prompt. [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
+        <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
+        <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 8e3af071..7e7c3f04 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -12,7 +12,8 @@
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for "Reply to this" prompt.</li>
-        <li>Added an option to set the maximux number of characters in the prompt. [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
+        <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
+        <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From cefb6f0db5b90421a4a08c56e881dd4495ba1008 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 17 Oct 2024 21:04:24 +0200
Subject: [PATCH 48/68] 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 184a5fcf..b9a06d1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
       <ul>
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
-        <li>Text improved for "Reply to this" prompt.</li>
+        <li>Text improved for the "Reply to this" prompt.</li>
         <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li>...</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 7e7c3f04..77b6318c 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -11,7 +11,7 @@
       <ul>
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
-        <li>Text improved for "Reply to this" prompt.</li>
+        <li>Text improved for the "Reply to this" prompt.</li>
         <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li>...</li>

From ad69beff9cf6b1a3d1a4405c20d5aa3be73bfb27 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Thu, 17 Oct 2024 21:04:58 +0200
Subject: [PATCH 49/68] version set to 2.3.0pre2

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 0650bd9b..d17c4995 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "2.3.0pre1",
+    "version": "2.3.0pre2",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {

From e40fc8163e6ca461f2bc996cc3ec8ffe74062baf Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Mon, 21 Oct 2024 21:44:47 +0200
Subject: [PATCH 50/68] [chatgpt web] Now it is possible to specify the model
 to use and the temporary chat. see #169 and #171

---
 _locales/en/messages.json       | 16 ++++++++++++++++
 js/mzta-chatgpt.js              |  2 +-
 mzta-background.js              | 15 +++++++++++++--
 options/mzta-options-default.js |  2 ++
 options/mzta-options.html       | 22 ++++++++++++++++++++++
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 1dfe4efc..598b56ea 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -642,5 +642,21 @@
   "prefs_OptionText_max_prompt_length_Info" : {
     "message": "This is the maximum number of characters that can be used in a prompt. Otherwise, an error message will be displayed. The value is not editable for the ChatGPT Web Interface.",
     "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model": {
+    "message": "ChatGPT Web model",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model_info": {
+    "message": "This is the model that will be enforced for the ChatGPT Web Interface. If none is specified or an incorrect one is provided, the default model will be set by ChatGPT on the webpage.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat": {
+    "message": "ChatGPT Web temporary chat",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat_info": {
+    "message": "If checked, the temporary chat will be used in the ChatGPT Web Interface.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/js/mzta-chatgpt.js b/js/mzta-chatgpt.js
index b6bcd255..7c0f1d56 100644
--- a/js/mzta-chatgpt.js
+++ b/js/mzta-chatgpt.js
@@ -80,7 +80,7 @@ async function chatgpt_isIdle() {
 }}, 100);});}
 
 function chatgpt_getRegenerateButton() {
-    for (const mainSVG of document.querySelectorAll('main svg')) {
+    for (const mainSVG of document.querySelectorAll('main svg.icon-md')) {
         if (mainSVG.querySelector('path[d^="M3.06957"]')) // regen icon found
             return mainSVG.parentNode.parentNode;
     }
diff --git a/mzta-background.js b/mzta-background.js
index 42b7af00..c760a83a 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -244,7 +244,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
     taLog.changeDebug(prefs.do_debug);
     prefs = checkScreenDimensions(prefs);
     //console.log(">>>>>>>>>>>>>>>> prefs: " + JSON.stringify(prefs));
-    taLog.log("[ThunderAI] Prompt length: " + promptText.length);
+    taLog.log("Prompt length: " + promptText.length);
     if(promptText.length > prefs.max_prompt_length){
         // Prompt too long for ChatGPT
         let tabs = await browser.tabs.query({ active: true, currentWindow: true });
@@ -259,9 +259,20 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
         // We are using the ChatGPT web interface
 
         let rand_call_id = '_chatgptweb_' + generateCallID();
+        let call_opt = '';
+
+        if(prefs.chatgpt_web_tempchat){
+            call_opt += '&temporary-chat=true';
+        }
+
+        if(prefs.chatgpt_web_model != ''){
+            call_opt += '&model=' + encodeURIComponent(prefs.chatgpt_web_model).toLowerCase();
+        }
+
+        taLog.log("[chatgpt_web] call_opt: " + call_opt);
 
         let win_options = {
-            url: "https://chatgpt.com?call_id=" + rand_call_id,
+            url: "https://chatgpt.com?call_id=" + rand_call_id + call_opt,
             type: "popup",
         }
         
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index 1e5d97a6..f49f83af 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -22,6 +22,8 @@ export const prefs_default = {
     chatgpt_win_width: 700,
     default_chatgpt_lang: '',
     connection_type: 'chatgpt_web',     //Other values: 'chatgpt_api', 'ollama_api', 'openai_comp_api'
+    chatgpt_web_model: '',
+    chatgpt_web_tempchat: false,
     chatgpt_api_key: '',
     chatgpt_model: '',
     ollama_host: '',
diff --git a/options/mzta-options.html b/options/mzta-options.html
index ab55973f..7a9f3ec7 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -110,6 +110,28 @@
         </td>
       </tr>
       <tr>
+      <tr class="conntype_chatgpt_web">
+        <td><label>
+          <span>__MSG_prefs_OptionText_chatgpt_web_model__</span>
+        </label></td>
+        <td>
+          <label>
+            <input type="text" id="chatgpt_web_model" name="chatgpt_web_model" class="option-input" />
+            <br>__MSG_prefs_OptionText_chatgpt_web_model_info__
+          </label>
+        </td>
+      </tr>
+      <tr class="conntype_chatgpt_web">
+        <td><label>
+          <span>__MSG_prefs_OptionText_chatgpt_web_tempchat__</span>
+        </label></td>
+        <td>
+          <label>
+            <input type="checkbox" id="chatgpt_web_tempchat" name="chatgpt_web_tempchat" class="option-input" />
+            &nbsp;<span>__MSG_prefs_OptionText_chatgpt_web_tempchat_info__</span>
+          </label>
+        </td>
+      </tr>
       <tr class="conntype_chatgpt_web">
         <td><label>
           <span>__MSG_OpenChatGPTTab_Info__</span>

From 207fff129ba1fc7683387c0eb15e7f5115dfa908 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Mon, 21 Oct 2024 21:52:05 +0200
Subject: [PATCH 51/68] 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 b9a06d1d..865a5258 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
         <li>Text improved for the "Reply to this" prompt.</li>
         <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
+        <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
+        <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 77b6318c..474c5834 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -14,6 +14,8 @@
         <li>Text improved for the "Reply to this" prompt.</li>
         <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
+        <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
+        <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From e7407a02f93270049f24e6aa5993b19b4238efc9 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Mon, 21 Oct 2024 21:57:24 +0200
Subject: [PATCH 52/68] version set to 2.3.0pre3

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index d17c4995..bb47f526 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "2.3.0pre2",
+    "version": "2.3.0pre3",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {

From e7b76a94429f1a049032d5823329b77e715b5f9f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Mon, 21 Oct 2024 22:10:28 +0200
Subject: [PATCH 53/68] typo fixed

---
 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 865a5258..509061eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for the "Reply to this" prompt.</li>
-        <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
+        <li>Added an option to set the maximum number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 474c5834..4c8877c3 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -12,7 +12,7 @@
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for the "Reply to this" prompt.</li>
-        <li>Added an option to set the maximux number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
+        <li>Added an option to set the maximum number of characters in the prompt [<a href="https://github.com/micz/ThunderAI/issues/165">#165</a>].</li>
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>

From abf7e163c973c8527c091f3b12ca3a9ffe924b93 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 21 Oct 2024 22:51:46 +0200
Subject: [PATCH 54/68] typos fixed. #170

---
 README.md                    |  2 +-
 _locales/de/messages.json    | 10 +++++-----
 _locales/en/messages.json    | 10 +++++-----
 _locales/fr/messages.json    | 10 +++++-----
 _locales/it/messages.json    | 10 +++++-----
 _locales/pt-br/messages.json |  6 +++---
 api_webchat/messageInput.js  |  6 +++---
 options/mzta-options.html    |  4 ++--
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index d587d6e5..8b12705f 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Are you using this addon in your Thunderbird?
 <br>
 
 ### Miscellaneous
-- <a href="https://github.com/KudoAI/chatgpt.js">chatgpt.js</a> for providing methods to interact with the ChatGTP web frontend
+- <a href="https://github.com/KudoAI/chatgpt.js">chatgpt.js</a> for providing methods to interact with the ChatGPT web frontend
 - <a href="https://github.com/ali-raheem/Aify">Aify</a> for inspiration
 - <a href="https://github.com/boxabirds">Julian Harris</a> for his project <a href="https://github.com/boxabirds/chatgpt-frontend-nobuild">chatgpt-frontend-nobuild</a>, that has been used as a starting point for the API Web Interface
 
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 05471f3b..0d59e07a 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -395,12 +395,12 @@
     "message": "Verbindungstyp",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_Web": {
-    "message": "ChatGTP Weboberfläche",
+  "prefs_Connection_type_ChatGPT_Web": {
+    "message": "ChatGPT Weboberfläche",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_API": {
-    "message": "ChatGTP OpenAI API",
+  "prefs_Connection_type_ChatGPT_API": {
+    "message": "ChatGPT OpenAI API",
     "description": ""
   },
   "prefs_ChatGPT_API_Key": {
@@ -435,7 +435,7 @@
     "message": "Sie haben kein Modell für das ChatGPT-API ausgewählt. Bitte wählen Sie eines auf der Optionsseite aus.",
     "description": ""
   },
-  "chagtp_api_send_button": {
+  "chagpt_api_send_button": {
     "message": "Modell wird verwendet",
     "description": ""
   },
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 598b56ea..46b50510 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -395,12 +395,12 @@
     "message": "Connection Type",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_Web": {
-    "message": "ChatGTP Web Interface",
+  "prefs_Connection_type_ChatGPT_Web": {
+    "message": "ChatGPT Web Interface",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_API": {
-    "message": "ChatGTP OpenAI API",
+  "prefs_Connection_type_ChatGPT_API": {
+    "message": "ChatGPT OpenAI API",
     "description": ""
   },
   "prefs_ChatGPT_API_Key": {
@@ -435,7 +435,7 @@
     "message": "You've not choosen a model for the ChatGPT API. Please choose one in the options page.",
     "description": ""
   },
-  "chagtp_api_send_button": {
+  "chagpt_api_send_button": {
     "message": "Using model",
     "description": ""
   },
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 0dccfbd2..d197ee3f 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -395,12 +395,12 @@
     "message": "Type de connexion",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_Web": {
-    "message": "Interface Web ChatGTP",
+  "prefs_Connection_type_ChatGPT_Web": {
+    "message": "Interface Web ChatGPT",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_API": {
-    "message": "API OpenAI ChatGTP",
+  "prefs_Connection_type_ChatGPT_API": {
+    "message": "API OpenAI ChatGPT",
     "description": ""
   },
   "prefs_ChatGPT_API_Key": {
@@ -435,7 +435,7 @@
     "message": "Vous n'avez pas choisi de modèle pour l'API ChatGPT. Veuillez en choisir un sur la page des options.",
     "description": ""
   },
-  "chagtp_api_send_button": {
+  "chagpt_api_send_button": {
     "message": "Utilisation du modèle",
     "description": ""
   },
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 1c0723ab..560889f4 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -395,12 +395,12 @@
     "message": "Tipo di connessione",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_Web": {
-    "message": "Interfaccia Web ChatGTP",
+  "prefs_Connection_type_ChatGPT_Web": {
+    "message": "Interfaccia Web ChatGPT",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_API": {
-    "message": "API OpenAI per ChatGTP",
+  "prefs_Connection_type_ChatGPT_API": {
+    "message": "API OpenAI per ChatGPT",
     "description": ""
   },
   "prefs_ChatGPT_API_Key": {
@@ -435,7 +435,7 @@
     "message": "Non hai scelto un modello per l'API di ChatGPT. Per favore, scegline uno nella pagina delle opzioni.",
     "description": ""
   },
-  "chagtp_api_send_button": {
+  "chagpt_api_send_button": {
     "message": "Modello utilizzato",
     "description": ""
   },
diff --git a/_locales/pt-br/messages.json b/_locales/pt-br/messages.json
index b9cd8689..2ed59381 100644
--- a/_locales/pt-br/messages.json
+++ b/_locales/pt-br/messages.json
@@ -395,11 +395,11 @@
     "message": "Tipo de Conexão",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_Web": {
+  "prefs_Connection_type_ChatGPT_Web": {
     "message": "Interface Web do ChatGPT",
     "description": ""
   },
-  "prefs_Connection_type_ChatGTP_API": {
+  "prefs_Connection_type_ChatGPT_API": {
     "message": "API OpenAI do ChatGPT",
     "description": ""
   },
@@ -435,7 +435,7 @@
     "message": "Você não escolheu um modelo para a API do ChatGPT. Por favor, escolha um na página de opções.",
     "description": ""
   },
-  "chagtp_api_send_button": {
+  "chagpt_api_send_button": {
     "message": "Usando modelo",
     "description": ""
   },
diff --git a/api_webchat/messageInput.js b/api_webchat/messageInput.js
index 1331781b..7d044487 100644
--- a/api_webchat/messageInput.js
+++ b/api_webchat/messageInput.js
@@ -169,8 +169,8 @@ class MessageInput extends HTMLElement {
 
     setModel(model){
         this.model = model;
-        this._sendButton.title = browser.i18n.getMessage("chagtp_api_send_button") + ": " + this.model;
-        this._stopButton.title = browser.i18n.getMessage("chagtp_api_send_button") + ": " + this.model;
+        this._sendButton.title = browser.i18n.getMessage("chagpt_api_send_button") + ": " + this.model;
+        this._stopButton.title = browser.i18n.getMessage("chagpt_api_send_button") + ": " + this.model;
     }
 
     handleMessageSent() {
@@ -186,7 +186,7 @@ class MessageInput extends HTMLElement {
         this._sendButton.style.display = 'block';
         this._stopButton.setAttribute('disabled', 'disabled');
         this._stopButton.style.display = 'none';
-        this._stopButton.title = browser.i18n.getMessage("chagtp_api_send_button") + ": " + this.model;
+        this._stopButton.title = browser.i18n.getMessage("chagpt_api_send_button") + ": " + this.model;
         this.hideStatusMessage();
         this.setStatusMessage('');
     }
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 7a9f3ec7..32f6a123 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -101,8 +101,8 @@
         <td>
           <label>
             <select id="connection_type" name="connection_type" class="option-input">
-              <option value="chatgpt_web">__MSG_prefs_Connection_type_ChatGTP_Web__</option>
-              <option value="chatgpt_api">__MSG_prefs_Connection_type_ChatGTP_API__</option>
+              <option value="chatgpt_web">__MSG_prefs_Connection_type_ChatGPT_Web__</option>
+              <option value="chatgpt_api">__MSG_prefs_Connection_type_ChatGPT_API__</option>
               <option value="ollama_api">__MSG_prefs_Connection_type_Ollama_API__</option>
               <option value="openai_comp_api">__MSG_prefs_Connection_type_OpenAI_Comp_API__</option>
             </select>

From 7e3a2dca83eb4311f3057c47405efdc89be8ced0 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 21 Oct 2024 22:53:39 +0200
Subject: [PATCH 55/68] 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 509061eb..8f2c631d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
+        <li>A few typos fixed [<a href="https://github.com/micz/ThunderAI/issues/170">#170</a>].</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 4c8877c3..505bffc0 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -16,6 +16,7 @@
         <li>Added a workaround to show an alert message when needed [<a href="https://github.com/micz/ThunderAI/issues/166">#166</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
+        <li>A few typos fixed [<a href="https://github.com/micz/ThunderAI/issues/170">#170</a>].</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From bc341ec18862e0e571d5857b7bb9c9d1c23e87b3 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Oct 2024 21:55:11 +0200
Subject: [PATCH 56/68] added a loading indicator in the menu when sending a
 prompt

---
 popup/mzta-popup.css  | 4 ++++
 popup/mzta-popup.html | 1 +
 popup/mzta-popup.js   | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/popup/mzta-popup.css b/popup/mzta-popup.css
index 3479aeea..9cec02c8 100644
--- a/popup/mzta-popup.css
+++ b/popup/mzta-popup.css
@@ -45,6 +45,10 @@ body {
     padding: 0;
     overflow-x: hidden;
   }
+
+  #mzta_sending_prompt{
+      display: none;
+  }
   
   .mzta_autocomplete-item {
       padding: 4px;
diff --git a/popup/mzta-popup.html b/popup/mzta-popup.html
index a7ad4126..2b8d265c 100644
--- a/popup/mzta-popup.html
+++ b/popup/mzta-popup.html
@@ -10,6 +10,7 @@
 <body>
 <div id="mzta_search_banner">
     <div id="_spacer_div">&nbsp;</div>
+    <div id="mzta_sending_prompt"><img src="mzta-loading.svg" title="__MSG_SendingPrompt__"></div>
     <input type="text" id="mzta_search_input" placeholder="__MSG_SearchPrompt__">
     <div id="mzta_autocomplete-items-loading"><img src="mzta-loading.svg" title="__MSG_Loading__"></div>
     <div id="mzta_autocomplete-items" style="display: none;"></div>
diff --git a/popup/mzta-popup.js b/popup/mzta-popup.js
index 7e9c3360..d0ab923b 100644
--- a/popup/mzta-popup.js
+++ b/popup/mzta-popup.js
@@ -228,6 +228,8 @@ document.body.insertBefore(banner, document.body.firstChild);
 
 function sendPrompt(prompt_id, tabId){
  taLog.log("sendPrompt: " + prompt_id);
+ document.getElementById('mzta_search_input').style.display = 'none';
+ document.getElementById('mzta_sending_prompt').style.display = 'block';
  browser.runtime.sendMessage({command: "shortcut_do_prompt", tabId: tabId, promptId: prompt_id});
 }
 

From 5021e7e6b7295930681c0f7161c169fb572dbc21 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Oct 2024 21:55:32 +0200
Subject: [PATCH 57/68] added getGPTWebModelString method

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

diff --git a/js/mzta-utils.js b/js/mzta-utils.js
index ef604ba0..4c8bd8a9 100644
--- a/js/mzta-utils.js
+++ b/js/mzta-utils.js
@@ -112,6 +112,24 @@ export function sanitizeHtml(input) {
   return input.replace(/<(?!br\s*\/?)[^>]+>/gi, '');
 }
 
+export function getGPTWebModelString(model) {
+  model = model.toLowerCase().trim();
+  switch (model) {
+    case 'GTP-4o':
+      return '4o';
+    case 'o1-preview':
+      return 'o1-preview';
+    case 'o1-mini':
+      return 'o1-mini';
+    case 'gpt-4':
+      return '4';
+    case 'gpt-4o-mini':
+      return '4o mini';
+    default:
+      return '4o';
+  }
+}
+
 export function i18nConditionalGet(str) {
   // if we are getting a string that starts with '__MSG_' and ends with '__' we return the translated string
   // using the browser.i18n API

From 8b75a7e17d25cacbd82e3d021497a46f4ecdf653 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Oct 2024 21:56:06 +0200
Subject: [PATCH 58/68] checking the model before sending the prompt

---
 js/mzta-chatgpt.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 mzta-background.js |  7 +++++--
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/js/mzta-chatgpt.js b/js/mzta-chatgpt.js
index 7c0f1d56..356fd833 100644
--- a/js/mzta-chatgpt.js
+++ b/js/mzta-chatgpt.js
@@ -105,6 +105,7 @@ function addCustomDiv(prompt_action,tabId,mailMessageId) {
     style.textContent += ".btn_disabled:hover {background-color:#6a829b !important;color:white !important;}";
     style.textContent += "#mzta-loading{height:50px;display:inline-block;}";
     style.textContent += "#mzta-model_warn{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);max-height:100%px;min-width:30%;max-width:50%;padding:3px;border-radius:5px;text-align:center;background-color:#FFBABA;border:1px solid;font-size:13px;color:#D8000C;display:none;}#mzta-model_warn a{color:blue;text-decoration: underline;}";
+    style.textContent += "#mzta-btn_model {background-color: #007bff;border: none;color: white;padding: 2px 4px;text-align: center;text-decoration: none;display: none;font-size: 13px;margin-left: 4px;transition-duration: 0.4s;cursor: pointer;border-radius: 2px;}";
     style.textContent += "#mzta-status-page{position:fixed;bottom:0;left:0;padding-left:5px;font-size:13px;font-style:italic;text-decoration:underline;color:#919191;}";
     style.textContent += "#mzta-force-completion{cursor:pointer;position:fixed;bottom:0;right:0;padding-right:5px;font-size:13px;font-style:italic;text-decoration:underline;color:#919191;}";
     style.textContent += "#mzta-status-page:hover, #mzta-force-completion:hover{color:#007bff;}";
@@ -128,6 +129,15 @@ function addCustomDiv(prompt_action,tabId,mailMessageId) {
     modelWarnDiv.textContent = browser.i18n.getMessage("chatgpt_win_model_warning");
     fixedDiv.appendChild(modelWarnDiv);
 
+    // GPT Model Button
+    var btn_model = document.createElement('button');
+    btn_model.id="mzta-btn_model";
+    btn_model.textContent = browser.i18n.getMessage("chatgpt_btn_model");
+    btn_model.onclick = async function() {
+        force_go = true;
+    };
+    modelWarnDiv.appendChild(btn_model);
+    
     //prompt name
     var prompt_name_div = document.createElement('div');
     prompt_name_div.id = 'mzta-prompt-name';
@@ -234,6 +244,41 @@ function customTextBtnClick(args) {
     args.customDiv.style.display = 'none';
 }
 
+function checkGPTModel(model) { //TODO
+    if(model == '') return;
+  return new Promise((resolve, reject) => {
+    // Set up an interval that shows the warning after 2 seconds
+    const intervalId2 = setTimeout(() => {
+        document.getElementById('mzta-model_warn').style.display = 'inline-block';
+        document.getElementById('mzta-btn_model').style.display = 'inline';
+    }, 2000);
+    // Set up an interval that checks the value every 100 milliseconds
+    const intervalId = setInterval(() => {
+      // Get the '.text-token-text-secondary' element
+     // const element = document.querySelector('div#radix-\\\\:ri2\\\\: > div > span.text-token-text-secondary');
+     const elements = document.querySelectorAll('[id*=radix] span')
+
+     for(element of elements){
+      // Check if the element exists and its content is '4' or '4o'
+      if ((element && element.textContent === model)||(force_go)) {
+        console.log("[ThunderAI] The GPT Model is now " + model);
+        clearInterval(intervalId);
+        clearTimeout(intervalId2);
+        document.getElementById('mzta-model_warn').style.display = 'none';
+        document.getElementById('mzta-btn_model').style.display = 'none';
+        resolve(model);
+        break;
+      } else if (!element) {
+        console.error("[ThunderAI] Model string element not found! [" + model + "]");
+        clearInterval(intervalId);
+        reject("Model string element not found: " + model);
+      }
+     }
+    }, 200);
+  });
+}
+
+
 function operation_done(){
     let curr_msg = document.getElementById('mzta-curr_msg');
     curr_msg.textContent = browser.i18n.getMessage("chatgpt_win_job_completed");
@@ -256,6 +301,10 @@ function showCustomTextField(){
 }
 
 async function doProceed(message, customText = ''){
+    let _gpt_model = mztaGPTModel;
+    if(_gpt_model != ''){
+        await checkGPTModel(_gpt_model);
+    }
     let final_prompt = message.prompt;
 // console.log(">>>>>>>>>>>> doProceed customText: " + customText);
 // console.log(">>>>>>>>>>>> doProceed final_prompt: " + final_prompt);
diff --git a/mzta-background.js b/mzta-background.js
index c760a83a..ed86c7a6 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 } from './js/mzta-utils.js';
+import { getCurrentIdentity, getOriginalBody, replaceBody, setBody, i18nConditionalGet, generateCallID, migrateCustomPromptsStorage, migrateDefaultPromptsPropStorage, getGPTWebModelString } from './js/mzta-utils.js';
 
 await migrateCustomPromptsStorage();
 await migrateDefaultPromptsPropStorage();
@@ -285,7 +285,9 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
 
         const listener = (message, sender, sendResponse) => {
             async function handleChatGptWeb(createdTab) {
-                taLog.log("[ThunderAI] ChatGPT web interface script started...");
+                taLog.log("ChatGPT web interface script started...");
+
+                let _gpt_model = getGPTWebModelString(prefs.chatgpt_web_model);
         
                 let pre_script = `let mztaWinId = `+ createdTab.windowId +`;
                 let mztaStatusPageDesc="`+ browser.i18n.getMessage("prefs_status_page") +`";
@@ -294,6 +296,7 @@ async function openChatGPT(promptText, action, curr_tabId, prompt_name = '', do_
                 let mztaDoCustomText=`+ do_custom_text +`;
                 let mztaPromptName="[`+ i18nConditionalGet(prompt_name) +`]";
                 let mztaPhDefVal="`+(prefs.placeholders_use_default_value?'1':'0')+`";
+                let mztaGPTModel="`+ _gpt_model +`";
                 `;
 
                 taLog.log("Waiting 1 sec");

From ffa66cafe6fb155e2d106a951ab9fcb25c57af01 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Oct 2024 21:56:31 +0200
Subject: [PATCH 59/68] locales updated

---
 _locales/de/messages.json    |  2 +-
 _locales/en/messages.json    | 10 +++++++++-
 _locales/fr/messages.json    |  2 +-
 _locales/it/messages.json    |  2 +-
 _locales/pt-br/messages.json |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 0d59e07a..e7ad89c2 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -236,7 +236,7 @@
     "description": ""
   },
   "chatgpt_win_model_warning": {
-    "message": "Sie haben die Option zur Verwendung von ChatGPT-4 eingestellt, aber es scheint, dass es nicht korrekt geladen wird. Haben Sie oben das Modell 4 oder 4o gewählt?",
+    "message": "Du hast die Option gewählt, ein bestimmtes Modell zu verwenden, aber es scheint, dass es nicht korrekt geladen wird. Bitte überprüfe den Wert und versuche es erneut. Du kannst jetzt den blauen Knopf drücken, um fortzufahren.",
     "description": ""
   },
   "chatgpt_win_custom_text": {
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 46b50510..5e4d00c6 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -236,7 +236,7 @@
     "description": ""
   },
   "chatgpt_win_model_warning": {
-    "message": "You have set the option to use ChatGPT-4, but it seems that it is not loading correctly. Have you chosen the model 4 or 4o at the top?",
+    "message": "You have set the option to use a specific model, but it seems that it is not loading correctly. Please check the value and try again. For now, you can press the blue button to continue.",
     "description": ""
   },
   "chatgpt_win_custom_text": {
@@ -658,5 +658,13 @@
   "prefs_OptionText_chatgpt_web_tempchat_info": {
     "message": "If checked, the temporary chat will be used in the ChatGPT Web Interface.",
     "description": ""
+  },
+  "chatgpt_btn_model": {
+    "message": "Use the current model",
+    "description": ""
+  },
+  "SendingPrompt": {
+    "message": "Sending prompt...",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index d197ee3f..f364ff61 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -236,7 +236,7 @@
     "description": ""
   },
   "chatgpt_win_model_warning": {
-    "message": "Vous avez choisi l'option d'utiliser ChatGPT-4, mais il semble qu'il ne se charge pas correctement. Avez-vous choisi le modèle 4 ou 4o en haut ?",
+    "message": "Vous avez choisi d'utiliser un modèle spécifique, mais il semble qu'il ne se charge pas correctement. Veuillez vérifier la valeur et réessayer. Pour l'instant, vous pouvez appuyer sur le bouton bleu pour continuer.",
     "description": ""
   },
   "chatgpt_win_custom_text": {
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 560889f4..f0807e0e 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -236,7 +236,7 @@
     "description": ""
   },
   "chatgpt_win_model_warning": {
-    "message": "Hai impostato l'opzione per utilizzare ChatGPT-4, ma sembra che non si stia caricando. Hai selezionato il modello 4 o 4o in alto?",
+    "message": "Hai impostato l'opzione per utilizzare un modello specifico, ma sembra che non si stia caricando correttamente. Controlla il valore e riprova. Per ora, puoi premere il pulsante blu per continuare.",
     "description": ""
   },
   "chatgpt_win_custom_text": {
diff --git a/_locales/pt-br/messages.json b/_locales/pt-br/messages.json
index 2ed59381..353d8433 100644
--- a/_locales/pt-br/messages.json
+++ b/_locales/pt-br/messages.json
@@ -236,7 +236,7 @@
     "description": ""
   },
   "chatgpt_win_model_warning": {
-    "message": "Você definiu a opção para usar o ChatGPT-4, mas parece que não está carregando corretamente. Você escolheu o modelo 4 ou 4o na parte superior?",
+    "message": "Você configurou a opção para usar um modelo específico, mas parece que ele não está carregando corretamente. Por favor, verifique o valor e tente novamente. Por enquanto, você pode pressionar o botão azul para continuar.",
     "description": ""
   },
   "chatgpt_win_custom_text": {

From 7279a580a743947e810bf6d1700c4b481cbd8259 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Oct 2024 21:56:43 +0200
Subject: [PATCH 60/68] 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 8f2c631d..98ef823f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
         <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
         <li>A few typos fixed [<a href="https://github.com/micz/ThunderAI/issues/170">#170</a>].</li>
+        <li>Added a loading indicator in the menu when sending a prompt.</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 505bffc0..cf997c55 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -17,6 +17,7 @@
         <li><i>[ChatGPT Web]</i> Added an option to set the model to use [<a href="https://github.com/micz/ThunderAI/issues/171">#171</a>].</li>
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
         <li>A few typos fixed [<a href="https://github.com/micz/ThunderAI/issues/170">#170</a>].</li>
+        <li>Added a loading indicator in the menu when sending a prompt.</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From c8f3216ebb0bd6f27998ba2b4c4328eccfaf6d00 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Tue, 22 Oct 2024 21:57:01 +0200
Subject: [PATCH 61/68] version set to 2.3.0pre4

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index bb47f526..99c9c3d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "2.3.0pre3",
+    "version": "2.3.0pre4",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {

From 16721814c9f8bcf90d011e518d5197b82960a5d2 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Oct 2024 22:07:12 +0200
Subject: [PATCH 62/68] chatgpt web models list added in the options page

---
 _locales/en/messages.json | 4 ++++
 options/mzta-options.html | 1 +
 2 files changed, 5 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 5e4d00c6..2f3f8292 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -666,5 +666,9 @@
   "SendingPrompt": {
     "message": "Sending prompt...",
     "description": ""
+  },
+  "AllowedValues": {
+    "message": "Allowed values",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 32f6a123..f12dca3f 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -113,6 +113,7 @@
       <tr class="conntype_chatgpt_web">
         <td><label>
           <span>__MSG_prefs_OptionText_chatgpt_web_model__</span>
+          <br><table><tr><td><i style="font-size:smaller;"><nobr>__MSG_AllowedValues__:</nobr></i></td><td><i style="font-size:smaller;"> &nbsp; <nobr>gpt-4o</nobr> &nbsp; <nobr>gpt-4o-mini</nobr> &nbsp; <nobr>gpt-4</nobr> &nbsp; <nobr>o1-mini</nobr> &nbsp; <nobr>o1-preview</nobr></i></td></tr></table>
         </label></td>
         <td>
           <label>

From fa74301759938d60a76af4c879277dedc887afdf Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 22 Oct 2024 22:20:47 +0200
Subject: [PATCH 63/68] data placeholders info links added

---
 _locales/en/messages.json              | 4 ++++
 customprompts/mzta-custom-prompts.html | 4 ++--
 options/mzta-options.html              | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2f3f8292..2f69e97e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -670,5 +670,9 @@
   "AllowedValues": {
     "message": "Allowed values",
     "description": ""
+  },
+  "prefs_OptionText_btnManagePrompts_infoline": {
+    "message": "You can now use additional data placeholders!",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/customprompts/mzta-custom-prompts.html b/customprompts/mzta-custom-prompts.html
index 885501c1..7ec3af37 100644
--- a/customprompts/mzta-custom-prompts.html
+++ b/customprompts/mzta-custom-prompts.html
@@ -10,8 +10,8 @@
         <h1 class="page_title">__MSG_customPrompts_managePrompts__</h1>
         <p>__MSG_customPrompts_managePrompts_info_default__<br>
             __MSG_customPrompts_managePrompts_info_default_2__<br>
-            __MSG_customPrompts_managePrompts_info_default_3__
-            <br><a href="https://micz.it/thunderbird-addon-thunderai/custom-prompts/">__MSG_customPrompts_managePrompts_help__</a></p>
+            __MSG_customPrompts_managePrompts_info_default_3__ <a href="https://micz.it/thunderbird-addon-thunderai/custom-prompts/">__MSG_customPrompts_managePrompts_help__</a>
+        <br>__MSG_prefs_OptionText_btnManagePrompts_infoline__ <a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">__MSG_customPrompts_managePrompts_help__</a></p>
     </div>
     <div id="import_export">
         <button id="btnExportAll">__MSG_customPrompts_ExportAll__</button><br>
diff --git a/options/mzta-options.html b/options/mzta-options.html
index f12dca3f..8139b410 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -266,6 +266,7 @@
     </table>
     <div id="btn_custom_prompts">
         <button id="btnManagePrompts">__MSG_prefs_OptionText_btnManagePrompts__</button>
+        <br>__MSG_prefs_OptionText_btnManagePrompts_infoline__ <a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">__MSG_customPrompts_managePrompts_help__</a>
     </div>
     <div id="miczDescription">
       <h1>__MSG_prefsInfoTitle__</h1>

From d429d739af44d41f571cae29165abd756961875f Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 23 Oct 2024 22:15:20 +0200
Subject: [PATCH 64/68] prompt_reply_advanced added. fixes #150

---
 js/mzta-prompts.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/js/mzta-prompts.js b/js/mzta-prompts.js
index 8244783b..33778400 100644
--- a/js/mzta-prompts.js
+++ b/js/mzta-prompts.js
@@ -74,6 +74,18 @@ const defaultPrompts = [
         define_response_lang: "1",
         is_default: "1",
     },
+    {
+        id: 'prompt_reply_advanced',
+        name: "__MSG_prompt_reply_advanced__",
+        text: "Reply to the following email {%selected_text%}, considering this is the full thread of emails {%mail_html_body%}. Reply with only the needed text and with no extra comments or other text.",
+        type: "1",
+        action: "1",
+        need_selected: "1",
+        need_signature: "1",
+        need_custom_text: "0",
+        define_response_lang: "1",
+        is_default: "1",
+    },
     {
         id: 'prompt_rewrite_polite',
         name: "__MSG_prompt_rewrite_polite__",

From 8866afe65ba678cceff24214040a8dd93b9e1ba3 Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 23 Oct 2024 22:15:49 +0200
Subject: [PATCH 65/68] locales updated fixes #158

---
 _locales/de/messages.json    | 94 +++++++++++++++++++++++++++++++++++-
 _locales/en/messages.json    |  8 ++-
 _locales/fr/messages.json    | 94 +++++++++++++++++++++++++++++++++++-
 _locales/it/messages.json    | 94 +++++++++++++++++++++++++++++++++++-
 _locales/pt-br/messages.json | 90 +++++++++++++++++++++++++++++++++-
 5 files changed, 374 insertions(+), 6 deletions(-)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index e7ad89c2..b13cd98a 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -12,7 +12,11 @@
     "description": ""
   },
   "prompt_reply": {
-    "message": "Darauf antworten",
+    "message": "Antworten Sie auf diese E-Mail",
+    "description": ""
+  },
+  "prompt_reply_advanced": {
+    "message": "Antworten Sie auf diesen Thread",
     "description": ""
   },
   "prompt_rewrite_polite": {
@@ -575,6 +579,10 @@
     "message": "Auf 0 setzen, wenn Sie die Fenstergröße nicht angeben möchten.",
     "description": ""
   },
+  "prefs_OpenAIComp_API_Key": {
+    "message": "OpenAI Comp API-Schlüssel",
+    "description": ""
+  },
   "Optional": {
     "message": "Optional",
     "description": ""
@@ -586,5 +594,89 @@
   "OpenChatGPTTab_Info": {
     "message": "Bei Anmeldeproblemen im ThunderAI-Fenster öffnen Sie ChatGPT in einem neuen Tab über die Schaltfläche rechts, melden Sie sich an, schließen Sie dann den Tab und fahren Sie fort, ThunderAI zu verwenden.",
     "description": ""
+  },
+  "placeholder_mail_text_body": {
+    "message": "E-Mail-Inhalt",
+    "description": ""
+  },
+  "placeholder_mail_html_body": {
+    "message": "HTML-E-Mail-Inhalt",
+    "description": ""
+  },
+  "placeholder_mail_subject": {
+    "message": "E-Mail-Betreff",
+    "description": ""
+  },
+  "placeholder_selected_text": {
+    "message": "Ausgewählter Text",
+    "description": ""
+  },
+  "placeholder_additional_text": {
+    "message": "Zusätzlicher Text",
+    "description": ""
+  },
+  "placeholder_junk_score": {
+    "message": "Spam-Score",
+    "description": ""
+  },
+  "placeholder_recipients": {
+    "message": "Empfänger",
+    "description": ""
+  },
+  "placeholder_cc_list": {
+    "message": "CC-Liste",
+    "description": ""
+  },
+  "placeholder_author": {
+    "message": "Autor",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value": {
+    "message": "Platzhalter: standardwert verwenden",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value_info": {
+    "message": "Wenn aktiviert, werden die Platzhalter mit den Standardwerten ausgefüllt, wenn kein Wert angegeben wird. Andernfalls bleiben die Platzhalter erhalten.",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length": {
+    "message": "Maximale Eingabelänge",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length_Info": {
+    "message": "Dies ist die maximale Anzahl von Zeichen, die in einer Eingabe verwendet werden können. Andernfalls wird eine Fehlermeldung angezeigt. Der Wert ist für die ChatGPT-Webschnittstelle nicht bearbeitbar.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model": {
+    "message": "ChatGPT Web-Modell",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model_info": {
+    "message": "Dies ist das Modell, das für die ChatGPT-Webschnittstelle festgelegt wird. Wenn keines angegeben ist oder ein falsches Modell bereitgestellt wird, wird das Standardmodell von ChatGPT auf der Webseite festgelegt.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat": {
+    "message": "ChatGPT Web temporärer Chat",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat_info": {
+    "message": "Wenn aktiviert, wird der temporäre Chat in der ChatGPT-Webschnittstelle verwendet.",
+    "description": ""
+  },
+  "chatgpt_btn_model": {
+    "message": "Aktuelles Modell verwenden",
+    "description": ""
+  },
+  "SendingPrompt": {
+    "message": "Sende Eingabe...",
+    "description": ""
+  },
+  "AllowedValues": {
+    "message": "Erlaubte Werte",
+    "description": ""
+  },
+  "prefs_OptionText_btnManagePrompts_infoline": {
+    "message": "Sie können jetzt zusätzliche Datenplatzhalter verwenden!",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2f69e97e..b02fa2fe 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -12,7 +12,11 @@
     "description": ""
   },
   "prompt_reply": {
-    "message": "Reply to this",
+    "message": "Reply to this email",
+    "description": ""
+  },
+  "prompt_reply_advanced": {
+    "message": "Reply to this thread",
     "description": ""
   },
   "prompt_rewrite_polite": {
@@ -628,7 +632,7 @@
     "description": ""
   },
   "prefs_OptionText_placeholders_use_default_value": {
-    "message": "Placeholders: Use default value",
+    "message": "Placeholders: use default value",
     "description": ""
   },
   "prefs_OptionText_placeholders_use_default_value_info": {
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index f364ff61..cddba217 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -12,7 +12,11 @@
     "description": ""
   },
   "prompt_reply": {
-    "message": "Répondre à ceci",
+    "message": "Répondez à cet e-mail",
+    "description": ""
+  },
+  "prompt_reply_advanced": {
+    "message": "Répondez à ce fil de discussion",
     "description": ""
   },
   "prompt_rewrite_polite": {
@@ -575,6 +579,10 @@
     "message": "Réglez sur 0 si vous ne souhaitez pas spécifier la taille de la fenêtre.",
     "description": ""
   },
+  "prefs_OpenAIComp_API_Key": {
+    "message": "Clé API OpenAI Comp",
+    "description": ""
+  },
   "Optional": {
     "message": "Optionnel",
     "description": ""
@@ -586,5 +594,89 @@
   "OpenChatGPTTab_Info": {
     "message": "En cas de problèmes de connexion dans la fenêtre ThunderAI, ouvrez ChatGPT dans un nouvel onglet à l'aide du bouton à droite, connectez-vous, puis fermez l'onglet et continuez à utiliser ThunderAI.",
     "description": ""
+  },
+  "placeholder_mail_text_body": {
+    "message": "Corps du mail",
+    "description": ""
+  },
+  "placeholder_mail_html_body": {
+    "message": "Corps du mail HTML",
+    "description": ""
+  },
+  "placeholder_mail_subject": {
+    "message": "Objet du mail",
+    "description": ""
+  },
+  "placeholder_selected_text": {
+    "message": "Texte sélectionné",
+    "description": ""
+  },
+  "placeholder_additional_text": {
+    "message": "Texte supplémentaire",
+    "description": ""
+  },
+  "placeholder_junk_score": {
+    "message": "Score de spam",
+    "description": ""
+  },
+  "placeholder_recipients": {
+    "message": "Destinataires",
+    "description": ""
+  },
+  "placeholder_cc_list": {
+    "message": "Liste CC",
+    "description": ""
+  },
+  "placeholder_author": {
+    "message": "Auteur",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value": {
+    "message": "Espaces réservés : utiliser la valeur par défaut",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value_info": {
+    "message": "Si coché, les espaces réservés seront remplis avec les valeurs par défaut si aucune valeur n'est fournie. Sinon, les espaces réservés resteront en place.",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length": {
+    "message": "Longueur maximale de l'invite",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length_Info": {
+    "message": "C'est le nombre maximum de caractères qui peuvent être utilisés dans une invite. Sinon, un message d'erreur sera affiché. La valeur n'est pas modifiable pour l'interface Web de ChatGPT.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model": {
+    "message": "Modèle Web ChatGPT",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model_info": {
+    "message": "C'est le modèle qui sera appliqué pour l'interface Web de ChatGPT. Si aucun n'est spécifié ou si un modèle incorrect est fourni, le modèle par défaut sera défini par ChatGPT sur la page Web.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat": {
+    "message": "Chat temporaire Web ChatGPT",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat_info": {
+    "message": "Si coché, le chat temporaire sera utilisé dans l'interface Web de ChatGPT.",
+    "description": ""
+  },
+  "chatgpt_btn_model": {
+    "message": "Utiliser le modèle actuel",
+    "description": ""
+  },
+  "SendingPrompt": {
+    "message": "Envoi de l'invite...",
+    "description": ""
+  },
+  "AllowedValues": {
+    "message": "Valeurs autorisées",
+    "description": ""
+  },
+  "prefs_OptionText_btnManagePrompts_infoline": {
+    "message": "Vous pouvez maintenant utiliser des espaces réservés de données supplémentaires !",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index f0807e0e..fff7b61f 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -12,7 +12,11 @@
     "description": ""
   },
   "prompt_reply": {
-    "message": "Rispondi",
+    "message": "Rispondi a questa email",
+    "description": ""
+  },
+  "prompt_reply_advanced": {
+    "message": "Rispondi a questo thread",
     "description": ""
   },
   "prompt_rewrite_polite": {
@@ -575,6 +579,10 @@
     "message": "Imposta a 0 se non desideri specificare la dimensione della finestra.",
     "description": ""
   },
+  "prefs_OpenAIComp_API_Key": {
+    "message": "Chiave API OpenAI Comp",
+    "description": ""
+  },
   "Optional": {
     "message": "Opzionale",
     "description": ""
@@ -586,5 +594,89 @@
   "OpenChatGPTTab_Info": {
     "message": "In caso di problemi di accesso nella finestra di ThunderAI, apri ChatGPT in un nuovo tab utilizzando il pulsante a destra, accedi, quindi chiudi la scheda e continua a usare ThunderAI.",
     "description": ""
+  },
+  "placeholder_mail_text_body": {
+    "message": "Corpo del messaggio",
+    "description": ""
+  },
+  "placeholder_mail_html_body": {
+    "message": "Corpo del messaggio in HTML",
+    "description": ""
+  },
+  "placeholder_mail_subject": {
+    "message": "Oggetto del messaggio",
+    "description": ""
+  },
+  "placeholder_selected_text": {
+    "message": "Testo selezionato",
+    "description": ""
+  },
+  "placeholder_additional_text": {
+    "message": "Testo aggiuntivo",
+    "description": ""
+  },
+  "placeholder_junk_score": {
+    "message": "Punteggio di spam",
+    "description": ""
+  },
+  "placeholder_recipients": {
+    "message": "Destinatari",
+    "description": ""
+  },
+  "placeholder_cc_list": {
+    "message": "Lista CC",
+    "description": ""
+  },
+  "placeholder_author": {
+    "message": "Autore",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value": {
+    "message": "Segnaposti: usa valore predefinito",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value_info": {
+    "message": "Se selezionato, i segnaposti saranno riempiti con i valori predefiniti quando non viene fornito alcun valore. Altrimenti, i segnaposti rimarranno visibili nel testo.",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length": {
+    "message": "Lunghezza massima del prompt",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length_Info": {
+    "message": "Questa è la lunghezza massima di caratteri che può essere utilizzata in un prompt. Altrimenti, verrà visualizzato un messaggio di errore. Il valore non è modificabile per l'interfaccia Web di ChatGPT.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model": {
+    "message": "Modello Web ChatGPT",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model_info": {
+    "message": "Questo è il modello che verrà utilizzato nell'interfaccia Web di ChatGPT. Se non viene specificato o ne viene fornito uno errato, ChatGPT imposterà il modello predefinito sulla pagina Web.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat": {
+    "message": "Chat temporanea di ChatGPT",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat_info": {
+    "message": "Se selezionato, la chat temporanea verrà utilizzata nell'interfaccia Web di ChatGPT.",
+    "description": ""
+  },
+  "chatgpt_btn_model": {
+    "message": "Usa il modello corrente",
+    "description": ""
+  },
+  "SendingPrompt": {
+    "message": "Invio del prompt...",
+    "description": ""
+  },
+  "AllowedValues": {
+    "message": "Valori consentiti",
+    "description": ""
+  },
+  "prefs_OptionText_btnManagePrompts_infoline": {
+    "message": "Ora puoi utilizzare segnaposti per i dati aggiuntivi!",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/pt-br/messages.json b/_locales/pt-br/messages.json
index 353d8433..0e12e249 100644
--- a/_locales/pt-br/messages.json
+++ b/_locales/pt-br/messages.json
@@ -12,7 +12,11 @@
     "description": ""
   },
   "prompt_reply": {
-    "message": "Responda a isso",
+    "message": "Responda a este e-mail",
+    "description": ""
+  },
+  "prompt_reply_advanced": {
+    "message": "Responda a este tópico",
     "description": ""
   },
   "prompt_rewrite_polite": {
@@ -590,5 +594,89 @@
   "OpenChatGPTTab_Info": {
     "message": "Em caso de problemas de login na janela do ThunderAI, abra o ChatGPT em uma nova aba usando o botão à direita, faça o login, depois feche a aba e continue usando o ThunderAI.",
     "description": ""
+  },
+  "placeholder_mail_text_body": {
+    "message": "Corpo do e-mail",
+    "description": ""
+  },
+  "placeholder_mail_html_body": {
+    "message": "Corpo do e-mail HTML",
+    "description": ""
+  },
+  "placeholder_mail_subject": {
+    "message": "Assunto do e-mail",
+    "description": ""
+  },
+  "placeholder_selected_text": {
+    "message": "Texto selecionado",
+    "description": ""
+  },
+  "placeholder_additional_text": {
+    "message": "Texto adicional",
+    "description": ""
+  },
+  "placeholder_junk_score": {
+    "message": "Pontuação de spam",
+    "description": ""
+  },
+  "placeholder_recipients": {
+    "message": "Destinatários",
+    "description": ""
+  },
+  "placeholder_cc_list": {
+    "message": "Lista CC",
+    "description": ""
+  },
+  "placeholder_author": {
+    "message": "Autor",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value": {
+    "message": "Marcadores de posição: usar valor padrão",
+    "description": ""
+  },
+  "prefs_OptionText_placeholders_use_default_value_info": {
+    "message": "Se marcado, os marcadores de posição serão preenchidos com os valores padrão quando nenhum valor for fornecido. Caso contrário, os marcadores de posição serão mantidos no lugar.",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length": {
+    "message": "Comprimento máximo do prompt",
+    "description": ""
+  },
+  "prefs_OptionText_max_prompt_length_Info": {
+    "message": "Este é o número máximo de caracteres que podem ser usados em um prompt. Caso contrário, uma mensagem de erro será exibida. O valor não é editável para a Interface Web do ChatGPT.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model": {
+    "message": "Modelo Web do ChatGPT",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_model_info": {
+    "message": "Este é o modelo que será aplicado para a Interface Web do ChatGPT. Se nenhum for especificado ou um incorreto for fornecido, o modelo padrão será definido pelo ChatGPT na página web.",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat": {
+    "message": "Chat temporário Web do ChatGPT",
+    "description": ""
+  },
+  "prefs_OptionText_chatgpt_web_tempchat_info": {
+    "message": "Se marcado, o chat temporário será utilizado na Interface Web do ChatGPT.",
+    "description": ""
+  },
+  "chatgpt_btn_model": {
+    "message": "Usar o modelo atual",
+    "description": ""
+  },
+  "SendingPrompt": {
+    "message": "Enviando prompt...",
+    "description": ""
+  },
+  "AllowedValues": {
+    "message": "Valores permitidos",
+    "description": ""
+  },
+  "prefs_OptionText_btnManagePrompts_infoline": {
+    "message": "Agora você pode usar marcadores de posição adicionais!",
+    "description": ""
   }
 }
\ No newline at end of file

From 299b497664e36d92f242988a7fe2091697cc40dd Mon Sep 17 00:00:00 2001
From: Mic <m@micz.it>
Date: Wed, 23 Oct 2024 22:16:11 +0200
Subject: [PATCH 66/68] 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 98ef823f..5f30fb97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
         <li>A few typos fixed [<a href="https://github.com/micz/ThunderAI/issues/170">#170</a>].</li>
         <li>Added a loading indicator in the menu when sending a prompt.</li>
-        <li>...</li>
+        <li>Added a new default prompt that uses the placeholders and allows replying to an email thread. It requires selecting the text of the first email to identify which is the one to reply to and the others in the thread [<a href="https://github.com/micz/ThunderAI/issues/150">#150</a>].</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index cf997c55..48a8a703 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -18,7 +18,7 @@
         <li><i>[ChatGPT Web]</i> Added an option to use the temporary chat [<a href="https://github.com/micz/ThunderAI/issues/169">#169</a>].</li>
         <li>A few typos fixed [<a href="https://github.com/micz/ThunderAI/issues/170">#170</a>].</li>
         <li>Added a loading indicator in the menu when sending a prompt.</li>
-        <li>...</li>
+        <li>Added a new default prompt that uses the placeholders and allows replying to an email thread. It requires selecting the text of the first email to identify which is the one to reply to and the others in the thread [<a href="https://github.com/micz/ThunderAI/issues/150">#150</a>].</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>

From 32805342cbede315aa782abf77debd68498d0cef Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 23 Oct 2024 22:27:17 +0200
Subject: [PATCH 67/68] action icon in the compose window moved in the format
 toolbar. fixes #173

---
 manifest.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifest.json b/manifest.json
index 99c9c3d5..5c22962b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,6 +17,7 @@
         "default_popup": "popup/mzta-popup.html"
     },
     "compose_action": {
+        "default_area": "formattoolbar",
         "default_title": "__MSG_menu_title__",
         "default_icon": "images/icon-32px.png",
         "default_popup": "popup/mzta-popup.html"

From 56e22f3b49bb7f76c35314e2c60d0499ec6bf80c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Wed, 23 Oct 2024 22:28:27 +0200
Subject: [PATCH 68/68] 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 5f30fb97..734cd119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 <h2>Version 2.3.0 - ??/??/2024</h2>
       <ul>
+        <li>The action button in the compose window has been moved to the formatting toolbar [<a href="https://github.com/micz/ThunderAI/issues/173">#173</a>].</li>
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for the "Reply to this" prompt.</li>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 48a8a703..bbba4683 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 2.3.0 - ??/??/2024</h2>
       <ul>
+        <li>The action button in the compose window has been moved to the formatting toolbar [<a href="https://github.com/micz/ThunderAI/issues/173">#173</a>].</li>
         <li>On the custom prompts page, when editing a prompt, pressing the cancel button will revert any modified values in the form to their saved state.</li>
         <li>Implemented placeholders to add additional data to prompts [<a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">More info</a>] [<a href="https://github.com/micz/ThunderAI/issues/146">#146</a>, <a href="https://github.com/micz/ThunderAI/issues/153">#153</a>].</li>
         <li>Text improved for the "Reply to this" prompt.</li>
