diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index b539e11a2b02..f1fef07f00fc 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -533,7 +533,7 @@
 
   .send-message {
     display: block;
-    width: calc(100% - 2 * #{$button-width} - 20px);
+    width: calc(100% - #{$button-width});
     min-height: $header-height - 1px;
     max-height: 100px;
     padding: 10px;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 5adb8dfc7453..8bdf772fd2ac 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -972,7 +972,7 @@ input.search {
     height: 100%; }
   .bottom-bar .send-message {
     display: block;
-    width: calc(100% - 2 * 36px - 20px);
+    width: calc(100% - 36px);
     min-height: 35px;
     max-height: 100px;
     padding: 10px;