some changes. added email preview