Address review comments for MailboxApi

3 jobs for !1564 with 2243-okhttp-mailbox-calls in 9 minutes and 43 seconds (queued for 7 seconds)
latest merge request