diff --git a/database/message.go b/database/message.go
index 0b170b3..e120c2b 100644
--- a/database/message.go
+++ b/database/message.go
@@ -29,7 +29,7 @@ func (mq *MessageQuery) New() *Message {
 	}
 }
 
-func (mq *MessageQuery) scanAll(rows *sql.Rows, err error) []*Message {
+func (mq *MessageQuery) scanAll(rows dbutil.Rows, err error) []*Message {
 	if err != nil {
 		mq.log.Warnfln("Failed to query many messages: %v", err)
 		panic(err)
diff --git a/database/userportal.go b/database/userportal.go
index aa3f79f..b4eacf4 100644
--- a/database/userportal.go
+++ b/database/userportal.go
@@ -33,7 +33,7 @@ func (up UserPortal) Scan(l log.Logger, row dbutil.Scannable) *UserPortal {
 	return &up
 }
 
-func (u *User) scanUserPortals(rows *sql.Rows) []UserPortal {
+func (u *User) scanUserPortals(rows dbutil.Rows) []UserPortal {
 	var ups []UserPortal
 	for rows.Next() {
 		up := UserPortal{}.Scan(u.log, rows)
diff --git a/go.mod b/go.mod
index 9bbd387..83cdfd3 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/stretchr/testify v1.8.0
 	github.com/yuin/goldmark v1.5.2
 	maunium.net/go/maulogger/v2 v2.3.2
-	maunium.net/go/mautrix v0.12.2-0.20221016082058-f7d28cc18df8
+	maunium.net/go/mautrix v0.12.3-0.20221028204432-e511c408c3bd
 )
 
 require (
diff --git a/go.sum b/go.sum
index 24a0948..3a12c84 100644
--- a/go.sum
+++ b/go.sum
@@ -66,5 +66,5 @@ 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/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0=
 maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
-maunium.net/go/mautrix v0.12.2-0.20221016082058-f7d28cc18df8 h1:OsKa24dXPnBgT5lr5ResRbTO9f+bZpZe/K5ioO2+1a8=
-maunium.net/go/mautrix v0.12.2-0.20221016082058-f7d28cc18df8/go.mod h1:bCw45Qx/m9qsz7eazmbe7Rzq5ZbTPzwRE1UgX2S9DXs=
+maunium.net/go/mautrix v0.12.3-0.20221028204432-e511c408c3bd h1:FrVjihHG2J5+vZlap0FSdN44ybr+nZkqFxACtTY5Yhk=
+maunium.net/go/mautrix v0.12.3-0.20221028204432-e511c408c3bd/go.mod h1:bCw45Qx/m9qsz7eazmbe7Rzq5ZbTPzwRE1UgX2S9DXs=
diff --git a/portal.go b/portal.go
index 73ebca3..3907859 100644
--- a/portal.go
+++ b/portal.go
@@ -1174,7 +1174,7 @@ func (portal *Portal) handleMatrixMessage(sender *User, evt *event.Event) {
 
 	switch content.MsgType {
 	case event.MsgText, event.MsgEmote, event.MsgNotice:
-		if replyToMXID := content.GetReplyTo(); replyToMXID != "" {
+		if replyToMXID := content.RelatesTo.GetNonFallbackReplyTo(); replyToMXID != "" {
 			replyTo := portal.bridge.DB.Message.GetByMXID(portal.Key, replyToMXID)
 			if replyTo != nil && replyTo.ThreadID == threadID {
 				sendReq.Reference = &discordgo.MessageReference{