Better email handling.