Re-enabled mail, fixed a bug.