diff --git a/.changeset/maxHeight-stateEvent-fix.md b/.changeset/maxHeight-stateEvent-fix.md
new file mode 100644
index 000000000..f237fd647
--- /dev/null
+++ b/.changeset/maxHeight-stateEvent-fix.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Added maximum height to state events
diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index 03ff33cc2..3342b0d52 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -179,7 +179,12 @@ export const Reply = as<'div', ReplyProps>(
       const parsedMemberEvent = parseMemberEvent(replyEvent);
       image = parsedMemberEvent.icon;
       mentioned = false;
-      bodyJSX = parsedMemberEvent.body;
+      bodyJSX = (
+        <Box direction="Row" style={{ columnGap: toRem(6) }}>
+          {' '}
+          {parsedMemberEvent.body}{' '}
+        </Box>
+      );
     } else if (eventType === StateEvent.RoomName) {
       image = Icons.Hash;
       bodyJSX = t('Organisms.RoomCommon.changed_room_name');
diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx
index 382cdfc62..b7d2bff7d 100644
--- a/src/app/hooks/timeline/useTimelineEventRenderer.tsx
+++ b/src/app/hooks/timeline/useTimelineEventRenderer.tsx
@@ -53,11 +53,16 @@ import {
   Message,
   Reactions,
 } from '$features/room/message';
+
 import { useSableCosmetics } from '$hooks/useSableCosmetics';
 
 function DecoratedUser({ room, userId, userName }: DecoratedUserProps) {
   const { color, font } = useSableCosmetics(userId, room ?? ({} as Room));
-  return <b style={{ color, font }}> {userName ?? userId} </b>;
+  return (
+    <Text truncate>
+      <b style={{ color, font }}> {userName ?? userId} </b>
+    </Text>
+  );
 }
 
 type DecoratedUserProps = {
@@ -763,11 +768,11 @@ export function useTimelineEventRenderer({
               time={timeJSX}
               iconSrc={parsed.icon}
               content={
-                <Box grow="Yes" direction="Column">
-                  <Text size="T300" priority="300">
+                <Text size="T300" priority="300">
+                  <Box direction="Row" style={{ flexWrap: 'wrap', columnGap: toRem(6) }}>
                     {parsed.body}
-                  </Text>
-                </Box>
+                  </Box>
+                </Text>
               }
             />
           </Event>
diff --git a/src/app/hooks/useMemberEventParser.tsx b/src/app/hooks/useMemberEventParser.tsx
index bb788a812..88265ad0d 100644
--- a/src/app/hooks/useMemberEventParser.tsx
+++ b/src/app/hooks/useMemberEventParser.tsx
@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { IconSrc, Icons } from 'folds';
+import { IconSrc, Icons, Text } from 'folds';
 import { MatrixEvent, Room } from '$types/matrix-sdk';
 import { IMemberContent, Membership } from '$types/matrix/room';
 import { getMxIdLocalPart } from '$utils/matrix';
@@ -17,7 +17,11 @@ function DecoratedUser({ roomId, userId, userName }: DecoratedUserProps) {
   const mx = useMatrixClient();
   const room = mx.getRoom(roomId);
   const { color, font } = useSableCosmetics(userId, room ?? ({} as Room));
-  return <b style={{ color, font }}> {userName ?? userId} </b>;
+  return (
+    <Text truncate>
+      <b style={{ color, font }}>{userName ?? userId} </b>
+    </Text>
+  );
 }
 
 export type ParsedResult = {
@@ -56,10 +60,12 @@ export const useMemberEventParser = (): MemberEventParser => {
             body: (
               <>
                 <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
-                {' accepted '}
+                <Text>{' accepted '}</Text>
                 <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                {`'s join request `}
-                {reason}
+                <Text>
+                  {`'s join request `}
+                  {reason}
+                </Text>
               </>
             ),
           };
@@ -70,9 +76,9 @@ export const useMemberEventParser = (): MemberEventParser => {
           body: (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
-              {' invited '}
+              <Text>{' invited '}</Text>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-              {reason}
+              <Text>{reason}</Text>
             </>
           ),
         };
@@ -84,8 +90,10 @@ export const useMemberEventParser = (): MemberEventParser => {
           body: (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-              {' requested to join room: '}
-              <i>{reason}</i>
+              <Text>
+                {' requested to join room: '}
+                <i>{reason}</i>
+              </Text>
             </>
           ),
         };
@@ -97,7 +105,7 @@ export const useMemberEventParser = (): MemberEventParser => {
           body: (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-              {' joined the room'}
+              <Text>{' joined the room'}</Text>
             </>
           ),
         };
@@ -111,16 +119,20 @@ export const useMemberEventParser = (): MemberEventParser => {
               senderId === userId ? (
                 <>
                   <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                  {' rejected the invitation '}
-                  {reason}
+                  <Text>
+                    {' rejected the invitation '}
+                    {reason}
+                  </Text>
                 </>
               ) : (
                 <>
                   <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
-                  {' rejected '}
+                  <Text>{' rejected '}</Text>
                   <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                  {`'s join request `}
-                  {reason}
+                  <Text>
+                    {`'s join request `}
+                    {reason}
+                  </Text>
                 </>
               ),
           };
@@ -133,16 +145,20 @@ export const useMemberEventParser = (): MemberEventParser => {
               senderId === userId ? (
                 <>
                   <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                  {' revoked joined request '}
-                  {reason}
+                  <Text>
+                    {' revoked joined request '}
+                    {reason}
+                  </Text>
                 </>
               ) : (
                 <>
                   <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
                   {' revoked '}
                   <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                  {`'s invite `}
-                  {reason}
+                  <Text>
+                    {`'s invite `}
+                    {reason}
+                  </Text>
                 </>
               ),
           };
@@ -154,9 +170,9 @@ export const useMemberEventParser = (): MemberEventParser => {
             body: (
               <>
                 <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
-                {' unbanned '}
+                <Text>{' unbanned '}</Text>
                 <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                {reason}
+                <Text>{reason}</Text>
               </>
             ),
           };
@@ -168,15 +184,17 @@ export const useMemberEventParser = (): MemberEventParser => {
             senderId === userId ? (
               <>
                 <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                {' left the room '}
-                {reason}
+                <Text>
+                  {' left the room '}
+                  {reason}
+                </Text>
               </>
             ) : (
               <>
                 <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
-                {' kicked '}
+                <Text>{' kicked '}</Text>
                 <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-                {reason}
+                <Text>{reason}</Text>
               </>
             ),
         };
@@ -188,9 +206,9 @@ export const useMemberEventParser = (): MemberEventParser => {
           body: (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={senderId} userName={senderName} />
-              {' banned '}
+              <Text>{' banned '}</Text>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-              {reason}
+              <Text>{reason}</Text>
             </>
           ),
         };
@@ -209,13 +227,13 @@ export const useMemberEventParser = (): MemberEventParser => {
           typeof content.displayname === 'string' ? (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={prevUserName} />
-              {' changed display name to '}
+              <Text>{' changed display name to '}</Text>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
             </>
           ) : (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={prevUserName} />
-              {' removed their display name '}
+              <Text>{' removed their display name '}</Text>
             </>
           ),
       };
@@ -227,12 +245,12 @@ export const useMemberEventParser = (): MemberEventParser => {
           content.avatar_url && typeof content.avatar_url === 'string' ? (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-              {' changed their avatar'}
+              <Text>{' changed their avatar'}</Text>
             </>
           ) : (
             <>
               <DecoratedUser roomId={roomId ?? ''} userId={userId} userName={userName} />
-              {' removed their avatar '}
+              <Text>{' removed their avatar '}</Text>
             </>
           ),
       };