From 915c68ae7d23591a246f2622af98adf699c3f03c Mon Sep 17 00:00:00 2001
From: Matt Cowger <matt.cowger@sigmacomputing.com>
Date: Mon, 13 Oct 2025 15:02:57 -0700
Subject: [PATCH 1/2] fix(chat): add right margin to message content area for
 code blocks to create more distance between the scroll bars.

---
 .changeset/common-parts-argue.md           | 5 +++++
 webview-ui/src/components/chat/ChatRow.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/common-parts-argue.md

diff --git a/.changeset/common-parts-argue.md b/.changeset/common-parts-argue.md
new file mode 100644
index 0000000000..bd1b40ec0e
--- /dev/null
+++ b/.changeset/common-parts-argue.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+add right margin to message content area for code blocks
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index e9bf53ff8d..44371b5977 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -1135,7 +1135,7 @@ export const ChatRowContent = ({
 								<MessageCircle className="w-4 shrink-0" aria-label="Speech bubble icon" />
 								<span style={{ fontWeight: "bold" }}>{t("chat:text.rooSaid")}</span>
 							</div>
-							<div className="pl-6">
+							<div className="pl-6 mr-6">
 								<Markdown markdown={message.text} partial={message.partial} />
 								{message.images && message.images.length > 0 && (
 									<div style={{ marginTop: "10px" }}>

From 44da6f0cb39cbd22919015fbb5c654eac05e8653 Mon Sep 17 00:00:00 2001
From: Christiaan Arnoldus <christiaan.arnoldus@outlook.com>
Date: Tue, 14 Oct 2025 11:16:27 +0200
Subject: [PATCH 2/2] Add kilocode_change marker

---
 webview-ui/src/components/chat/ChatRow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 44371b5977..3434c80c6c 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -1135,6 +1135,7 @@ export const ChatRowContent = ({
 								<MessageCircle className="w-4 shrink-0" aria-label="Speech bubble icon" />
 								<span style={{ fontWeight: "bold" }}>{t("chat:text.rooSaid")}</span>
 							</div>
+							{/* kilocode_change: mr */}
 							<div className="pl-6 mr-6">
 								<Markdown markdown={message.text} partial={message.partial} />
 								{message.images && message.images.length > 0 && (