diff --git a/frontend/src/resources/css/_chat.scss b/frontend/src/resources/css/_chat.scss
index 2eb1864..d1c65e7 100644
--- a/frontend/src/resources/css/_chat.scss
+++ b/frontend/src/resources/css/_chat.scss
@@ -205,8 +205,16 @@
 
                         .message-content {
                             word-wrap: break-word;
-                            margin-bottom: 0.3rem;
+                            margin-bottom: 10px;
                             white-space: pre-wrap;
+
+                            > p:first-child {
+                                margin-block-start: 0;
+                            }
+
+                            > p:last-child {
+                                margin-block-end: 0;
+                            }
                         }
 
                         .quote.reply-preview {
diff --git a/frontend/src/ui/components/chat/Message.tsx b/frontend/src/ui/components/chat/Message.tsx
index ab095ad..e5835be 100644
--- a/frontend/src/ui/components/chat/Message.tsx
+++ b/frontend/src/ui/components/chat/Message.tsx
@@ -2,6 +2,9 @@ import { formatTime } from "../../../utils/utils";
 import type { Message as MessageType } from "../../../core/types";
 import defaultAvatar from "../../../resources/images/default-avatar.png";
 import Quote from "../core/Quote";
+import { parse } from "marked";
+import DOMPurify from "dompurify";
+import { useEffect, useState } from "react";
 
 interface MessageProps {
     message: MessageType;
@@ -13,11 +16,23 @@ interface MessageProps {
 }
 
 export function Message({ message, isAuthor, onProfileClick, onContextMenu, isLoadingProfile = false, isDm = false }: MessageProps) {
-    const handleContextMenu = (e: React.MouseEvent) => {
+    const [formattedMessage, setFormattedMessage] = useState({ __html: DOMPurify.sanitize(message.content).trim() });
+
+    useEffect(() => {
+        (async () => {
+            setFormattedMessage({
+                __html: DOMPurify.sanitize(
+                    await parse(message.content)
+                ).trim()
+            });
+        })();
+    }, [message]);
+
+    function handleContextMenu(e: React.MouseEvent) {
         e.preventDefault();
         e.stopPropagation();
         onContextMenu(e, message);
-    };
+    }
 
     return (
         <div 
@@ -47,7 +62,7 @@ export function Message({ message, isAuthor, onProfileClick, onContextMenu, isLo
                     <div 
                         className={`message-username ${isLoadingProfile ? "loading" : ""}`}
                         onClick={() => !isLoadingProfile && onProfileClick(message.username)} 
-                        style={{ cursor: isLoadingProfile ? "default" : "pointer" }}> {/* TODO extract to SCSS */}
+                        style={{ cursor: isLoadingProfile ? "default" : "pointer" }}>
                         {message.username}
                     </div>
                 )}
@@ -60,17 +75,15 @@ export function Message({ message, isAuthor, onProfileClick, onContextMenu, isLo
                     </Quote>
                 )}
 
-                <div className="message-content">
-                    {message.content}
-                </div>
+                <div className="message-content" dangerouslySetInnerHTML={formattedMessage} />
 
                 <div className="message-time">
                     {formatTime(message.timestamp)}
                     {message.is_edited ? " (edited)" : undefined}
                     
-                    {isAuthor && message.is_read ? (
+                    {isAuthor && message.is_read && (
                         <span className="material-symbols outlined"></span>
-                    ) : undefined}
+                    )}
                 </div>
             </div>
         </div>
diff --git a/package.json b/package.json
index a5d36a7..f145564 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
         "vite-plugin-html": "^3.2.2"
     },
     "dependencies": {
+        "dompurify": "^3.2.7",
         "electron-squirrel-startup": "^1.0.1",
         "marked": "^16.3.0",
         "mdui": "^2.1.4",