Fix double-mail