diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 5f550ed0d9c1ea886b07bed23ef30c048ea70939..5946a6a895b82866ace10496c64875e0a633f072 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -126,7 +126,7 @@
             overflow: hidden;
             text-overflow: ellipsis;
             vertical-align: middle;
-            width: 122px;
+            width: 140px;
         }
 
         .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_action_author {
@@ -187,9 +187,7 @@
         /* followers */
 
         .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_followers {
-            float: right;
             margin-right: 15px; 
-            margin-top: 3px;
             color: #337ab7;
         }
 
@@ -209,24 +207,14 @@
         /* icons */
 
         .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_msg_icons {
-            margin-top: -7px;
-            height: 8px;
             -webkit-user-select: none;
                -moz-user-select: none;
                 -ms-user-select: none;
                     user-select: none;
         }
 
-        .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_msg_icons .oe_read,
-        .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_msg_icons .oe_unread {
-            margin-top: 7px;
+        .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_msg_icons .oe_read {
             margin-right: 5px;
-            float: left;
-        }
-
-        .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_msg_icons .oe_reply {
-            margin-top: 3px;
-            float: right;
         }
 
         .openerp .o_timeline .o_timeline_thread_parent .o_timeline_parent_message .o_timeline_msg_icons i {
diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml
index f7fa106062752433987a4351600ffbde6fb12c32..ded2ba5e0f5d944389d1895e388f6618db0142e8 100644
--- a/addons/mail/views/mail_message_views.xml
+++ b/addons/mail/views/mail_message_views.xml
@@ -334,9 +334,9 @@
 
                                     <div class="o_timeline_parent_message">
 
-                                        <div class="o_timeline_msg_icons" t-if="!options.readonly"> <!-- *** read *** -->
+                                        <span class="o_timeline_msg_icons" t-if="!options.readonly"> <!-- *** read *** -->
                                             <i t-if="options.show_read_unread_button" title="Done" class="oe_read fa fa-check"/>
-                                        </div> <!-- *** read *** -->
+                                        </span> <!-- *** read *** -->
 
                                         <span t-attf-class="o_timeline_parent_subject #{widget.model and widget.res_id 
                                                             and options.show_link ? 'o_timeline_small_subject' : ''}"> <!-- *** subject *** -->
@@ -387,14 +387,14 @@
                                             </a>
                                         </span> <!-- *** author *** -->
 
-                                        <span class="o_timeline_msg_icons" t-if="!options.readonly"> <!-- *** repy *** -->
-                                            <i t-if="options.show_reply_button" title="Reply" class="oe_reply fa fa-reply"/>
-                                        </span> <!-- *** reply *** -->
-
                                         <span class="o_timeline_parent_followers" t-if="widget.nb_followers > 0"> <!-- *** followers *** -->
                                             <span title="Number of followers"> <t t-raw="widget.nb_followers"/> </span>
                                             <i class="oe_follwrs fa fa-users"></i>
                                         </span> <!-- *** followers *** -->
+
+                                        <span class="o_timeline_msg_icons" t-if="!options.readonly"> <!-- *** repy *** -->
+                                            <i t-if="options.show_reply_button" title="Reply" class="oe_reply fa fa-reply"/>
+                                        </span> <!-- *** reply *** -->
                                     </div>
                                 </t>
                             </div>