diff --git a/lua/CopilotChat/init.lua b/lua/CopilotChat/init.lua
index 85510023..a5876373 100644
--- a/lua/CopilotChat/init.lua
+++ b/lua/CopilotChat/init.lua
@@ -16,6 +16,7 @@ _COPILOT_CHAT_GLOBAL_CONFIG = {}
 --       - debug: (boolean?) default: false.
 M.setup = function(options)
   vim.g.copilot_chat_show_help = options and options.show_help or 'yes'
+  vim.g.copilot_chat_disable_separators = options and options.disable_extra_info or false
   local debug = options and options.debug or false
   _COPILOT_CHAT_GLOBAL_CONFIG.debug = debug
 
diff --git a/rplugin/python3/handlers/chat_handler.py b/rplugin/python3/handlers/chat_handler.py
index 910e642e..8058d30d 100644
--- a/rplugin/python3/handlers/chat_handler.py
+++ b/rplugin/python3/handlers/chat_handler.py
@@ -37,7 +37,6 @@ def chat(
     ):
         if system_prompt is None:
             system_prompt = self._construct_system_prompt(prompt)
-
         # Start the spinner
         self.nvim.exec_lua('require("CopilotChat.spinner").show()')
 
@@ -54,7 +53,9 @@ def chat(
         self.nvim.exec_lua('require("CopilotChat.spinner").hide()')
 
         if not disable_end_separator:
-            self._add_end_separator(model)
+            self._add_end_separator(
+                model, self.nvim.eval("g:copilot_chat_disable_separators") == "yes"
+            )
 
     # private
 
@@ -75,14 +76,15 @@ def _add_start_separator(
         code: str,
         file_type: str,
         winnr: int,
+        no_annoyance: bool = False,
     ):
-        if is_module_installed("tiktoken"):
+        if is_module_installed("tiktoken") and no_annoyance:
             self._add_start_separator_with_token_count(
                 system_prompt, prompt, code, file_type, winnr
             )
         else:
             self._add_regular_start_separator(
-                system_prompt, prompt, code, file_type, winnr
+                system_prompt, prompt, code, file_type, winnr, no_annoyance
             )
 
     def _add_regular_start_separator(
@@ -92,15 +94,17 @@ def _add_regular_start_separator(
         code: str,
         file_type: str,
         winnr: int,
+        no_annoyance: bool = False,
     ):
-        if code:
+        if code and not no_annoyance:
             code = f"\n        \nCODE:\n```{file_type}\n{code}\n```"
 
         last_row_before = len(self.buffer.lines())
         system_prompt_height = len(system_prompt.split("\n"))
         code_height = len(code.split("\n"))
 
-        start_separator = f"""### User
+        start_separator = (
+            f"""### User
 
 SYSTEM PROMPT:
 ```
@@ -111,8 +115,13 @@ def _add_regular_start_separator(
 ### Copilot
 
 """
+            if not no_annoyance
+            else f"### User\n{prompt}\n\n### Copilot\n\n"
+        )
         self.buffer.append(start_separator.split("\n"))
 
+        if no_annoyance:
+            return
         self._add_folds(code, code_height, last_row_before, system_prompt_height, winnr)
 
     def _add_start_separator_with_token_count(
@@ -222,13 +231,17 @@ def _add_chat_messages(
                 token.split("\n"),
             )
 
-    def _add_end_separator(self, model: str):
+    def _add_end_separator(self, model: str, no_annoyance: bool = False):
         current_datetime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         model_info = f"\n#### Answer provided by Copilot (Model: `{model}`) on {current_datetime}."
         additional_instructions = (
             "\n> For additional queries, please use the `CopilotChat` command."
         )
-        disclaimer = "\n> Please be aware that the AI's output may not always be accurate. Always cross-verify the output.\n---\n"
+        disclaimer = "\n> Please be aware that the AI's output may not always be accurate. Always cross-verify the output."
 
         end_message = model_info + additional_instructions + disclaimer
+
+        if no_annoyance:
+            end_message = "\n" + current_datetime + "\n---\n"
+
         self.buffer.append(end_message.split("\n"))