Fix clash with CC'ed emails and turn on new feature on by default