diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 23fd456d..0ec67a1a 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/osichat/templates/conversation.html b/osinaweb/osichat/templates/conversation.html
index 8318d8eb..e0901212 100644
--- a/osinaweb/osichat/templates/conversation.html
+++ b/osinaweb/osichat/templates/conversation.html
@@ -52,8 +52,7 @@
             </div>
             <div
                 class="w-full bg-gray-50 px-3 py-2 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-7 bg-opacity-50 shadow-md border border-gray-100">
-                <p>Hello {{chat_room.chatroomguest.name}}, the support department is notified about your request
-                    to start a conversation. It usually takes few minutes for you to receieve a reply.</p>
+                <p>Hello {{chat_room.chatroomguest.name}}, thank you for contacting us. Please bear with us while we connect you with the next available agent as soon as possible.</p>
             </div>
         </div>
 
diff --git a/osinaweb/osichat/templates/partials/message.html b/osinaweb/osichat/templates/partials/message.html
index 146877a4..184d7504 100644
--- a/osinaweb/osichat/templates/partials/message.html
+++ b/osinaweb/osichat/templates/partials/message.html
@@ -12,13 +12,13 @@
         </div>
     </div>
     <div
-        class="w-full bg-gray-50 px-3 py-2 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
+        class="w-fit bg-gray-50 px-3 py-2 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
         <p class="break-all">{{chat_message.content}}</p>
     </div>
 </div>
 {% else %}
 <div
-    class="w-fit px-3 py-2 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue fade-in-up">
+    class="w-fit px-3 py-2 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue fade-in-up self-start">
     <p class="break-all">{{chat_message.content}}</p>
 </div>
 {% endif %}