Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)

Conflicts:

	CHANGELOG