diff --git a/src/window.ui b/src/window.ui
index a69e764..17c6983 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -213,16 +213,23 @@
                                     </style>
                                     <child>
                                       <object class="GtkScrolledWindow">
+                                        <property name="max-content-height">300</property>
                                         <property name="margin-start">12</property>
                                         <property name="margin-end">12</property>
+                                        <property name="propagate-natural-height">true</property>
+                                        <style>
+                                          <class name="message-input"/>
+                                          <class name="undershoot-bottom"/>
+                                          <class name="undershoot-top"/>
+                                        </style>
                                         <child>
                                           <object class="GtkTextView" id="message_text_view">
                                             <style>
                                               <class name="message_text_view" />
                                             </style>
                                             <property name="wrap-mode">word</property>
-                                            <property name="top-margin">6</property>
-                                            <property name="bottom-margin">6</property>
+                                            <property name="top-margin">18</property>
+                                            <property name="bottom-margin">18</property>
                                             <property name="hexpand">true</property>
                                           </object>
                                         </child>