diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index ca6f1f3e70a..4ba5deba040 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -160,7 +160,13 @@
     clear: both; 
 }
 
-.openerp .notification, .openerp .comment.openerp .notification, .openerp .email {
+.openerp li.oe_mail_thread_msg > div:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
+.openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -169,19 +175,19 @@
     border-radius: 4px;
 }
 
-.openerp li.oe_mail_thread_msg > .comment {
+.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment {
     background: #eee;
 }
 
-.openerp div.oe_mail_thread_subthread .comment {
+.openerp div.oe_mail_thread_subthread .oe_mail_msg_comment {
     background: white;
 }
 
-.openerp .notification {
+.openerp .oe_mail_msg_notification {
     background: #eee;
 }
 
-.openerp .notification:after, .openerp .comment:after, .openerp .email:after {
+.openerp .oe_mail_msg_notification:after, .openerp .oe_mail_msg_comment:after, .openerp .oe_mail_msg_email:after {
     content: "";
     display: block;
     clear: both; 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6505b2cd88b..f034b04311d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <ul t-name="Thread" class="oe_mail_thread oe_mail">
+    <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
@@ -56,8 +56,8 @@
         </div>
     </ul>
 
-    <li t-name="ThreadMsg" t-attf-class="oe_mail_thread_msg oe_mail">
-        <div t-attf-class="{record.type}">
+    <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
+        <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>