mailtemplates continue
plus some minor cleaning