diff --git a/src/main/java/net/minecraftforge/client/event/ClientChatEvent.java b/src/main/java/net/minecraftforge/client/event/ClientChatEvent.java
index 2104f29948..51fbdfe257 100644
--- a/src/main/java/net/minecraftforge/client/event/ClientChatEvent.java
+++ b/src/main/java/net/minecraftforge/client/event/ClientChatEvent.java
@@ -24,36 +24,37 @@ import org.jetbrains.annotations.ApiStatus;
 @Cancelable
 public class ClientChatEvent extends Event
 {
-    // private String message;
+    private String message;
     private final String originalMessage;
 
     @ApiStatus.Internal
     public ClientChatEvent(String message)
     {
-        // this.setMessage(message);
+        this.setMessage(message);
         this.originalMessage = Strings.nullToEmpty(message);
+        this.message = this.originalMessage;
     }
 
     /**
-     * {@return the message that will be sent to the server, if the event is not cancelled}
+     * {@return the message that will be sent to the server, if the event is not cancelled. This can be changed by mods}
      */
     public String getMessage()
     {
-        return this.originalMessage;
+        return this.message;
     }
 
-    // /**
-    //  * Sets the new message to be sent to the server, if the event is not cancelled.
-    //  *
-    //  * @param message the new message to be sent
-    //  */
-    // public void setMessage(String message)
-    // {
-    //     this.message = Strings.nullToEmpty(message);
-    // }
+    /**
+     * Sets the new message to be sent to the server, if the event is not cancelled.
+     *
+     * @param message the new message to be sent
+     */
+    public void setMessage(String message)
+    {
+        this.message = Strings.nullToEmpty(message);
+    }
 
     /**
-     * {@return the original message that was to be sent to the server}
+     * {@return the original message that was to be sent to the server. This cannot be changed by mods}
      */
     public String getOriginalMessage()
     {
diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java
index 1fddfbdc81..49f8a1b378 100644
--- a/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java
+++ b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java
@@ -18,7 +18,7 @@ public class ClientChatEventTest
     {
         if (event.getMessage().equals("Cancel"))
             event.setCanceled(true);
-        // else if (event.getMessage().equals("Replace this text"))
-        //     event.setMessage("Text replaced.");
+        else if (event.getMessage().equals("Replace this text"))
+            event.setMessage("Text replaced.");
     }
 }