diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index fff7cd4b5ad..593673ac091 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -659,8 +659,9 @@ $message-day-color: color-yiq($message-app-bg) !default;
         height: 100%;
         margin-top: 0;
         .conversationcontainer {
-            max-height: calc(100vh - 50px);
-            overflow: auto;
+            .section {
+                max-height: calc(100vh - 50px);
+            }
         }
         div[role="main"] {
             height: 100%;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 3254995fdeb..ee526e2d5e6 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -15474,9 +15474,8 @@ a.ygtvspacer:hover {
 #page-message-index #region-main {
   height: 100%;
   margin-top: 0; }
-  #page-message-index #region-main .conversationcontainer {
-    max-height: calc(100vh - 50px);
-    overflow: auto; }
+  #page-message-index #region-main .conversationcontainer .section {
+    max-height: calc(100vh - 50px); }
   #page-message-index #region-main div[role="main"] {
     height: 100%; }
     #page-message-index #region-main div[role="main"] #maincontent {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 13fe4928724..95975c587ba 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -15690,9 +15690,8 @@ a.ygtvspacer:hover {
 #page-message-index #region-main {
   height: 100%;
   margin-top: 0; }
-  #page-message-index #region-main .conversationcontainer {
-    max-height: calc(100vh - 50px);
-    overflow: auto; }
+  #page-message-index #region-main .conversationcontainer .section {
+    max-height: calc(100vh - 50px); }
   #page-message-index #region-main div[role="main"] {
     height: 100%; }
     #page-message-index #region-main div[role="main"] #maincontent {