diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java
index 27fbec4b..6e2d3a13 100644
--- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java
+++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java
@@ -48,12 +48,24 @@ public class RoomChatMessage implements Runnable, ISerialize, DatabaseLoggable {
         } else {
             this.message = message.packet.readString();
         }
+
+        this.habbo = message.client.getHabbo();
+        this.roomUnitId = this.habbo.getRoomUnit().getId();
+
+        RoomChatMessageBubbles userBubble = this.habbo.getHabboStats().chatColor;
+
+        int bubbleId = message.packet.readInt();
+
         try {
-            this.bubble = RoomChatMessageBubbles.getBubble(message.packet.readInt());
+            this.bubble = RoomChatMessageBubbles.getBubble(bubbleId);
         } catch (Exception e) {
             this.bubble = RoomChatMessageBubbles.NORMAL;
         }
 
+        if (userBubble != null && this.bubble.isOverridable()) {
+            this.bubble = userBubble;
+        }
+
         this.RoomChatColour = message.packet.readString();
 
         if (!message.client.getHabbo().hasPermission(Permission.ACC_ANYCHATCOLOR)) {
@@ -65,13 +77,9 @@ public class RoomChatMessage implements Runnable, ISerialize, DatabaseLoggable {
             }
         }
 
-        this.habbo = message.client.getHabbo();
-        this.roomUnitId = this.habbo.getRoomUnit().getId();
         this.unfilteredMessage = this.message;
         this.timestamp = Emulator.getIntUnixTimestamp();
-
         this.checkEmotion();
-
         this.filter();
     }
 
diff --git a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar
index 2648e66e..57727823 100644
Binary files a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar differ