Ps forgot to say but both solutions could be arranged to give you the same structure as you have now – XML: just change the XSL to however you want it, Gmail add Tags.