diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less
index 976473f6e1e..2836e3c93bb 100644
--- a/addons/mail/static/src/less/composer.less
+++ b/addons/mail/static/src/less/composer.less
@@ -2,7 +2,6 @@
     position: relative;
     .o-flex(0, 0, auto);
     .o-flex-display();
-    margin: 1px 0;
     border-top: none;
     background: @gray-lighter;
 
@@ -37,10 +36,12 @@
             cursor: text;
             display: inline-block;
             height: 100%;
-            padding: 0px 0px @o-mail-chatter-gap;
             white-space: pre-wrap;
             word-break: break-all;
         }
+        .o_composer_text_field {
+            padding: 0 0 @o-mail-chatter-gap;
+        }
         .o_composer_mention_dropdown .o_mention_proposition > a {
             .o-text-overflow();
             width: 100%;
@@ -147,7 +148,6 @@
             .o_composer {
                 display: flex;
                 min-height: 40px;
-                padding: @o-mail-chatter-gap @o-mail-chatter-gap 0 @o-mail-chatter-gap;
                 border-radius: 2px 0 0 2px;
                 border-right-width: 0;
             }
@@ -159,6 +159,7 @@
                 .o-flex-flow(row, wrap);
             }
             .o_composer_text_field {
+                padding: @o-mail-chatter-gap;
                 .o-flex(1, 1, 50%);
             }
             .o_chatter_composer_tools {
@@ -171,8 +172,8 @@
             .o_chatter_composer_tools {
                 border: none;
                 border-left: 1px solid @gray-lighter-dark;
+                padding-top: @o-mail-chatter-gap*0.5;
                 padding-left: @o-mail-chatter-gap*0.5;
-                .o-transform(translateY(-@o-mail-chatter-gap*0.5));
             }
 
             .o_composer_button_send {
@@ -196,6 +197,7 @@
             border-bottom-width: 1px;
         }
         .o_composer_input {
+            padding: @o-mail-chatter-gap;
             .o-flex-flow(row, nowrap);
 
             .o_chatter_composer_tools {