Update for FromName (various format in From)