diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index cddcb3eb9e1..0dc41db8f0d 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -134,7 +134,7 @@ function strip_html (node, transform_children) {
 function inline (node, transform_children) {
     if (node.nodeType === 3) return node.data;
     if (node.tagName === "BR") return " ";
-    if (node.tagName.match(/^(A|P|DIV|PRE)$/)) return transform_children();
+    if (node.tagName.match(/^(A|P|DIV|PRE|BLOCKQUOTE)$/)) return transform_children();
     node.innerHTML = transform_children();
     return node.outerHTML;
 }
diff --git a/addons/mail/static/src/less/chat_window.less b/addons/mail/static/src/less/chat_window.less
index d525c1d9ddc..3d61cb0cc19 100644
--- a/addons/mail/static/src/less/chat_window.less
+++ b/addons/mail/static/src/less/chat_window.less
@@ -13,7 +13,7 @@
     background-color: @o-chat-window-bg;
     border: 1px solid gray;
     border-radius: 3px;
-    z-index: 2;
+    z-index: 3;
 
     @media (max-width: @screen-xs-max) {
         width: 100%;
diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less
index 7da1a13802e..f737999bfe6 100644
--- a/addons/mail/static/src/less/thread.less
+++ b/addons/mail/static/src/less/thread.less
@@ -161,4 +161,8 @@
         margin-bottom: 20px;
         font-size: 20px;
     }
+
+    .o_mail_no_content {
+        .o-webclient-padding();
+    }
 }
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 6ed0700be11..5c0c958bb69 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -12,14 +12,14 @@
         <t t-if="options.display_empty_channel">
             <t t-call="mail.EmptyChannel" />
         </t>
-        <t t-if="options.display_no_match">
+        <div t-if="options.display_no_match" class="o_mail_no_content">
             <div class="o_thread_title">No matches found</div>
             <div>No message matches your search. Try to change your search filters.</div>
-        </t>
+        </div>
     </t>
 
     <!-- When a channel is empty-->
-    <div t-name="mail.EmptyChannel">
+    <div t-name="mail.EmptyChannel" class="o_mail_no_content">
         <t t-if="options.channel_id==='channel_inbox'">
             <div class="o_thread_title">Congratulations, your inbox is empty</div>
             <div>New messages appear here.</div>
@@ -100,12 +100,12 @@
                         <i t-if="options.display_stars &amp;&amp; !message.is_system_notification"
                             t-att-class="'fa fa-lg o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')"
                             t-att-data-message-id="message.id" title="Mark as Todo"/>
-                        <i t-if="message.is_needaction &amp;&amp; options.display_needactions"
-                           class="fa fa-check o_thread_message_needaction"
-                           t-att-data-message-id="message.id" title="Mark as Read"/>
                        <i t-if="message.record_name &amp;&amp; message.model != 'mail.channel' &amp;&amp; options.display_reply_icon"
                            class="fa fa-reply o_thread_message_reply"
                            t-att-data-message-id="message.id" title="Reply"/>
+                        <i t-if="message.is_needaction &amp;&amp; options.display_needactions"
+                           class="fa fa-check o_thread_message_needaction"
+                           t-att-data-message-id="message.id" title="Mark as Read"/>
                     </span>
                 </p>
                 <t t-if="message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0">