Carl,
I have not heard of anything planned to change this - but by 2020 anything is possible. :-)
I would recommend voting for this suggestion here: connect.microsoft.com/.../gp-change-email-address-on-history-documents
The more votes, the more likely it is to happen.