diff --git a/go.mod b/go.mod
index 90b52cb0..fa76bce4 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/ProtonMail/gluon v0.15.1-0.20230302123324-da3a1cd30884
+	github.com/ProtonMail/gluon v0.15.1-0.20230306144244-3ecf7859b80e
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/ProtonMail/go-proton-api v0.4.1-0.20230228124441-781ee183e1b4
 	github.com/ProtonMail/go-rfc5322 v0.11.0
diff --git a/go.sum b/go.sum
index 9b11da47..4422cd8d 100644
--- a/go.sum
+++ b/go.sum
@@ -30,6 +30,8 @@ github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkF
 github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
 github.com/ProtonMail/gluon v0.15.1-0.20230302123324-da3a1cd30884 h1:QnFkmVRM/4KLK3GrKknuXUo6VcjfJQc+/BYlPG5MOy4=
 github.com/ProtonMail/gluon v0.15.1-0.20230302123324-da3a1cd30884/go.mod h1:yA4hk6CJw0BMo+YL8Y3ckCYs5L20sysu9xseshwY3QI=
+github.com/ProtonMail/gluon v0.15.1-0.20230306144244-3ecf7859b80e h1:Cg03+j04XdwUEqlV9Fhxixp+J3lXTAlGE5RohmcIfzE=
+github.com/ProtonMail/gluon v0.15.1-0.20230306144244-3ecf7859b80e/go.mod h1:yA4hk6CJw0BMo+YL8Y3ckCYs5L20sysu9xseshwY3QI=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
diff --git a/internal/user/events.go b/internal/user/events.go
index 03172cbd..d17d1080 100644
--- a/internal/user/events.go
+++ b/internal/user/events.go
@@ -669,9 +669,12 @@ func (user *User) handleUpdateMessageEvent(ctx context.Context, message proton.M
 		update := imap.NewMessageMailboxesUpdated(
 			imap.MessageID(message.ID),
 			mapTo[string, imap.MailboxID](wantLabels(user.apiLabels, message.LabelIDs)),
-			message.Seen(),
-			message.Starred(),
-			message.IsDraft(),
+			imap.MessageCustomFlags{
+				Seen:     message.Seen(),
+				Flagged:  message.Starred(),
+				Draft:    message.IsDraft(),
+				Answered: message.IsRepliedAll == true || message.IsReplied == true, //nolint: gosimple
+			},
 		)
 
 		user.updateCh[message.AddressID].Enqueue(update)