diff --git a/web/apps/admin/tabs/mempool.php b/web/apps/admin/tabs/mempool.php
index 5b0acb45..efa24ce2 100644
--- a/web/apps/admin/tabs/mempool.php
+++ b/web/apps/admin/tabs/mempool.php
@@ -59,7 +59,7 @@
 				<td><?php echo $transaction['val'] ?></td>
 				<td><?php echo $transaction['fee'] ?></td>
 				<td><?php echo $transaction['type'] ?></td>
-				<td style="word-break: break-all"><?php echo $transaction['message'] ?></td>
+				<td style="word-break: break-all"><?php echo display_message($transaction['message']) ?></td>
 				<td><?php echo $transaction['peer'] ?></td>
 				<td><?php echo $transaction['error'] ?></td>
                 <td>
diff --git a/web/apps/apps.functions.php b/web/apps/apps.functions.php
index 0585d395..cddee791 100755
--- a/web/apps/apps.functions.php
+++ b/web/apps/apps.functions.php
@@ -17,3 +17,87 @@ function explorer_address_link2($address, $short= false) {
 	}
 	return '<a href="/apps/explorer/address.php?address='.$address.'">'.$text.'</a>';
 }
+
+function display_message($message) {
+    global $_config;
+    static $js_included = false;
+
+    if ($message === "") {
+        return "";
+    }
+
+    $safe_message = htmlspecialchars($message, ENT_QUOTES, 'UTF-8');
+
+    if (empty($_config['enable_message_parsing'])) {
+        return $safe_message;
+    }
+
+    $is_js = preg_match('/<script\b[^>]*>(.*?)<\/script>|on\w+\s*=\s*["\']|javascript:/is', $message);
+
+    if ($is_js) {
+        $encoded_script = base64_encode($message);
+        $output = '<div>' . $safe_message . '</div>';
+        $output .= '<div><strong style="color: red;">Security Review:</strong> This message contains JavaScript.</div>';
+        $output .= '<button onclick="runScript(this)" data-script="' . $encoded_script . '">Run Script</button>';
+    } else {
+        $encoded_message = base64_encode($message);
+        $output = '<span>' . $safe_message;
+        $output .= ' <a href="javascript:void(0);" onclick="showMessageWarning(this)" data-message="' . $encoded_message . '">(Show raw)</a></span>';
+    }
+
+    if (!$js_included) {
+        $output .= '
+        <script type="text/javascript">
+            function showMessageWarning(element) {
+                if (confirm("Warning: Displaying the raw message could expose you to security risks like XSS attacks. Do you want to continue?")) {
+                    const encodedMessage = element.getAttribute("data-message");
+
+                    const rawMessageContainer = document.createElement("div");
+                    rawMessageContainer.className = "raw-message-content";
+                    rawMessageContainer.style.border = "1px solid red";
+                    rawMessageContainer.style.padding = "5px";
+                    rawMessageContainer.style.marginTop = "5px";
+
+                    const messageContent = document.createElement("span");
+                    messageContent.innerHTML = atob(encodedMessage);
+                    rawMessageContainer.appendChild(messageContent);
+
+                    const hideLink = document.createElement("a");
+                    hideLink.href = "javascript:void(0);";
+                    hideLink.innerText = "(Hide raw)";
+
+                    const originalContent = element.parentNode.innerHTML;
+
+                    hideLink.onclick = function() {
+                        const newElement = document.createElement("span");
+                        newElement.innerHTML = originalContent;
+                        rawMessageContainer.replaceWith(newElement);
+                    };
+
+                    rawMessageContainer.appendChild(document.createElement("br"));
+                    rawMessageContainer.appendChild(hideLink);
+
+                    element.parentNode.replaceWith(rawMessageContainer);
+                }
+            }
+
+            function runScript(element) {
+                if (confirm("Security Warning: This message contains a script. Running it could expose your system to security risks. Are you sure you want to run this script?")) {
+                    const encodedScript = element.getAttribute("data-script");
+
+                    const scriptContainer = document.createElement("div");
+                    scriptContainer.className = "script-container";
+
+                    const script = document.createElement("script");
+                    script.innerHTML = atob(encodedScript);
+
+                    scriptContainer.appendChild(script);
+                    element.parentNode.replaceWith(scriptContainer);
+                }
+            }
+        </script>';
+        $js_included = true;
+    }
+
+    return $output;
+}
diff --git a/web/apps/apps.inc.php b/web/apps/apps.inc.php
index 039a4d3a..bc88121c 100755
--- a/web/apps/apps.inc.php
+++ b/web/apps/apps.inc.php
@@ -4,5 +4,6 @@
 
 
 global $_config;
+$_config['enable_message_parsing']=false;
 $nodeScore = round($_config['node_score'],2);
 
diff --git a/web/apps/explorer/address.php b/web/apps/explorer/address.php
index 604f11e9..3e9ac14b 100755
--- a/web/apps/explorer/address.php
+++ b/web/apps/explorer/address.php
@@ -153,7 +153,7 @@
                     <td><?php echo $transaction['type_label'] ?></td>
                     <td><?php echo num($transaction['val']) ?></td>
                     <td><?php echo num($transaction['fee']) ?></td>
-                    <td style="word-break: break-all"><?php echo $transaction['message'] ?></td>
+                    <td style="word-break: break-all"><?php echo display_message($transaction['message']) ?></td>
                 </tr>
 			<?php } ?>
             </tbody>
diff --git a/web/apps/explorer/mempool.php b/web/apps/explorer/mempool.php
index d2d0d6dc..0ed45dc3 100755
--- a/web/apps/explorer/mempool.php
+++ b/web/apps/explorer/mempool.php
@@ -47,7 +47,7 @@
 			<td><?php echo $transaction['val'] ?></td>
 			<td><?php echo $transaction['fee'] ?></td>
 			<td><?php echo Transaction::typeLabel($transaction['type']) ?></td>
-			<td style="word-break: break-all"><?php echo $transaction['message'] ?></td>
+			<td style="word-break: break-all"><?php echo display_message($transaction['message']) ?></td>
 		</tr>
 		<?php } ?>
 	</tbody>
diff --git a/web/apps/explorer/tx.php b/web/apps/explorer/tx.php
index 03621298..dacff0af 100755
--- a/web/apps/explorer/tx.php
+++ b/web/apps/explorer/tx.php
@@ -120,7 +120,7 @@
         </tr>
         <tr>
             <td>Message</td>
-            <td><?php echo $tx['message'] ?></td>
+            <td><?php echo display_message($tx['message']) ?></td>
         </tr>
         <tr>
             <td>Public key</td>