diff --git a/packages/rocketchat-theme/server/colors.less b/packages/rocketchat-theme/server/colors.less
index 30422e165ed3cd2450eea8e331ba804975cb80fb..74d83add56e99300a756215a501fa715c2baaf34 100755
--- a/packages/rocketchat-theme/server/colors.less
+++ b/packages/rocketchat-theme/server/colors.less
@@ -6,6 +6,10 @@
 	color: @primary-font-color;
 }
 
+.border-component-color {
+	border-color: @component-color;
+}
+
 /** ----------------------------------------------------------------------------
  * Derivative colours (fixed variants of inherited variables)
  */
@@ -62,11 +66,11 @@
 	}
 }
 
-body {
-	* {
-		border-color: @component-color;
-	}
-}
+// body {
+// 	* {
+// 		border-color: @component-color;
+// 	}
+// }
 
 code {
 	background-color: @code-background-color;
diff --git a/packages/rocketchat-ui-message/message/messageBox.html b/packages/rocketchat-ui-message/message/messageBox.html
index 48ed519fc22471d4d8bbc1fd75caadcf877bc1ee..4d5d15a4e6701881c56641e523bd095c6f62dbd6 100644
--- a/packages/rocketchat-ui-message/message/messageBox.html
+++ b/packages/rocketchat-ui-message/message/messageBox.html
@@ -3,7 +3,7 @@
 		<form class="message-form" method="post" action="/">
 			{{> messagePopupConfig getPopupConfig}}
 			{{#if allowedToSend}}
-			<div class="message-input">
+			<div class="message-input border-component-color">
 				<div class="input-message-container">
 					<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
 
diff --git a/packages/rocketchat-ui/views/app/room.html b/packages/rocketchat-ui/views/app/room.html
index 93448fed3c92cda43dd9823a4e460f36beca7eaa..5283971e6a65a343f9fc9ca4a4379baa2cbdbcf6 100644
--- a/packages/rocketchat-ui/views/app/room.html
+++ b/packages/rocketchat-ui/views/app/room.html
@@ -5,7 +5,7 @@
 				{{_ "Drop_to_upload_file"}}
 			</div>
 		</div>
-		<section class="messages-container {{adminClass}}" id="{{windowId}}" aria-label="{{_ "Channel"}}">
+		<section class="messages-container border-component-color {{adminClass}}" id="{{windowId}}" aria-label="{{_ "Channel"}}">
 			{{#unless embeddedVersion}}
 			<header class="fixed-title">
 				{{> burger}}
@@ -102,7 +102,7 @@
 					</ul>
 				</div>
 			</div>
-			<footer class="footer">
+			<footer class="footer border-component-color">
 				{{> messageBox}}
 			</footer>
 		</section>