Mailbox race condition fix 375
Merge pull request #446 from rogeralsing/mailbox-rc-fix-375

Mailbox race condition fix 375