Use render-instance from mail for preview
Merge pull request #1210 from njam/issue-1210

Use render-instance from mail for preview