diff --git a/src/components/Layout/Layout.module.scss b/src/components/Layout/Layout.module.scss
index f7999be..8a0b2c8 100644
--- a/src/components/Layout/Layout.module.scss
+++ b/src/components/Layout/Layout.module.scss
@@ -103,7 +103,9 @@
   }
 
   &.messagesColumn {
+    height: 85px;
     >div {
+      height: 85px;
       border-left: none;
     }
   }
diff --git a/src/pages/Messages.module.scss b/src/pages/Messages.module.scss
index 2b4f190..6c6280b 100644
--- a/src/pages/Messages.module.scss
+++ b/src/pages/Messages.module.scss
@@ -505,3 +505,10 @@
     padding-left: 2px;
   }
 }
+
+
+@media only screen and (max-width: 1300px) {
+  .conversation {
+    width: 622px;
+  }
+}
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index a478323..3230458 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -349,7 +349,7 @@ const Messages: Component = () => {
     }
 
     if (newMessageInputBorder) {
-      newMessageInputBorder.style.height = `${42 + (20 * rows)}px`;
+      newMessageInputBorder.style.height = `${40 + (20 * rows)}px`;
     }
 
     // debounce(() => {