diff --git a/tools/server/public/index.html.gz b/tools/server/public/index.html.gz
index 2db04e95227..abd2b4860b7 100644
Binary files a/tools/server/public/index.html.gz and b/tools/server/public/index.html.gz differ
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte b/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte
index 96ed56a7758..19aa6d9ed30 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { chatStore } from '$lib/stores/chat.svelte';
+	import type { DatabaseMessageExtra } from '$lib/types/database';
 	import { copyToClipboard, isIMEComposing } from '$lib/utils';
 	import ChatMessageAssistant from './ChatMessageAssistant.svelte';
 	import ChatMessageUser from './ChatMessageUser.svelte';
@@ -87,7 +88,24 @@
 	}
 
 	async function handleCopy() {
-		await copyToClipboard(message.content, 'Message copied to clipboard');
+		const promptContent = message.content.trim();
+		const attachmentTexts = message.extra
+			?.map((attachment: DatabaseMessageExtra) => {
+				if ('content' in attachment && typeof attachment.content === 'string') {
+					return attachment.content;
+				}
+
+				return null;
+			})
+			.filter((content: string | null): content is string => Boolean(content?.trim()));
+
+		const partsToCopy = [promptContent ? message.content : null, ...(attachmentTexts ?? [])].filter(
+			Boolean
+		) as string[];
+
+		const textToCopy = partsToCopy.length ? partsToCopy.join('\n\n') : message.content;
+
+		await copyToClipboard(textToCopy, 'Message copied to clipboard');
 		onCopy?.(message);
 	}