From 12abb9456d4730018f8b0c12009d07edd2ad9d6b Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 1 Sep 2017 18:00:51 -0300
Subject: [PATCH 1/2] fix message-box autogrow

---
 .../client/imports/components/message-box.css              | 5 ++++-
 packages/rocketchat-ui/client/lib/textarea-autogrow.js     | 7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index 149883503d78..200b32f093fc 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -85,6 +85,8 @@
 
 		cursor: text;
 
+		line-height: 20px;
+
 		transition: background-color 0.3s;
 
 		border-width: var(--message-box-container-border-width);
@@ -99,9 +101,10 @@
 
 	&__textarea {
 		width: 100%;
+		height: 15px;
 		max-height: 155px;
+
 		padding: 0;
-		height: 15px;
 
 		resize: none;
 
diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
index b375bdcc28fd..3e4ceaea8e46 100644
--- a/packages/rocketchat-ui/client/lib/textarea-autogrow.js
+++ b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
@@ -64,11 +64,11 @@
 				}
 
 				if(newHeight === $self[0].offsetHeight){
-					return;
+					return false;
 				}
 
 				if(maxHeight <= newHeight){
-					return;
+					newHeight = maxHeight;
 				}
 
 				$self.css('overflow-y', 'hidden');
@@ -78,9 +78,6 @@
 					$self.css('overflow-y', '');
 				}});
 
-
-
-
 				$self.trigger('autogrow', []);
 
 				if (settings.postGrowCallback !== null) {

From 627ecae2f5818d41e646f089d9809c95dd338608 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Mon, 4 Sep 2017 13:49:35 -0300
Subject: [PATCH 2/2] fix autogrow overflow

---
 packages/rocketchat-ui/client/lib/textarea-autogrow.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
index 3e4ceaea8e46..e158f1a6e109 100644
--- a/packages/rocketchat-ui/client/lib/textarea-autogrow.js
+++ b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
@@ -71,11 +71,8 @@
 					newHeight = maxHeight;
 				}
 
-				$self.css('overflow-y', 'hidden');
-
 				$self.stop().animate( { height: newHeight }, { duration: 100, complete: ()=> {
 					$self.trigger('autogrow', []);
-					$self.css('overflow-y', '');
 				}});
 
 				$self.trigger('autogrow', []);