--- a/net/minecraft/network/chat/PlayerChatMessage.java
+++ b/net/minecraft/network/chat/PlayerChatMessage.java
@@ -18,6 +_,43 @@
 public record PlayerChatMessage(
     SignedMessageLink link, @Nullable MessageSignature signature, SignedMessageBody signedBody, @Nullable Component unsignedContent, FilterMask filterMask
 ) {
+    // Paper start - adventure; support signed messages
+    public final class AdventureView implements net.kyori.adventure.chat.SignedMessage {
+        private AdventureView() {
+        }
+        @Override
+        public Instant timestamp() {
+            return PlayerChatMessage.this.timeStamp();
+        }
+        @Override
+        public long salt() {
+            return PlayerChatMessage.this.salt();
+        }
+        @Override
+        public @Nullable Signature signature() {
+            return PlayerChatMessage.this.signature == null ? null : PlayerChatMessage.this.signature.adventure();
+        }
+        @Override
+        public @Nullable net.kyori.adventure.text.Component unsignedContent() {
+            return PlayerChatMessage.this.unsignedContent() == null ? null : io.papermc.paper.adventure.PaperAdventure.asAdventure(PlayerChatMessage.this.unsignedContent());
+        }
+        @Override
+        public String message() {
+            return PlayerChatMessage.this.signedContent();
+        }
+        @Override
+        public net.kyori.adventure.identity.Identity identity() {
+            return net.kyori.adventure.identity.Identity.identity(PlayerChatMessage.this.sender());
+        }
+        public PlayerChatMessage playerChatMessage() {
+            return PlayerChatMessage.this;
+        }
+    }
+    public AdventureView adventureView() {
+        return new AdventureView();
+    }
+    // Paper end - adventure; support signed messages
+
     public static final MapCodec<PlayerChatMessage> MAP_CODEC = RecordCodecBuilder.mapCodec(
         instance -> instance.group(
                 SignedMessageLink.CODEC.fieldOf("link").forGetter(PlayerChatMessage::link),
@@ -48,7 +_,14 @@
     }
 
     public PlayerChatMessage withUnsignedContent(Component message) {
-        Component component = !message.equals(Component.literal(this.signedContent())) ? message : null;
+        // Paper start - adventure
+        final Component component;
+        if (message instanceof io.papermc.paper.adventure.AdventureComponent advComponent) {
+            component = this.signedContent().equals(io.papermc.paper.adventure.AdventureCodecs.tryCollapseToString(advComponent.adventure$component())) ? null : message;
+        } else {
+            component = !message.equals(Component.literal(this.signedContent())) ? message : null;
+        }
+        // Paper end - adventure
         return new PlayerChatMessage(this.link, this.signature, this.signedBody, component, this.filterMask);
     }
 
