Added comment email support