Changed mailboxes, and removed one macro because it was no longer
necessary.