Ensure defer uses message from the trx proxy.
Merge pull request #6 from ninowalker/thoreau_message_context

Ensure defer uses message from the trx proxy.