For the line breaking, setting the attribute style on the Indent tab to "All on One Line" will prevent the Envelope tag from being broken into several lines. (and I see a bug there, its not showing the right setting when you change the attribute style, and then close and re-open the dialog).
The indent problem is where I apparently broke the default tag setting. You can work around it for the moment by bringing up the beautifier options, go to the "Tags" tab, click on "<DEFAULT TAG>", and then change the "Line Breaks -> Within" setting to "1".
I'll fix that and the line breaking setting option. Thanks for the report.