refactor emails for more flexibility
fix email placeholder order bug
Merge branch 'feature/emails' into develop