Address review feedback.

4 jobs for !1691 with 2290-client-for-own-mailbox in 12 minutes and 10 seconds (queued for 1 second)
latest merge request