Changed @ for @@ in mail addresses