Just an update, I was able to resolve the issue by adding FEATURE(`masquerade_envelope') to my configuration along with the other lines I had been trying. Cheers, J.