diff --git a/src/window.py b/src/window.py
index c9a29f9..03a5285 100644
--- a/src/window.py
+++ b/src/window.py
@@ -250,7 +250,8 @@ class AlpacaWindow(Adw.ApplicationWindow):
         self.toggle_ui_sensitive(False)
 
         #self.attachments[name] = {"path": file_path, "type": file_type, "content": content}
-        self.show_message(self.message_text_view.get_buffer().get_text(self.message_text_view.get_buffer().get_start_iter(), self.message_text_view.get_buffer().get_end_iter(), False), False, f"\n\n<small>{formated_datetime}</small>", attached_images, attached_files, id=id)
+        raw_message = self.message_text_view.get_buffer().get_text(self.message_text_view.get_buffer().get_start_iter(), self.message_text_view.get_buffer().get_end_iter(), False)
+        self.show_message(raw_message, False, f"\n\n<small>{formated_datetime}</small>", attached_images, attached_files, id=id)
         self.message_text_view.get_buffer().set_text("", 0)
         self.loading_spinner = Gtk.Spinner(spinning=True, margin_top=12, margin_bottom=12, hexpand=True)
         self.chat_container.append(self.loading_spinner)
@@ -260,7 +261,9 @@ class AlpacaWindow(Adw.ApplicationWindow):
         thread = threading.Thread(target=self.run_message, args=(data['messages'], data['model'], bot_id))
         thread.start()
         if len(data['messages']) == 1:
-            generate_title_thread = threading.Thread(target=self.generate_chat_title, args=(self.message_text_view.get_buffer().get_text(self.message_text_view.get_buffer().get_start_iter(), self.message_text_view.get_buffer().get_end_iter(), False), self.chat_list_box.get_selected_row().get_child()))
+            message_data = data["messages"][0].copy()
+            message_data['content'] = raw_message
+            generate_title_thread = threading.Thread(target=self.generate_chat_title, args=(message_data, self.chat_list_box.get_selected_row().get_child()))
             generate_title_thread.start()
 
     @Gtk.Template.Callback()