Added support for to/cc fields in advanced mode