diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 4cdfc8b930..0bc25a38dc 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1752,7 +1752,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     private get messagePanelClassNames(): string {
         return classNames("mx_RoomView_messagePanel", {
             mx_IRCLayout: this.state.layout === Layout.IRC,
-            mx_GroupLayout: this.state.layout === Layout.Group,
         });
     }
 
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index 55e6ed16f5..0a07393863 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -298,7 +298,7 @@ const ThreadPanel: React.FC<IProps> = ({
                         hideThreadedMessages={false}
                         hidden={false}
                         showReactions={false}
-                        className="mx_RoomView_messagePanel mx_GroupLayout"
+                        className="mx_RoomView_messagePanel"
                         membersLoaded={true}
                         permalinkCreator={permalinkCreator}
                         disableGrouping={true}
diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index f29ef81a44..f516062fa1 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -21,7 +21,6 @@ import { IEventRelation, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { TimelineWindow } from 'matrix-js-sdk/src/timeline-window';
 import { Direction } from 'matrix-js-sdk/src/models/event-timeline';
 import { IRelationsRequestOpts } from 'matrix-js-sdk/src/@types/requests';
-import classNames from "classnames";
 import { logger } from 'matrix-js-sdk/src/logger';
 
 import BaseCard from "../views/right_panel/BaseCard";
@@ -314,10 +313,6 @@ export default class ThreadView extends React.Component<IProps, IState> {
 
         const threadRelation = this.threadRelation;
 
-        const messagePanelClassNames = classNames("mx_RoomView_messagePanel", {
-            "mx_GroupLayout": this.state.layout === Layout.Group,
-        });
-
         let timeline: JSX.Element;
         if (this.state.thread) {
             if (this.props.initialEvent && this.props.initialEvent.getRoomId() !== this.state.thread.roomId) {
@@ -345,7 +340,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
                     hideThreadedMessages={false}
                     hidden={false}
                     showReactions={true}
-                    className={messagePanelClassNames}
+                    className="mx_RoomView_messagePanel"
                     permalinkCreator={this.props.permalinkCreator}
                     membersLoaded={true}
                     editState={this.state.editState}
diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx
index c375a23b81..2d3de09eec 100644
--- a/src/components/views/dialogs/ForwardDialog.tsx
+++ b/src/components/views/dialogs/ForwardDialog.tsx
@@ -276,7 +276,6 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
         <h3>{ _t("Message preview") }</h3>
         <div className={classnames("mx_ForwardDialog_preview", {
             "mx_IRCLayout": previewLayout == Layout.IRC,
-            "mx_GroupLayout": previewLayout == Layout.Group,
         })}>
             <EventTile
                 mxEvent={mockEvent}
diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx
index f73150db5e..941a74163c 100644
--- a/src/components/views/right_panel/TimelineCard.tsx
+++ b/src/components/views/right_panel/TimelineCard.tsx
@@ -20,7 +20,6 @@ import { IEventRelation, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set';
 import { NotificationCountType, Room } from 'matrix-js-sdk/src/models/room';
 import { Thread } from 'matrix-js-sdk/src/models/thread';
-import classNames from 'classnames';
 
 import BaseCard from "./BaseCard";
 import ResizeNotifier from '../../../utils/ResizeNotifier';
@@ -203,11 +202,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
             ? this.state.initialEventId
             : null;
 
-        const messagePanelClassNames = classNames({
-            "mx_RoomView_messagePanel": true,
-            "mx_GroupLayout": this.state.layout === Layout.Group,
-        });
-
         let jumpToBottom;
         if (!this.state.atEndOfLiveTimeline) {
             jumpToBottom = (<JumpToBottomButton
@@ -254,7 +248,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                             hideThreadedMessages={false}
                             hidden={false}
                             showReactions={true}
-                            className={messagePanelClassNames}
+                            className="mx_RoomView_messagePanel"
                             permalinkCreator={this.props.permalinkCreator}
                             membersLoaded={true}
                             editState={this.state.editState}
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 781121d57b..b08262a4d4 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -440,7 +440,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
 
         const classes = classNames({
             "mx_MessageComposer": true,
-            "mx_GroupLayout": true,
             "mx_MessageComposer--compact": this.props.compact,
             "mx_MessageComposer_e2eStatus": this.props.e2eStatus != undefined,
         });
diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx
index 7d308a91a5..f74d4a91ca 100644
--- a/src/utils/exportUtils/HtmlExport.tsx
+++ b/src/utils/exportUtils/HtmlExport.tsx
@@ -185,7 +185,6 @@ export default class HTMLExporter extends Exporter {
                                 mx_AutoHideScrollbar
                                 mx_ScrollPanel
                                 mx_RoomView_messagePanel
-                                mx_GroupLayout
                                 "
                             >
                                 <div class="mx_RoomView_messageListWrapper">
@@ -464,4 +463,3 @@ export default class HTMLExporter extends Exporter {
         this.cleanUp();
     }
 }
-