Index: vhUnitTest/TECH/Mail.cls.xml
===================================================================
diff -u -r1292 -r1303
--- vhUnitTest/TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1292)
+++ vhUnitTest/TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1303)
@@ -50,6 +50,8 @@
 	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
 	Set mail = "~Joren.Blancquaert@skynet.be"
 	Do $$$AssertTrue(##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancquaert@skynet.be@skynet.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Mail.cls.xml
===================================================================
diff -u -r1298 -r1303
--- TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1298)
+++ TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1303)
@@ -26,6 +26,8 @@
 	/// Geen spaties toegestaan
 	Set IsValid = '(Mail?.(.E1" ".E))
 	
+	Set:($Length(Mail,"@")'=2) IsValid = 0	
+	
 	Set LocalPart = $Piece(Mail,"@")
 	Set DomainPart = $Piece(Mail,"@",2)