Various mailbox adjustments