diff --git a/src/lib/services/conversation-service.js b/src/lib/services/conversation-service.js
index 1b884a0f..46521901 100644
--- a/src/lib/services/conversation-service.js
+++ b/src/lib/services/conversation-service.js
@@ -262,7 +262,7 @@ export async function updateConversationMessage(conversationId, request) {
  * @param {string} agentId The agent id
  * @param {string} converationId The conversation id
  * @param {any[]} files The conversation files
- * @returns {Promise<string>}
+ * @returns {Promise<any>}
  */
 export async function uploadConversationFiles(agentId, converationId, files) {
     const url = replaceUrl(endpoints.fileUploadUrl, {
diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
index 5c930859..53ac215c 100644
--- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
+++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
@@ -57,7 +57,7 @@
 	import { utcToLocal } from '$lib/helpers/datetime';
 	import { replaceNewLine } from '$lib/helpers/http';
 	import { isAudio, isExcel, isPdf } from '$lib/helpers/utils/file';
-	import { ChatAction, ConversationTag, EditorType, FileSourceType, SenderAction, UserRole } from '$lib/helpers/enums';
+	import { ChatAction, ConversationTag, EditorType, FileSourceType, RichType, SenderAction, UserRole } from '$lib/helpers/enums';
 	import ChatTextArea from './chat-util/chat-text-area.svelte';
 	import RichContent from './rich-content/rich-content.svelte';
 	import RcMessage from "./rich-content/rc-message.svelte";
@@ -770,8 +770,8 @@
 
 		if (files?.length > 0 && !!!messageData.inputMessageId) {
 			const filePayload = buildFilePayload(files);
-			const resMessageId = await uploadConversationFiles(agentId, convId, files);
-			messageData = { ...messageData, inputMessageId: resMessageId };
+			const obj = await uploadConversationFiles(agentId, convId, files);
+			messageData = { ...messageData, inputMessageId: obj?.messageId };
 			if (!!filePayload) {
 				messageData = {
 					...messageData,
@@ -1339,7 +1339,10 @@
 	function copyMessage(e, message) {
 		e.preventDefault();
 
-		const text = message?.rich_content?.message?.text || message?.text || '';
+		let text = message?.rich_content?.message?.text || message?.text || '';
+		if (message?.rich_content?.rich_type === RichType.ProgramCode) {
+			text = message?.rich_content?.message?.text;
+		}
 		
 		navigator.clipboard.writeText(text).then(() => {
 			setTimeout(() => {
diff --git a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte
index 1367aee5..36c264fc 100644
--- a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte
+++ b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte
@@ -27,6 +27,9 @@
             {#if message?.rich_content?.message?.rich_type === RichType.ProgramCode
                 && message?.rich_content?.message?.language === 'javascript'}
                 <RcJsInterpreter message={message} scrollable />
+            {:else if message?.rich_content?.message?.rich_type === RichType.ProgramCode
+                && message?.rich_content?.message?.language === 'python'}
+                <Markdown containerClasses={markdownClasses} text={message?.text} rawText />
             {:else}
                 <Markdown containerClasses={markdownClasses} text={text} rawText />
             {/if}