Fix msg.reply/send to use new envelope data