Remove trailing new lines
Change email address to plus alias