fix email preview
Merge branch 'emailpreview' into testing