Mailbox race condition fix 375

Fixes (supposedly) race condition in mailboxes, issue #375