Bugfix: improved mailbox security patch was incorrectly applied