diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
index 18cd21e75..d59672dc8 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
@@ -4,25 +4,25 @@
 
 {% for chat_message in conversation.recent_messages %}
   <div>
-    {% if chat_message.sender == user.available_name %}
-      <h4 style="margin: 0;">You</h4>
-    {% else %}
-      <h4 style="margin: 0;">{{chat_message.sender}}</h4>
-    {% endif %}
+    <h4 style="margin: 0;">
+      {% if chat_message.sender == user.available_name %}
+        You
+      {% else %}
+        {{chat_message.sender}}
+      {% endif %}
+    </h4>
   </div>
 
-  <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
-      {% if chat_message.content %}
-        {{chat_message.content}}
-      {% endif %}
+  <div style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    {% if chat_message.content %}
+      {{chat_message.content}}
+    {% endif %}
 
-      {% if chat_message.attachments %}
-        {% for attachment in chat_message.attachments %}
-          Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
-        {% endfor %}
-      {% endif %}
-    </p>
+    {% if chat_message.attachments %}
+      {% for attachment in chat_message.attachments %}
+        Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
+      {% endfor %}
+    {% endif %}
   </div>
 {% endfor %}
 
diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
index d7dac7cca..e2d952777 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
@@ -7,24 +7,24 @@
 
 {% for chat_message in conversation.recent_messages %}
   <div>
-    {% if chat_message.sender == user.available_name %}
-      <h4 style="margin: 0;">You</h4>
-    {% else %}
-      <h4 style="margin: 0;">{{chat_message.sender}}</h4>
+    <h4 style="margin: 0;">
+      {% if chat_message.sender == user.available_name %}
+        You
+      {% else %}
+        {{chat_message.sender}}
+      {% endif %}
+    </h4>
+  </div>
+
+  <div style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    {% if chat_message.content %}
+      {{chat_message.content}}
+    {% endif %}
+
+    {% if chat_message.attachments %}
+      {% for attachment in chat_message.attachments %}
+        Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
+      {% endfor %}
     {% endif %}
   </div>
-
-  <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
-      {% if chat_message.content %}
-        {{chat_message.content}}
-      {% endif %}
-
-      {% if chat_message.attachments %}
-        {% for attachment in chat_message.attachments %}
-          Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
-        {% endfor %}
-      {% endif %}
-    </p>
-  </div>
 {% endfor %}
diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid
index 00cb13e1e..193c0c015 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid
@@ -8,25 +8,25 @@
 <p><b>Previous messages:</b></p>
 {% for chat_message in conversation.recent_messages %}
   <div>
-    {% if chat_message.sender == user.available_name %}
-      <h4 style="margin: 0;">You</h4>
-    {% else %}
-      <h4 style="margin: 0;">{{chat_message.sender}}</h4>
-    {% endif %}
+    <h4 style="margin: 0;">
+      {% if chat_message.sender == user.available_name %}
+        You
+      {% else %}
+        {{chat_message.sender}}
+      {% endif %}
+    </h4>
   </div>
 
-  <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; text-align: start; unicode-bidi: plaintext;">
-      {% if chat_message.content %}
-        {{chat_message.content}}
-      {% endif %}
+  <div style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    {% if chat_message.content %}
+      {{chat_message.content}}
+    {% endif %}
 
-      {% if chat_message.attachments %}
-        {% for attachment in chat_message.attachments %}
-          Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
-        {% endfor %}
-      {% endif %}
-    </p>
+    {% if chat_message.attachments %}
+      {% for attachment in chat_message.attachments %}
+        Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
+      {% endfor %}
+    {% endif %}
   </div>
 {% endfor %}
 <p>