diff --git a/go.mod b/go.mod
index 059fe80..c94a7ad 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	golang.org/x/crypto v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
 	maunium.net/go/mauflag v1.0.0
-	maunium.net/go/mautrix v0.21.1-0.20241012115221-190760cd6584
+	maunium.net/go/mautrix v0.21.1-0.20241012124536-974fab0e0f4a
 )
 
 require (
diff --git a/go.sum b/go.sum
index 07f48a9..cdf024e 100644
--- a/go.sum
+++ b/go.sum
@@ -66,5 +66,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
-maunium.net/go/mautrix v0.21.1-0.20241012115221-190760cd6584 h1:DWsSSG58x5OCqcf+SvjM3Ms0P5mcODUICL5YXoXEO/Q=
-maunium.net/go/mautrix v0.21.1-0.20241012115221-190760cd6584/go.mod h1:yIs8uVcl3ZiTuDzAYmk/B4/z9dQqegF0rcOWV4ncgko=
+maunium.net/go/mautrix v0.21.1-0.20241012124536-974fab0e0f4a h1:8HOrgF3F+9XlIUifOAuOJizVVx5FRlVynJuNKc8c+bU=
+maunium.net/go/mautrix v0.21.1-0.20241012124536-974fab0e0f4a/go.mod h1:yIs8uVcl3ZiTuDzAYmk/B4/z9dQqegF0rcOWV4ncgko=
diff --git a/web/src/ui/timeline/TimelineEvent.css b/web/src/ui/timeline/TimelineEvent.css
index 0dd7e4b..9d4e6e4 100644
--- a/web/src/ui/timeline/TimelineEvent.css
+++ b/web/src/ui/timeline/TimelineEvent.css
@@ -52,7 +52,6 @@ div.timeline-event {
 		grid-template:
 			"timestamp content" auto
 			/ 2.75rem 1fr;
-		margin-top: 0;
 
 		> div.sender-avatar, > div.event-sender-and-time {
 			display: none;
diff --git a/web/src/ui/timeline/TimelineEvent.tsx b/web/src/ui/timeline/TimelineEvent.tsx
index ab53805..2ba923f 100644
--- a/web/src/ui/timeline/TimelineEvent.tsx
+++ b/web/src/ui/timeline/TimelineEvent.tsx
@@ -71,7 +71,9 @@ const TimelineEvent = ({ room, evt, prevEvt }: TimelineEventProps) => {
 	const wrapperClassNames = ["timeline-event"]
 	if (BodyType === HiddenEvent) {
 		wrapperClassNames.push("hidden-event")
-	} else if (prevEvt?.sender === evt.sender && getBodyType(prevEvt) !== HiddenEvent) {
+	} else if (prevEvt?.sender === evt.sender &&
+		prevEvt.timestamp + 15 * 60 * 1000 > evt.timestamp &&
+		getBodyType(prevEvt) !== HiddenEvent) {
 		wrapperClassNames.push("same-sender")
 	}
 	const fullTime = fullTimeFormatter.format(eventTS)