diff --git a/setup.py b/setup.py
index 27e964ef7a..f0a50c227b 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
 # https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/
 setup(
     name=package,
-    version="0.1.84",
+    version="0.1.85",
     python_requires=">=3.8, <3.13",
     description=f"UniqueBible App is a cross-platform & offline bible application, integrated with high-quality resources and unique features. Developers: Eliran Wong and Oliver Tseng",
     long_description=long_description,
diff --git a/uniquebible/__init__.py b/uniquebible/__init__.py
index df054d5415..22e1daae87 100644
--- a/uniquebible/__init__.py
+++ b/uniquebible/__init__.py
@@ -238,7 +238,7 @@ def getChatResponse(backend, chatMessages) -> Optional[str]:
         textOutput = completion.choices[0].message.content
         # update the message chain in the config, to work with command `chat`
         config.chatMessages = chatMessages
-        config.chatMessages.append({"role": "user", "content": textOutput})
+        config.chatMessages.append({"role": "assistant", "content": textOutput})
     except:
         textOutput = "Failed to connect! Please try again later."
     if hasattr(config, "displayLanguage") and config.displayLanguage == "zh_HANT":
diff --git a/uniquebible/util/RemoteHttpHandler.py b/uniquebible/util/RemoteHttpHandler.py
index 6704705182..e56b6aa4b6 100644
--- a/uniquebible/util/RemoteHttpHandler.py
+++ b/uniquebible/util/RemoteHttpHandler.py
@@ -1,7 +1,7 @@
 # https://docs.python.org/3/library/http.server.html
 # https://ironpython-test.readthedocs.io/en/latest/library/simplehttpserver.html
 import hashlib
-import json
+import json, markdown
 import logging
 import os, re, pprint, glob
 from uniquebible import config
@@ -518,6 +518,7 @@ def loadContent(self):
             "logout": self.logout,
             "search": self.searchContent,
             "qna": self.qnaContent,
+            "chat": self.chatContent,
             "maps": self.mapsContent,
             "days": self.dailyReadingContent,
             "theme": self.swapTheme,
@@ -1048,13 +1049,14 @@ def getSideNavContent(self):
             (config.thisTranslation["biblePromises"], ".promises"),
             (config.thisTranslation["bibleHarmonies"], ".parallels"),
             (config.thisTranslation["bibleAnswers"], ".qna") if config.addBibleQnA else None,
+            ("AI " + config.thisTranslation["chat"], ".chat"),
             (config.thisTranslation["readingPlan"], ".days"),
             ("{0} &#x1F50E;&#xFE0E;".format(config.thisTranslation["menu_search"]), ".search"),
             (config.thisTranslation["download"], ".download"),
             (config.thisTranslation["ubaCommands"], ".help"),
         )
         for item in sideNavItems:
-            if item is not None:
+            if item is not None and not (item[0].startswith("AI ") and not config.webHomePage==f"{config.webPrivateHomePage}.html"):
                 html += """<a href="#" onclick="submitCommand('{1}')">{0}</a>""".format(*item)
         html += """<a href="{1}" target="_blank">{0}</a>""".format(config.thisTranslation["userManual"], self.getUserManual())
         html += "<hr>"
@@ -1936,9 +1938,19 @@ def qnaContent(self):
 
     def chatContent(self):
         content = "<h2>AI {0}</h2>".format(config.thisTranslation["chat"])
-
+        if config.displayLanguage == "zh_HANT":
+            content += """<p>請輸入您的提問，然後按下按鈕「{0}」。</p>""".format(config.thisTranslation["send"])
+        elif config.displayLanguage == "zh_HANS":
+            content += """<p>请输入您的提问，然后按下按钮「{0}」。</p>""".format(config.thisTranslation["send"])
+        else:
+            content += """<p>Please enter your query and click the button '{0}'.</p>""".format(config.thisTranslation["send"])
         content += "<p><input type='text' id='chatInput' style='width:95%' autofocus></p>"
         content += "<p><button id='openChatInputButton' type='button' onclick='bibleChat();' class='ubaButton'>{0}</button></p>".format(config.thisTranslation["send"])
+
+        content += "<hr>"
+        content += "\n\n".join([f'''# {i.get("role", "")}\n\n{i.get("content", "")}'''for i in config.chatMessages])
+        textOutput = markdown.markdown(textOutput)
+        
         content += """
 <script>
 function bibleChat() {0}
diff --git a/uniquebible/util/TextCommandParser.py b/uniquebible/util/TextCommandParser.py
index 946676c5de..f9b7f74c6e 100644
--- a/uniquebible/util/TextCommandParser.py
+++ b/uniquebible/util/TextCommandParser.py
@@ -413,10 +413,15 @@ def __init__(self, parent):
             "chat": (self.textChat, """
             # [KEYWORD] CHAT
             # Feature - Chat with AI or follow up previous conversation.
