diff --git a/src/lib/commands/chatlog.ts b/src/lib/commands/chatlog.ts
index 1a2b507..7e34de6 100644
--- a/src/lib/commands/chatlog.ts
+++ b/src/lib/commands/chatlog.ts
@@ -18,7 +18,11 @@ const command: Command = {
 
 		reply('(wip) Here are the chat logs:');
 
-		reply(lines.join('\n'));
+		reply({
+			message: lines.join('\n'),
+			type: 'text',
+			encrypted: true
+		});
 	}
 };
 
diff --git a/src/lib/commands/components/ChatMessage.svelte b/src/lib/commands/components/ChatMessage.svelte
index dd0b5eb..864a247 100644
--- a/src/lib/commands/components/ChatMessage.svelte
+++ b/src/lib/commands/components/ChatMessage.svelte
@@ -67,6 +67,28 @@
 		}
 	}
 
+	function getMeta() {
+		if (message.encrypted) {
+			// Tries to decrypt the message, if failed, return error message
+			const key = localStorage.getItem('chat-os-encryption-key');
+
+			if (!key) {
+				return '[no encryption key set]';
+			}
+
+			try {
+				const decrypted = decryptMessage(message.meta as string, key);
+
+				return decrypted;
+			} catch (e) {
+				console.info(e);
+				return '[decryption failed]';
+			}
+		} else {
+			return message.meta;
+		}
+	}
+
 	const decryptMessage = (messageWithNonce: string, key: string) => {
 		const keyUint8Array = decodeBase64(key);
 		const messageWithNonceAsUint8Array = decodeBase64(messageWithNonce);
@@ -194,13 +216,13 @@
 		{/if}
 
 		{#if message.type == 'image'}
-			<img src={getMessage()} alt={message.alt} />
+			<img src={getMessage()} alt={getMeta().alt} />
 		{:else if message.type == 'link'}
 			<a href={getMessage()} target="_blank" rel="noreferrer" class="link">{getMessage()}</a>
 		{:else if message.type == 'component'}
 			{#if getMessage() in components}
 				<!-- <Renderer component={components[getMessage()]} props={{}} /> -->
-				<svelte:component this={components[getMessage()]} options={message.meta} />
+				<svelte:component this={components[getMessage()]} options={getMeta()} />
 			{/if}
 		{:else}
 			{#each getMessage().split('\n') as line}
diff --git a/src/lib/commands/promptpay-qr.ts b/src/lib/commands/promptpay-qr.ts
index 87bdeec..31bad36 100644
--- a/src/lib/commands/promptpay-qr.ts
+++ b/src/lib/commands/promptpay-qr.ts
@@ -27,7 +27,8 @@ const command: Command = {
 			message: await QRCode.toDataURL(ppqr(args[1], { amount: args[3] ? +args[3] : undefined }), {
 				scale: 6
 			}),
-			options: { alt }
+			options: { alt },
+			encrypted: true
 		});
 	}
 };
diff --git a/src/lib/commands/qr.ts b/src/lib/commands/qr.ts
index d8af37b..e668543 100644
--- a/src/lib/commands/qr.ts
+++ b/src/lib/commands/qr.ts
@@ -21,7 +21,8 @@ const command: Command = {
 		reply({
 			type: 'image',
 			message: await QRCode.toDataURL(args[1], { scale: 6 }),
-			options: { alt: args[1] }
+			options: { alt: args[1] },
+			encrypted: true
 		});
 	}
 };
diff --git a/src/lib/commands/timer.ts b/src/lib/commands/timer.ts
index 25ba47c..994837f 100644
--- a/src/lib/commands/timer.ts
+++ b/src/lib/commands/timer.ts
@@ -21,6 +21,7 @@ const command: Command = {
 		reply({
 			type: 'component',
 			message: 'timer',
+			encrypted: true,
 			options: { seconds, startAt: Date.now(), name: args.name || null }
 		});
 	}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index b6f6ac9..53a21c2 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,12 +1,13 @@
 <script lang="ts" context="module">
+	type EncryptedMeta = string;
+
 	export interface Log {
 		id: string;
 		message: string;
 		self: boolean;
 		time: Timestamp;
 		type: string;
-		alt?: string;
-		meta?: Record<string, any>;
+		meta?: Record<string, any> | EncryptedMeta;
 		guestSession?: boolean;
 		encrypted?: boolean;
 	}
@@ -62,7 +63,6 @@
 			message: log.message,
 			time: Timestamp.fromDate(log.time),
 			type: log.type,
-			alt: log.alt,
 			meta: log.meta,
 			guestSession: log.guestSession
 		})) satisfies Log[];
@@ -206,7 +206,7 @@
 		}
 	}
 
-	const encryptMessage = (json: string, key: string) => {
+	const encryptMessage = (json: string | Record<string, any>, key: string) => {
 		const keyUint8Array = decodeBase64(key);
 		const nonce = randomBytes(secretbox.nonceLength);
 		const messageUint8 = decodeUTF8(JSON.stringify(json));
@@ -225,21 +225,20 @@
 		const options = payload?.options || {};
 		const encrypted = payload?.encrypted || false;
 
-		console.log({ payload });
-
 		setTimeout(async () => {
 			if ($user) {
 				const encryptionKey = localStorage.getItem('chat-os-encryption-key');
 
 				if (encrypted && encryptionKey) {
 					const encryptedMessage = encryptMessage(message, encryptionKey);
+					const encryptedOptions = encryptMessage(options, encryptionKey);
 
 					await messagesCollection.add({
 						self: false,
 						message: encryptedMessage,
 						time: Timestamp.now(),
 						type,
-						alt: options.alt || null,
+						meta: encryptedOptions as unknown as Record<string, any>,
 						encrypted: true
 					});
 				} else {
@@ -247,7 +246,7 @@
 						self: false,
 						message,
 						time: Timestamp.now(),
-						alt: options.alt || null,
+						meta: options,
 						type
 					});
 				}
@@ -258,7 +257,6 @@
 					message,
 					time: new Date(),
 					type: type,
-					alt: options.alt,
 					meta: options
 				});
 			}