Implemented optimisation for same-mailbox messaging