Ensure that correct setters are used for cc and bcc map entries.
Merge pull request #213 from corneil/master

Ensure that correct setters are used for cc and bcc map entries.