diff --git a/css/converse.css b/css/converse.css
index b5af26f76..c075d602f 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -1073,12 +1073,12 @@
     padding: 0;
     position: relative;
     width: 200px;
-    height: 84px; }
+    height: 82px; }
     #conversejs form.sendXMPPMessage .chat-textarea {
       border-bottom-left-radius: 4px;
       border-bottom-right-radius: 4px;
       border: 0;
-      height: 64px;
+      height: 62px;
       padding: 0.5em;
       width: 100%;
       resize: none; }
diff --git a/sass/converse.scss b/sass/converse.scss
index 175e73a91..47a5f3ffc 100644
--- a/sass/converse.scss
+++ b/sass/converse.scss
@@ -419,7 +419,7 @@
     background-color: #ffffff;
     line-height: 1.3em;
     height: 206px;
-    height: calc(100% - #{$toolbar-height + $chat-textarea-height});
+    height: calc(100% - #{$toolbar-height + $chat-textarea-height + 2});
   }
 
   .chat-info {
diff --git a/sass/variables.scss b/sass/variables.scss
index 3d74bdc1a..4f78eea54 100644
--- a/sass/variables.scss
+++ b/sass/variables.scss
@@ -16,7 +16,7 @@
   $chat-head-inverse-text-color: white;
   $chat-head-height: 44px;
   $save-button-color: #436F64;
-  $chat-textarea-height: 64px;
+  $chat-textarea-height: 62px;
   $toolbar-height: 20px;
   $message-them-color: #4B7003;
   $roster-height: 194px;