Bugfix: email output template fixes