diff --git a/src/app/components/ChannelMessage.svelte b/src/app/components/ChannelMessage.svelte
index 5ede62f..3ae2093 100644
--- a/src/app/components/ChannelMessage.svelte
+++ b/src/app/components/ChannelMessage.svelte
@@ -104,21 +104,20 @@
           <span class="text-xs opacity-50">{formatTimestampAsTime(event.created_at)}</span>
         </div>
       {/if}
-      <div class="text-sm col-1">
+      <div class="text-sm">
         <Content {event} />
         {#if isPending}
-          <div class="flex gap-1 justify-end items-center" transition:slideAndFade>
-            <span class="loading loading-spinner mx-1 h-3 w-3" />
+          <span class="flex-inline ml-1 gap-1">
+            <span class="loading loading-spinner mx-1 h-3 w-3 translate-y-px" />
             <span class="opacity-50">Sending...</span>
-          </div>
+          </span>
         {:else if failure}
-          <div
-            class="flex tooltip cursor-pointer gap-1 justify-end items-center"
-            data-tip="{failure.message} ({displayRelayUrl(failure.url)})"
-            transition:slideAndFade>
-            <Icon icon="danger" size={3} />
+          <span
+            class="flex-inline tooltip ml-1 cursor-pointer gap-1"
+            data-tip="{failure.message} ({displayRelayUrl(failure.url)})">
+            <Icon icon="danger" class="translate-y-px" size={3} />
             <span class="opacity-50">Failed to send!</span>
-          </div>
+          </span>
         {/if}
       </div>
     </div>
diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte
index 67fecc9..c394df2 100644
--- a/src/app/components/ChatMessage.svelte
+++ b/src/app/components/ChatMessage.svelte
@@ -2,7 +2,7 @@
   import {derived} from "svelte/store"
   import {hash, uniqBy, groupBy, now} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {deriveEvents} from "@welshman/store"
+  import {deriveEvents, throttled} from "@welshman/store"
   import {PublishStatus} from "@welshman/net"
   import {
     publishStatusData,
@@ -33,7 +33,7 @@
   const reactions = deriveEvents(repository, {filters: [{kinds: [REACTION], "#e": [event.id]}]})
   const zaps = deriveEvents(repository, {filters: [{kinds: [ZAP_RESPONSE], "#e": [event.id]}]})
   const [_, colorValue] = colors[parseInt(hash(event.pubkey)) % colors.length]
-  const ps = derived(publishStatusData, $m => Object.values($m[event.id] || {}))
+  const ps = throttled(300, derived(publishStatusData, $m => Object.values($m[event.wrap!.id] || {})))
 
   const showProfile = () => pushDrawer(ProfileDetail, {pubkey: event.pubkey})
 
@@ -58,7 +58,7 @@
   class:chat-start={event.pubkey !== $pubkey}
   class:chat-end={event.pubkey === $pubkey}>
   <div class="chat-bubble mx-1 max-w-sm">
-    <div class="flex items-start gap-2">
+    <div class="flex items-start gap-2 w-full">
       {#if showPubkey}
         <Button on:click={showProfile}>
           <Avatar
@@ -115,7 +115,7 @@
       </div>
     {/if}
     <Button
-      class="join absolute -top-2 right-0 border border-solid border-neutral text-xs opacity-0 transition-all group-hover:opacity-100">
+      class="join absolute -bottom-5 right-0 border border-solid border-neutral text-xs">
       <ChatMessageEmojiButton {event} {pubkeys} />
       <div class="btn join-item btn-xs">
         <Icon icon="menu-dots" size={4} />