Merge "Per-mailbox settings"