All slim now, layout plays nice now, new mailer template now ... automatic merge FTW