-            # Usage - CHAT:::[BACKEND]:::[QUERY]
+            # Usage - CHAT:::[BACKEND]:::[OPERATOR]:::[QUERY]
             # BACKEND options: openai, google, groq, mistral
             # Use value of `config.llm_backend` as backend if BACKEND is not given.
-            # e.g. CHAT:::Tell me more"""),
+            # OPERATOR options: new, show [optional]
+                    new - start a new conversation
+                    show - show the whole conversation
+            # e.g. CHAT:::NEW:::Hi!
+            # e.g. CHAT:::Tell me more
+            # e.g. CHAT:::SHOW"""),
             "map": (self.textMap, """
             # [KEYWORD] MAP
             # Feature - Open a Google map with bible locations pinned
@@ -4537,7 +4542,9 @@ def textAiCommentary(self, command, source="", systemMessage="", goBack=""):
 {textOutput}"""
         return ("study", textOutput, {'tab_title': "AI"})
 
-    def textChat(self, command, source):
+    def textChat(self, command, _):
+        if config.runMode == "http-server" and hasattr(config, "webHomePage") and not config.webHomePage==f"{config.webPrivateHomePage}.html":
+            return self.invalidCommand()
         if command.strip():
             command = command.strip()
             backendPattern = "|".join(config.llm_backends)
@@ -4561,14 +4568,14 @@ def textChat(self, command, source):
                 feature = ""
             if not command.strip():
                 return self.invalidCommand()
-            if not hasattr(config, "chatMessages") or not config.chatMessages or feature.lower() == "new":::
+            if not hasattr(config, "chatMessages") or not config.chatMessages or feature.lower() == "new":
                 config.chatMessages = [
-                    {"role": "system", "content": bibleChat_systemMessage},
+                    {"role": "system", "content": config.bibleChat_systemMessage},
                     {"role": "user", "content": command.strip()},
                 ]
             else:
                 config.chatMessages.append({"role": "user", "content": command.strip()})
-            textOutput = getChatResponse(backend, chatMessages)
+            textOutput = getChatResponse(backend, config.chatMessages)
             if textOutput is None:
                 return ("study", "<p>AI Backend API key not found!</p>", {'tab_title': "AI"})
             if not config.rawOutput:
@@ -4578,8 +4585,34 @@ def textChat(self, command, source):
                 bibleVerseParser = BibleVerseParser(config.parserStandarisation)
                 textOutput = bibleVerseParser.parseText(textOutput, splitInChunks=True, parseBooklessReferences=False, canonicalOnly=True)
                 if config.runMode == "http-server":
+
+                    if config.displayLanguage == "zh_HANT":
+                        textOutput += """<hr><p>如想繼續查詢，請輸入您的提問，然後按下按鈕「{0}」。</p>""".format(config.thisTranslation["send"])
+                    elif config.displayLanguage == "zh_HANS":
+                        textOutput += """<hr><p>如想继续查询，请输入您的提问，然后按下按钮「{0}」。</p>""".format(config.thisTranslation["send"])
+                    else:
+                        textOutput += """<hr><p>To continue, enter your query and click the button '{0}'.</p>""".format(config.thisTranslation["send"])
+                    textOutput += "<p><input type='text' id='chatInput' style='width:95%' autofocus> "
+                    textOutput += "<button id='openChatInputButton' type='button' onclick='bibleChat();' class='ubaButton'>{0}</button></p>".format(config.thisTranslation["send"])
+
                     goBack = 'document.title=".chat"'
                     textOutput += """<hr><p><button type='button' onclick='{0}' class='ubaButton'>{1}</button></p>""".format(goBack, config.thisTranslation["youtube_back"])
+
+                    textOutput += """
+<script>
+function bibleChat() {0}
+  var searchString = document.getElementById('chatInput').value;
+  document.title = "CHAT":::"+searchString;
+{1}
+var input = document.getElementById('chatInput');
+input.addEventListener('keyup', function(event) {0}
+  if (event.keyCode === 13) {0}
+   event.preventDefault();
+   document.getElementById('openChatInputButton').click();
+  {1}
+{1});
+</script>""".format("{", "}")
+
                 # Disclaimer
                 textOutput += getAiFeatureDisclaimer()
             return ("study", textOutput, {'tab_title': "AI"})