Fixing email preview to return a collection