diff --git a/packages/chat/src/components/message.tsx b/packages/chat/src/components/message.tsx
index 4312b94..d088a57 100644
--- a/packages/chat/src/components/message.tsx
+++ b/packages/chat/src/components/message.tsx
@@ -29,6 +29,9 @@ import MessageContextMenu from "./messageContextMenu";
 import Media from "./media";
 import { useStorage } from "@tensamin/storage/context";
 import { useMTP } from "@tensamin/mtp";
+import { useChat } from "../context";
+import { decryptChatText } from "@tensamin/crypto/chatSecret";
+import { log, toast } from "@tensamin/shared/log";
 
 function MessageComponent({
   grouped,
@@ -125,25 +128,42 @@ function MessageComponent({
     };
   }, [message.MessageState, load, messageStateReadUpdate]);
 
+  // Message decryption
+  const { chatSecret } = useChat();
+  const [decryptedContent, setDecryptedContent] = useState<string | undefined>(
+    undefined,
+  );
+  useEffect(() => {
+    if (!chatSecret) return;
+
+    decryptChatText(chatSecret, message.Content).then(
+      setDecryptedContent,
+      (err) => {
+        toast("error", "Failed to decrypt message", String(err));
+        log(1, "chat", "red", err);
+      },
+    );
+  }, [chatSecret, message.Content]);
+
   return (
     <div
       // pt-3 is to get a gap between messages
       className={`${grouped ? "" : "pt-3"} w-full flex justify-start transition-opacity duration-150 ${opacityClass}`}
     >
-      <MessageContextMenu
-        content={message.Content}
-        messageId={message.SendTime}
-      >
-        <div
-          className={cn(
-            "group hover:bg-muted/50 select-text! relative justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
-            {
-              "bg-(--destructive)/15 text-destructive-foreground":
-                actuallyFailed,
-            },
-          )}
+      {user && decryptedContent ? (
+        <MessageContextMenu
+          content={message.Content}
+          messageId={message.SendTime}
         >
-          {user ? (
+          <div
+            className={cn(
+              "group hover:bg-muted/50 select-text! relative justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
+              {
+                "bg-(--destructive)/15 text-destructive-foreground":
+                  actuallyFailed,
+              },
+            )}
+          >
             <>
               {grouped ? (
                 <p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
@@ -220,11 +240,11 @@ function MessageComponent({
                 )}
               </div>
             </>
-          ) : (
-            "Loading"
-          )}
-        </div>
-      </MessageContextMenu>
+          </div>
+        </MessageContextMenu>
+      ) : (
+        "Loading"
+      )}
     </div>
   );
 }
diff --git a/packages/chat/src/context.tsx b/packages/chat/src/context.tsx
index 94df598..789d023 100644
--- a/packages/chat/src/context.tsx
+++ b/packages/chat/src/context.tsx
@@ -16,7 +16,6 @@ import {
   deriveChatId,
   deriveChatSecretId,
   decryptChatText,
-  encryptChatText,
   kemPublicKeyFromPublicKeyBundle,
   ownKemPublicKeyFromKeyring,
   randomChatSecret,
diff --git a/packages/shared/src/data.ts b/packages/shared/src/data.ts
index 391b939..56293ec 100644
--- a/packages/shared/src/data.ts
+++ b/packages/shared/src/data.ts
@@ -53,7 +53,7 @@ const authPayload = z.object({
         UserId: z.number(),
         LastMessage: z
           .object({
-            content: z.base64(),
+            Content: z.base64(),
             SenderId: z.number(),
           })
           .optional(),