Index: vhConsistency/Checks/Email.cls.xml
===================================================================
diff -u -r1292 -r1298
--- vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1292)
+++ vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1298)
@@ -21,7 +21,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	
-	Set ..SkipCheck = 0
+	Set ..SkipCheck = 1
 	Set Status = $$$OK
 	If ('..SkipCheck){
 		Set:'..CheckKlanten() Status = $$$ERROR($$$GeneralError,"Check klanten email gefaald")
@@ -102,10 +102,12 @@
 	While (rset.Next(.sc)){
 		Set Email = $ZSTRIP(rset.Data("Email"),"<>W")		
 		Set Teller = Teller + 1
-		If ('##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)){
+		Set ValidMail = ##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)
+		If ('ValidMail){
+			Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
 			Set TellerNotValid = TellerNotValid + 1
-			Do ..VoegMeldingToe($C(9)_Email_" niet correct voor : "_rset.Data("Melding"))
-			Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_Email)
+			Do ..VoegMeldingToe($C(9)_Email_" niet correct door "_Feedback_" voor : "_rset.Data("Melding"))
+			Set Status = $$$ERROR($$$GeneralError,"Geen correct email door "_Feedback_": "_Email)
 		}		
 	}
 	If ('Status){
@@ -126,12 +128,15 @@
 		Set KlantLev = Iterator.Next()
 		Set Mail = KlantLev.GeefEmail()
 		If (Mail'= ""){
-			If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)){
+			Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
+			If ('ValidMail){
 				Set Mail = $ZSTRIP(Mail,"<>W")
-				If ('##class(TECH.Mail).Check(Mail,..#DoeNsLookUp,..#CacheNsLookUp)){
-					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"'")
+				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
+				If ('ValidMail){
+					Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' door "_Feedback)
 					Set TellerNotValid = TellerNotValid + 1			
-					Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
+					Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_" : "_Mail)
 				}Else{
 					Set $ZTRAP = "GeenZetEmail"
 					Do KlantLev.ZetEmail(Mail)
@@ -148,10 +153,12 @@
 			Set Mail = Persoon.GeefEmail()
 			If (Mail'= "")
 			{
-				If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)){
-					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
+				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
+				If ('ValidMail){
+					Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
+					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' door "_Feedback_" ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
 					Set TellerNotValid = TellerNotValid + 1			
-					Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
+					Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_": "_Mail)
 				}
 				Set Teller = Teller + 1
 			}