Merge pull request #1702 from dlobo/master

CRM-7355: Fix cc/bcc address merged with to address for Mail_mail class