diff --git a/js/forum/forum-view.js b/js/forum/forum-view.js
index bada3c1..ceb3687 100644
--- a/js/forum/forum-view.js
+++ b/js/forum/forum-view.js
@@ -17,17 +17,25 @@ chrome.storage.sync.get(['PolyPlus_Settings'], function (result) {
 });
 
 function ForumMentions() {
-	const Regex = /@([\w.]+)/g;
+    const Regex = /@([\w.]+)/g;
 
-	for (let text of ForumText) {
-		let FormattedText = text.innerHTML;
-		let match;
-		while ((match = Regex.exec(text.innerText)) !== null) {
-			const Username = match[0].substring(1);
-			FormattedText = FormattedText.replaceAll(match[0], `<a href="/u/${Username}" class="polyplus-mention">${match[0]}</a>`);
-		}
-		text.innerHTML = FormattedText;
-	}
+    for (let text of ForumText) {
+        const TreeWalker = document.createTreeWalker(text, NodeFilter.SHOW_TEXT, null, false);
+        let Node;
+        
+        while ((Node = TreeWalker.nextNode())) {
+            let Match;
+            let Replacement = Node.nodeValue;
+            
+            while ((Match = Regex.exec(Node.nodeValue)) !== null) {
+                const Username = Match[0].substring(1);
+                const Mention = `<a href="/u/${Username}" class="polyplus-mention">${Match[0]}</a>`;
+                Replacement = replacedText.replace(Match[0], Mention);
+            }
+            
+            Node.nodeValue = replacedText;
+        }
+    }
 }
 
 function ForumUnixTimestamps() {
@@ -44,7 +52,6 @@ function ForumUnixTimestamps() {
 			const Distance = new Intl.RelativeTimeFormat({numeric: 'auto', style: 'short'}).format(Math.floor((Timestamp - new Date()) / (60 * 1000)), 'day');
 			const Result = `<code style="color: orange;">${Months[Timestamp.getMonth()]} ${Timestamp.getDate()}, ${Timestamp.getFullYear()} (${['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'][Timestamp.getDay() - 1]}) at ${Timestamp.getHours() - 12}:${String(Timestamp.getMinutes()).padStart(2, '0')} (${Distance})</code>`;
 			FormattedText = FormattedText.replaceAll(match[0], Result);
-			console.log(FormattedText);
 		}
 		text.innerHTML = FormattedText;
 	}