diff --git a/background.html b/background.html
index 2d644bc7a..81c30721b 100644
--- a/background.html
+++ b/background.html
@@ -109,7 +109,9 @@
                 <form class='send clearfix file-input'>
                   <div class='flex'>
                     <button class='emoji' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
-                    <textarea maxlength='2000' class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea>
+                    <div class='send-message-container'>
+                      <textarea maxlength='2000' class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea>
+                    </div>
                     <div class='capture-audio'>
                         <button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
                     </div>
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index c153a19d7..891303e0c 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -1201,16 +1201,29 @@ label {
   }
 }
 
-.bottom-bar textarea.send-message {
-  height: 60px;
-  background-color: $session-shade-4;
-  border: none;
-  margin: 0px;
-  padding: 0px $session-margin-lg;
-  font-size: $session-font-md;
-  line-height: 60px;
+.bottom-bar {
+  .compose {
+    min-height: 60px;
+    max-height: 200px;
+  }
+
+  .send-message-container {
+    display: flex;
+    flex-grow: 1;
+    min-height: 60px;
+  }
 
-  @include session-color-subtle($session-color-white);
+  textarea.send-message {
+    background-color: $session-shade-4;
+    border: none;
+    margin: 0px;
+    padding: 0px $session-margin-lg;
+    font-size: $session-font-md;
+    line-height: 1.3em;
+    align-self: center;
+
+    @include session-color-subtle($session-color-white);
+  }
 }
 
 .bottom-bar form {