diff --git a/src/main/java/de/bixilon/minosoft/data/chat/ChatUtil.kt b/src/main/java/de/bixilon/minosoft/data/chat/ChatUtil.kt
index a333c2bda..9d564cc45 100644
--- a/src/main/java/de/bixilon/minosoft/data/chat/ChatUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/data/chat/ChatUtil.kt
@@ -26,7 +26,7 @@ object ChatUtil {
         val entity = this.world.entities[uuid]
         if (entity == null) {
             val tab = tabList.tabListItemsByUUID[uuid] ?: return UnknownMessageSender(uuid)
-            return TabMessageSender(uuid, tab)
+            return UnspawnedMessageSender(uuid, tab)
         }
         if (entity !is PlayerEntity) {
             return InvalidSender(uuid)
diff --git a/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerEntityMessageSender.kt b/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerEntityMessageSender.kt
index 651618550..843be9d8f 100644
--- a/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerEntityMessageSender.kt
+++ b/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerEntityMessageSender.kt
@@ -14,10 +14,13 @@
 package de.bixilon.minosoft.data.chat.sender
 
 import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity
+import de.bixilon.minosoft.protocol.PlayerPublicKey
 import java.util.*
 
 class PlayerEntityMessageSender(
     uuid: UUID,
     name: String,
     val player: PlayerEntity,
-) : PlayerMessageSender(uuid, name)
+) : PlayerMessageSender(uuid, name) {
+    override val publicKey: PlayerPublicKey? get() = player.tabListItem.publicKey
+}
diff --git a/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerMessageSender.kt b/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerMessageSender.kt
index a3b31b183..280db1efa 100644
--- a/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerMessageSender.kt
+++ b/src/main/java/de/bixilon/minosoft/data/chat/sender/PlayerMessageSender.kt
@@ -13,9 +13,12 @@
 
 package de.bixilon.minosoft.data.chat.sender
 
+import de.bixilon.minosoft.protocol.PlayerPublicKey
 import java.util.*
 
 abstract class PlayerMessageSender(
     override val uuid: UUID,
     val name: String,
-) : MessageSender
+) : MessageSender {
+    abstract val publicKey: PlayerPublicKey?
+}
diff --git a/src/main/java/de/bixilon/minosoft/data/chat/sender/TabMessageSender.kt b/src/main/java/de/bixilon/minosoft/data/chat/sender/UnspawnedMessageSender.kt
similarity index 83%
rename from src/main/java/de/bixilon/minosoft/data/chat/sender/TabMessageSender.kt
rename to src/main/java/de/bixilon/minosoft/data/chat/sender/UnspawnedMessageSender.kt
index e30900321..5246a3c8d 100644
--- a/src/main/java/de/bixilon/minosoft/data/chat/sender/TabMessageSender.kt
+++ b/src/main/java/de/bixilon/minosoft/data/chat/sender/UnspawnedMessageSender.kt
@@ -14,10 +14,12 @@
 package de.bixilon.minosoft.data.chat.sender
 
 import de.bixilon.minosoft.data.entities.entities.player.tab.TabListItem
+import de.bixilon.minosoft.protocol.PlayerPublicKey
 import java.util.*
 
-@Deprecated("Bad name")
-class TabMessageSender(
+class UnspawnedMessageSender(
     uuid: UUID,
     val tab: TabListItem,
-) : PlayerMessageSender(uuid, tab.name)
+) : PlayerMessageSender(uuid, tab.name) {
+    override val publicKey: PlayerPublicKey? get() = tab.publicKey
+}