Mail addresses bug fixed