fix map, add html email support