Add contact billing adress to contribution message when no contribution address

When exporting a contribution, the address is passed through to the message templates whenever the contribution has an address.
If there is no address set on the contribution, it would seem good to me to pass the billing address of the contact.