diff --git a/dependencies/astron/dclass/stride.dc b/dependencies/astron/dclass/stride.dc
index 084814b2..e26ff2bc 100644
--- a/dependencies/astron/dclass/stride.dc
+++ b/dependencies/astron/dclass/stride.dc
@@ -165,7 +165,6 @@ dclass MagicWordManager : DistributedObject {
 
 dclass ChatAgent : DistributedObject {
   chatMessage(string(0-256) message, uint8 chatMode) clsend;
-  whisperMessage(uint32 receiverAvId, string(0-256) message) clsend;
 };
 
 dclass FriendManager : DistributedObject {
diff --git a/otp/avatar/DistributedPlayer.py b/otp/avatar/DistributedPlayer.py
index 3a79bbd8..ddb89c66 100755
--- a/otp/avatar/DistributedPlayer.py
+++ b/otp/avatar/DistributedPlayer.py
@@ -189,6 +189,8 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
             return
         if base.localAvatar.isIgnored(avId):
             return
+        if base.whiteList:
+            chat = base.whiteList.processThroughAll(chat, self.chatGarbler)
         self.displayTalkWhisper(avId, chat)
 
     def displayTalk(self, chat):
diff --git a/otp/chat/ChatAgent.py b/otp/chat/ChatAgent.py
index 15a277a5..3e22ae14 100755
--- a/otp/chat/ChatAgent.py
+++ b/otp/chat/ChatAgent.py
@@ -25,11 +25,6 @@ class ChatAgent(DistributedObjectGlobal):
             return
         self.sendUpdate('chatMessage', [message, self.chatMode])
 
-    def sendWhisperMessage(self, receiverAvId, message):
-        if not self.verifyMessage(message):
-            return
-        self.sendUpdate('whisperMessage', [receiverAvId, message])
-
 @magicWord(category=CATEGORY_MODERATOR, types=[int])
 def chatmode(mode=-1):
     """ Set the chat mode of the current avatar. """
diff --git a/otp/chat/ChatAgentUD.py b/otp/chat/ChatAgentUD.py
index d0f6cac1..dcfad7e2 100755
--- a/otp/chat/ChatAgentUD.py
+++ b/otp/chat/ChatAgentUD.py
@@ -37,18 +37,4 @@ class ChatAgentUD(DistributedObjectGlobalUD):
 
         DistributedAvatar = self.air.dclassesByName['DistributedAvatarUD']
         dg = DistributedAvatar.aiFormatUpdate('setTalk', sender, self.chatMode2channel.get(chatMode, sender), self.air.ourChannel, [message])
-        self.air.send(dg)
-
-    def whisperMessage(self, receiverAvId, message):
-        sender = self.air.getAvatarIdFromSender()
-
-        if sender == 0:
-            self.air.writeServerEvent('suspicious', accId=self.air.getAccountIdFromSender(),
-                                      issue='Account sent chat without an avatar', message=message)
-            return
-
-        self.air.writeServerEvent('whisper-said', avId=sender, reciever=receiverAvId, msg=message)
-
-        DistributedAvatar = self.air.dclassesByName['DistributedAvatarUD']
-        dg = DistributedAvatar.aiFormatUpdate('setTalkWhisper', receiverAvId, receiverAvId, self.air.ourChannel, [sender, message])
         self.air.send(dg)
\ No newline at end of file