diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
index d1c03ab8d..9621b7733 100644
--- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -503,6 +503,27 @@ public class FMLClientHandler implements IFMLSidedHandler
         return false;
     }
 
+    /**
+     * Called when a chat packet is received
+     *
+     * @param chat
+     * @param player
+     * @return true if you want the packet to stop processing and not echo to
+     *         the rest of the world
+     */
+    public boolean handleChatPacket(Packet3Chat chat, EntityPlayer player)
+    {
+        for (ModContainer mod : Loader.getModList())
+        {
+            if (mod.wantsNetworkPackets() && mod.getNetworkHandler().onChat(chat, player))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public void handleServerLogin(Packet1Login loginPacket, NetClientHandler handler, NetworkManager networkManager)
     {
         this.networkClient=handler;
diff --git a/fml/patches/minecraft/net/minecraft/src/NetServerHandler.java.patch b/fml/patches/minecraft/net/minecraft/src/NetServerHandler.java.patch
index f68b096f7..6acb74e16 100644
--- a/fml/patches/minecraft/net/minecraft/src/NetServerHandler.java.patch
+++ b/fml/patches/minecraft/net/minecraft/src/NetServerHandler.java.patch
@@ -1,18 +1,27 @@
 --- ../src-base/minecraft/net/minecraft/src/NetServerHandler.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src-work/minecraft/net/minecraft/src/NetServerHandler.java	0000-00-00 00:00:00.000000000 -0000
-@@ -601,7 +601,10 @@
+@@ -8,6 +8,8 @@
+ import java.util.Random;
+ import java.util.logging.Logger;
+ 
++import cpw.mods.fml.client.FMLClientHandler;
++
+ public class NetServerHandler extends NetHandler
+ {
+     public static Logger field_56728_a = Logger.getLogger("Minecraft");
+@@ -601,7 +603,10 @@
                      }
                  }
  
 -                if (var2.startsWith("/"))
-+                if (FMLServerHandler.instance().handleChatPacket(p_23_1_,field_16_e)) {
++                if (FMLClientHandler.instance().handleChatPacket(p_4113_1_,field_56725_e)) {
 +                    // We handled it
 +                }
 +                    else                if (var2.startsWith("/"))
                  {
                      this.func_56721_b(var2);
                  }
-@@ -1013,4 +1016,11 @@
+@@ -1013,4 +1018,11 @@
              }
          }
      }