More tweaks for Mailboxer