diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 289a67aed..7e5be9f1d 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -299,6 +299,13 @@
             this.view.measureScrollPosition();
             window.autosize(this.$messageField);
 
+            var $attachmentPreviews = this.$('.attachment-previews'),
+                $bottomBar = this.$('.bottom-bar');
+
+            $bottomBar.outerHeight(
+                    this.$messageField.outerHeight() +
+                    $attachmentPreviews.outerHeight() + 11);
+
             this.view.scrollToBottomIfNeeded();
         },