Fixing the email list