CiviMail From Address selector not respecting multisite (domain ID)

Currently in 4.6.5 CiviMail when you create a new mailing it is not respecting domain filtering / ACL for a couple components, It looks like a fix for groups was just put into 4.7 https://issues.civicrm.org/jira/browse/CRM-13644 but probably could be back ported but other area of issue are From Addresses. In previous versions CiviMail would only display the from addresses and groups that were linked to a particular domain (I think the case of the first one has have domain_id in the db column in the case of the groups that is driven via acl permissions)