diff --git a/app/javascript/gabsocial/features/chat_conversation_blocked_accounts.js b/app/javascript/gabsocial/features/chat_conversation_blocked_accounts.js
index 54334961..b2c6bde6 100644
--- a/app/javascript/gabsocial/features/chat_conversation_blocked_accounts.js
+++ b/app/javascript/gabsocial/features/chat_conversation_blocked_accounts.js
@@ -39,7 +39,7 @@ class ChatConversationBlockedAccounts extends ImmutablePureComponent {
     const emptyMessage = intl.formatMessage(messages.empty)
 
     return (
-      <div className={[_s.d, _s.w100PC, _s.h100PC, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
+      <div className={[_s.d, _s.w100PC, _s.flexGrow1, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
         <div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
           <BlockHeading title={intl.formatMessage(messages.blocks)} />
         </div>
diff --git a/app/javascript/gabsocial/features/chat_conversation_mutes.js b/app/javascript/gabsocial/features/chat_conversation_mutes.js
index 56526d62..46a0beaf 100644
--- a/app/javascript/gabsocial/features/chat_conversation_mutes.js
+++ b/app/javascript/gabsocial/features/chat_conversation_mutes.js
@@ -7,7 +7,7 @@ class ChatConversationMutes extends React.PureComponent {
 
   render() {
     return (
-      <div className={[_s.d, _s.w100PC, _s.h100PC, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
+      <div className={[_s.d, _s.w100PC, _s.flexGrow1, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
         <div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
           <BlockHeading title={'Muted Chat Conversations'} />
         </div>
diff --git a/app/javascript/gabsocial/features/chat_conversation_requests.js b/app/javascript/gabsocial/features/chat_conversation_requests.js
index b3208887..f846cb3e 100644
--- a/app/javascript/gabsocial/features/chat_conversation_requests.js
+++ b/app/javascript/gabsocial/features/chat_conversation_requests.js
@@ -7,7 +7,7 @@ class ChatConversationRequests extends React.PureComponent {
 
   render() {
     return (
-      <div className={[_s.d, _s.w100PC, _s.h100PC, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
+      <div className={[_s.d, _s.w100PC, _s.flexGrow1, _s.overflowHidden, _s.boxShadowNone].join(' ')}>
         <div className={[_s.d, _s.h60PX, _s.w100PC, _s.px10, _s.py10, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
           <BlockHeading title={'Message Requests'} />
         </div>
diff --git a/app/javascript/gabsocial/layouts/messages_layout.js b/app/javascript/gabsocial/layouts/messages_layout.js
index d6f6d385..8827cef4 100644
--- a/app/javascript/gabsocial/layouts/messages_layout.js
+++ b/app/javascript/gabsocial/layouts/messages_layout.js
@@ -115,8 +115,8 @@ class MessagesLayout extends React.PureComponent {
         return (
           <div className={[_s.d, _s.w100PC, _s.minH100VH, _s.bgTertiary].join(' ')}>
             <DefaultNavigationBar showBackBtn title={title} />
-            <main role='main' className={[_s.d, _s.w100PC, _s.bgPrimary, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
-              <div className={[_s.d, _s.w100PC, _s.flexRow, _s.pb15].join(' ')}>
+            <main role='main' className={[_s.d, _s.w100PC, _s.flexGrow1, _s.bgPrimary, _s.borderBottom1PX, _s.borderColorSecondary].join(' ')}>
+              <div className={[_s.d, _s.w100PC, _s.flexRow, _s.flexGrow1, _s.mb15].join(' ')}>
                 {children}
               </div>
               <FooterBar />