diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index a64c9628..30e4ff8a 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -137,7 +137,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) {
+worker.onmessage = async function(event) {
     const { type, payload } = event.data;
     switch (type) {
         case 'messageSent':
@@ -148,7 +148,7 @@ worker.onmessage = function(event) {
             messageInput.setStatusMessage(browser.i18n.getMessage("apiwebchat_receiving_data") + '...');
             break;
         case 'tokensDone':
-            messagesArea.handleTokensDone(promptData);
+            await messagesArea.handleTokensDone(promptData);
             messageInput.enableInput();
             break;
         case 'error':
diff --git a/api_webchat/messagesArea.js b/api_webchat/messagesArea.js
index 7af3fec2..cca72f48 100644
--- a/api_webchat/messagesArea.js
+++ b/api_webchat/messagesArea.js
@@ -57,7 +57,9 @@ messagesAreaStyle.textContent = `
     }
     .action-buttons {
         line-height: 1.3;
-        text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
     }
     .action-buttons button {
         display: inline;
@@ -66,6 +68,11 @@ messagesAreaStyle.textContent = `
         border-radius: 5px;
         cursor: pointer;
     }
+    .action_btn_info {
+        font-size: 0.6rem;
+        color: gray;
+        display: inline-block;
+    }
     @keyframes fadeIn {
         to {
             opacity: 1;
@@ -94,6 +101,8 @@ messagesAreaStyle.textContent = `
         color: gray;
         margin-top: 5px;
         display: none;
+        width: 100%;
+        text-align: center;
     }
     /* diff viewer */
     .added {
@@ -158,9 +167,9 @@ class MessagesArea extends HTMLElement {
         this.llmName = llmName;
     }
 
-    handleTokensDone(promptData = null) {
+    async handleTokensDone(promptData = null) {
         this.flushAccumulatingMessage();
-        this.addActionButtons(promptData);
+        await this.addActionButtons(promptData);
         this.addDivider();
     }
 
@@ -238,7 +247,7 @@ class MessagesArea extends HTMLElement {
         this.messages.scrollTop = this.messages.scrollHeight;
     }
 
-    addActionButtons(promptData = null) {
+    async addActionButtons(promptData = null) {
         if(promptData == null) { return; }
         const actionButtons = document.createElement('div');
         actionButtons.classList.add('action-buttons');
@@ -246,7 +255,15 @@ class MessagesArea extends HTMLElement {
         selectionInfo.textContent = browser.i18n.getMessage("apiwebchat_selection_info");
         selectionInfo.classList.add('sel_info');
         const actionButton = document.createElement('button');
-        actionButton.textContent = browser.i18n.getMessage("apiwebchat_use_this_answer");
+        const actionButton_line1 = document.createElement('span');
+        actionButton_line1.textContent = browser.i18n.getMessage("apiwebchat_use_this_answer");
+        const actionButton_line2 = document.createElement('span');
+        actionButton_line2.classList.add('action_btn_info');
+        let reply_type_pref = await browser.storage.sync.get({reply_type: 'reply_all'});
+        actionButton_line2.textContent = reply_type_pref.reply_type == 'reply_all' ? browser.i18n.getMessage("prefs_OptionText_reply_all") : browser.i18n.getMessage("prefs_OptionText_reply_sender");
+        actionButton.appendChild(actionButton_line1);
+        actionButton.appendChild(document.createElement('br'));
+        actionButton.appendChild(actionButton_line2);
         const fullTextHTMLAtAssignment = this.fullTextHTML.trim().replace(/^"|"$/g, '').replace(/^<p>&quot;/, '<p>').replace(/&quot;<\/p>$/, '</p>'); // strip quotation marks
         //console.log(">>>>>>>>>>>> fullTextHTMLAtAssignment: " + fullTextHTMLAtAssignment);
         actionButton.addEventListener('click', async () => {
@@ -299,8 +316,9 @@ class MessagesArea extends HTMLElement {
         }
 
         actionButtons.appendChild(closeButton);
-        actionButtons.appendChild(selectionInfo);
+        //actionButtons.appendChild(selectionInfo);
         this.messages.appendChild(actionButtons);
+        this.messages.appendChild(selectionInfo);
         this.scrollToBottom();
     }