diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
index fbc0739b..8907cb78 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
@@ -75,7 +75,6 @@
       }
     }
     .room-option {
-      width: 100%;
       margin-left: auto;
     }
   }
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss
index 0980d504..166e8c59 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss
@@ -1,4 +1,9 @@
 .bubble-main {
   padding: 14px;
   text-align:left;
+  span{
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: keep-all;
+  }
 }
\ No newline at end of file
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
index d3bd0594..a221b900 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
@@ -185,6 +185,7 @@ $meBox-bg: #ffffff;
   .message-main {
     margin-left: 20px;
     margin-right: 10px;
+    max-width: 80%;
     .chat-name {
       font-size: 12px;
       color: #333333;
@@ -282,3 +283,8 @@ $meBox-bg: #ffffff;
     }
   }
 }
+.bubble-main{
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: keep-all;
+}