Mailboxer fix