diff --git a/packages/presentation/src/components/NavLink.svelte b/packages/presentation/src/components/NavLink.svelte
index 757f32b388..28632f6210 100644
--- a/packages/presentation/src/components/NavLink.svelte
+++ b/packages/presentation/src/components/NavLink.svelte
@@ -60,7 +60,7 @@
     class:colorInherit
     class:fs-bold={accent}
     style:flex-shrink={shrink}
-    on:click={clickHandler}
+    on:click|stopPropagation={clickHandler}
   >
     <slot />
   </span>
@@ -73,7 +73,7 @@
     class:colorInherit
     class:fs-bold={accent}
     style:flex-shrink={shrink}
-    on:click={clickHandler}
+    on:click|stopPropagation={clickHandler}
   >
     <slot />
   </a>
diff --git a/packages/presentation/src/components/message/Nodes.svelte b/packages/presentation/src/components/message/Nodes.svelte
index 5e0fc35761..262eef4e2f 100644
--- a/packages/presentation/src/components/message/Nodes.svelte
+++ b/packages/presentation/src/components/message/Nodes.svelte
@@ -64,6 +64,8 @@
       <em><svelte:self nodes={node.childNodes} /></em>
     {:else if node.nodeName === 'STRONG' || node.nodeName === 'B'}
       <strong><svelte:self nodes={node.childNodes} /></strong>
+    {:else if node.nodeName === 'U'}
+      <u><svelte:self nodes={node.childNodes} /></u>
     {:else if node.nodeName === 'P'}
       {#if node.childNodes.length > 0}
         <p class="p-inline contrast">