Index: vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml
===================================================================
diff -u -r2724 -r2733
--- vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml	(.../Test.cls.xml)	(revision 2724)
+++ vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml	(.../Test.cls.xml)	(revision 2733)
@@ -6,78 +6,64 @@
 <Method name="Test: enkelvoudige adres-velden : From Sender ReplyTo">
 <Implementation><![CDATA[
 	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.From = "UT_Test1"
-	Set MailMessage.Sender = "UT_Test2"
-	Set MailMessage.ReplyTo = "UT_Test3"
+	Set MailMessage.From = "From"
+	Set MailMessage.Sender = "Sender"
+	Set MailMessage.ReplyTo = "ReplyTo"
 	
-	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
-	
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
 	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
 	
-	Do $$$AssertEquals(MailMessage.From,"UT_Test1_New")
-	Do $$$AssertEquals(MailMessage.Sender,"UT_Test2_New")
-	Do $$$AssertEquals(MailMessage.ReplyTo,"UT_Test3_New")
+	Do $$$AssertEquals(MailMessage.From,"From@vanhoecke.be")
+	Do $$$AssertEquals(MailMessage.Sender,"Sender@vanhoecke.be")
+	Do $$$AssertEquals(MailMessage.ReplyTo,"ReplyTo@vanhoecke.be")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: multiple adres-veld : To">
 <Implementation><![CDATA[
 	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.To = ##class(TECH.ListUtils).CreateListOfDataTypes("UT_Test1","UT_Test2")
+	Set MailMessage.To = ##class(TECH.ListUtils).CreateListOfDataTypes("Recipient1","Recipient2")
 	
-	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
-	
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
 	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
 	
-	Do $$$AssertEquals(MailMessage.To.GetAt(1),"UT_Test1_New")
-	Do $$$AssertEquals(MailMessage.To.GetAt(2),"UT_Test2_New")
+	if $$$AssertEquals(MailMessage.To.Count(),2) {
+		Do $$$AssertEquals(MailMessage.To.GetAt(1),"Recipient1@vanhoecke.be")
+		Do $$$AssertEquals(MailMessage.To.GetAt(2),"Recipient2@vanhoecke.be")
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="Test: multiple adres-veld : Cc">
 <Implementation><![CDATA[
 	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.Cc = ##class(TECH.ListUtils).CreateListOfDataTypes("UT_Test1","UT_Test2")
+	Set MailMessage.Cc = ##class(TECH.ListUtils).CreateListOfDataTypes("CarbonCopy1","CarbonCopy2")
 	
-	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
-	
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
 	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
 	
-	Do $$$AssertEquals(MailMessage.Cc.GetAt(1),"UT_Test1_New")
-	Do $$$AssertEquals(MailMessage.Cc.GetAt(2),"UT_Test2_New")
+	if $$$AssertEquals(MailMessage.Cc.Count(),2) {
+		Do $$$AssertEquals(MailMessage.Cc.GetAt(1),"CarbonCopy1@vanhoecke.be")
+		Do $$$AssertEquals(MailMessage.Cc.GetAt(2),"CarbonCopy2@vanhoecke.be")
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="Test: multiple adres-veld : Bcc">
 <Implementation><![CDATA[
 	Set MailMessage = ##class(%Net.MailMessage).%New()
-	Set MailMessage.Bcc = ##class(TECH.ListUtils).CreateListOfDataTypes("UT_Test1","UT_Test2")
+	Set MailMessage.Bcc = ##class(TECH.ListUtils).CreateListOfDataTypes("BlindCarbonCopy1","BlindCarbonCopy2")
 	
-	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
-	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New()
 	
 	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
 	
-	Do $$$AssertEquals(MailMessage.Bcc.GetAt(1),"UT_Test1_New")
-	Do $$$AssertEquals(MailMessage.Bcc.GetAt(2),"UT_Test2_New")
+	if $$$AssertEquals(MailMessage.Bcc.Count(),2) {
+		Do $$$AssertEquals(MailMessage.Bcc.GetAt(1),"BlindCarbonCopy1@vanhoecke.be")
+		Do $$$AssertEquals(MailMessage.Bcc.GetAt(2),"BlindCarbonCopy2@vanhoecke.be")
+	}
 ]]></Implementation>
 </Method>
-
-<Method name="GeefAdresAanpasserMock">
-<ReturnType>vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser</ReturnType>
-<Implementation><![CDATA[
-	Set AdresAanpasserMock = ##class(vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser).%New()
-		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","").DanReturn("")
-		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","UT_Test1").DanReturn("UT_Test1_New")
-		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","UT_Test2").DanReturn("UT_Test2_New")
-		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","UT_Test3").DanReturn("UT_Test3_New")
-	
-	Quit AdresAanpasserMock
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/TECH/Mail/impl/MailAdresAanpasser/GeefVolledigVanhoeckeBeAdres/Test.cls.xml
===================================================================
diff -u -r2722 -r2733
--- vhUnitTest/TECH/Mail/impl/MailAdresAanpasser/GeefVolledigVanhoeckeBeAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 2722)
+++ vhUnitTest/TECH/Mail/impl/MailAdresAanpasser/GeefVolledigVanhoeckeBeAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 2733)
@@ -15,14 +15,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Volledig adres (bevat @) blijft ongewijzigd">
+<Method name="Test: Volledig adres (bevat @domein.com) blijft ongewijzigd">
 <Implementation><![CDATA[
 	#dim EmailAdres As %String = "naam@domein.com"
 	Do ..AssertAdres(EmailAdres, EmailAdres)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Volledig adres met UserFriendlyName blijft ongewijzigd">
+<Method name="Test: Volledig adres met user friendly name blijft ongewijzigd">
 <Implementation><![CDATA[
 	#dim EmailAdres As %String = """MailFriendlyName"" <naam@domein.com>"
 	Do ..AssertAdres(EmailAdres, EmailAdres)
@@ -34,12 +34,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Enkelvoudig adres met user friendly name zonder @ wordt aangevuld met vanhoecke.be">
+<Implementation><![CDATA[	Do ..AssertAdres("""User Friendly Name"" <naam>", """User Friendly Name"" <naam@vanhoecke.be>")
+]]></Implementation>
+</Method>
+
+<Method name="Test: OPGELET !!! : vanaf dat een adres een @ bevat blijft het ongewijzigd">
+<Implementation><![CDATA[
+	Do ..AssertAdres("naam@", "naam@")
+	Do ..AssertAdres("""UserFriendlyN@me"" <naam>", """UserFriendlyN@me"" <naam>")
+]]></Implementation>
+</Method>
+
 <Method name="AssertAdres">
 <FormalSpec>EmailAdres:%String,VerwachtEmailAdres:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	#dim VolledigEmailAdres As %String = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(EmailAdres) 
-	Do $$$AssertEquals(VolledigEmailAdres,VerwachtEmailAdres)
+<Implementation><![CDATA[	Do $$$AssertEquals(..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(EmailAdres), VerwachtEmailAdres)
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Mail/impl/MailAdresAanpasser.cls.xml
===================================================================
diff -u -r2723 -r2733
--- TECH/Mail/impl/MailAdresAanpasser.cls.xml	(.../MailAdresAanpasser.cls.xml)	(revision 2723)
+++ TECH/Mail/impl/MailAdresAanpasser.cls.xml	(.../MailAdresAanpasser.cls.xml)	(revision 2733)
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="TECH.Mail.impl.MailAdresAanpasser">
-<Super>TECH.Mockable</Super>
+<Super>TECH.RegisteredObject</Super>
 
+<Property name="Domein">
+<Type>%String</Type>
+<InitialExpression>"vanhoecke.be"</InitialExpression>
+<Private>1</Private>
+</Property>
+
 <Method name="GeefVolledigVanhoeckeBeAdres">
 <FormalSpec>EmailAdres:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If ($L(EmailAdres))&&(EmailAdres'["@") {
-		Set EmailAdres=EmailAdres_"@vanhoecke.be"
+	If ($length(EmailAdres)) && (EmailAdres'["@") {
+		if EmailAdres[">" {
+			set EmailAdres = $replace(EmailAdres,">","@"_..Domein_">")
+		} else {
+			Set EmailAdres = EmailAdres_"@"_..Domein
+		}
 	}
 	Quit EmailAdres
 ]]></Implementation>