diff --git a/.gitignore b/.gitignore
index ee44a9639..d7926118d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .idea
 target
+node_modules
+.nuxt
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 000000000..c1dd12f17
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000..015dfe682
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/src/frontend/components/room/ChatContent.vue b/src/frontend/components/room/ChatContent.vue
index 6eaae3a6b..2a854c540 100644
--- a/src/frontend/components/room/ChatContent.vue
+++ b/src/frontend/components/room/ChatContent.vue
@@ -16,7 +16,7 @@
           </v-list-item-avatar>
           <v-list-item-content>
             <v-list-item-title v-text="message.userName"></v-list-item-title>
-            <v-list-item-subtitle v-html="marked(message.message)"></v-list-item-subtitle>
+            <v-list-item-subtitle class="message" v-html="marked(message.message)"></v-list-item-subtitle>
           </v-list-item-content>
         </template>
         <template v-else>
@@ -53,4 +53,8 @@ export default {
 </script>
 
 <style scoped>
+.message {
+  inline-size: 500px;
+  overflow-wrap: break-word;
+}
 </style>
diff --git a/src/frontend/components/room/ChatMessageSender.vue b/src/frontend/components/room/ChatMessageSender.vue
index 06926119d..24e4be21c 100644
--- a/src/frontend/components/room/ChatMessageSender.vue
+++ b/src/frontend/components/room/ChatMessageSender.vue
@@ -6,7 +6,7 @@
   >
     <form @submit.prevent="sendMessage">
       <v-text-field
-        counter="500"
+        :counter="maxMessageLength"
         :rules="rules"
         label="Type a message"
         type="text"
@@ -31,7 +31,8 @@ export default {
   data() {
     return {
       message: "",
-      rules: [v => v.length <= 500 || 'Max 500 characters']
+      maxMessageLength: 500,
+      rules: [v => v.length <= this.maxMessageLength || 'Max 500 characters']
     };
   },
   computed: {
@@ -41,9 +42,12 @@ export default {
   },
   methods: {
     sendMessage() {
+      if (this.message.length > this.maxMessageLength) {
+        return;
+      };
       const newMessage = {
         type: "MESSAGE",
-        message: (this.message.length > 500) ? this.message.substring(0,500) : this.message
+        message: this.message
       };
       const messageWithRoomId = { roomId: this.roomId, message: newMessage };
       this.$store.dispatch("main/sendMessage", messageWithRoomId);
diff --git a/src/main/java/io/snyk/snyklabs/chat/controller/ChatController.java b/src/main/java/io/snyk/snyklabs/chat/controller/ChatController.java
index 976bfe286..879f1e1d6 100644
--- a/src/main/java/io/snyk/snyklabs/chat/controller/ChatController.java
+++ b/src/main/java/io/snyk/snyklabs/chat/controller/ChatController.java
@@ -37,6 +37,8 @@ public class ChatController {
     private final RoomService roomService;
     private final SimpMessageSendingOperations messagingTemplate;
 
+    private final int MAX_MESSAGE_LENGTH = 500;
+
     public ChatController(RoomService roomService, SimpMessageSendingOperations messagingTemplate) {
         this.roomService = roomService;
         this.messagingTemplate = messagingTemplate;
@@ -88,6 +90,9 @@ public ChatRoomUserListDto userLeaveRoom(UserRoomKeyDto userRoomKey, SimpMessage
 
     @MessageMapping("chat/{roomId}/sendMessage")
     public Message sendMessage(@DestinationVariable String roomId, Message message) {
+        if (message.message.length() > MAX_MESSAGE_LENGTH) {
+            message = new Message(message.type, message.userName, message.message.substring(0,MAX_MESSAGE_LENGTH));
+        }
         messagingTemplate.convertAndSend(format("/chat/%s/messages", roomId), message);
         return message;
     }