refactor e-mail to work inline e.g. not require contact_id, also more fixed common problems
address cleanup - initial commit
I forget, tbh