Index: TECH/Mail/impl/MailMessageAanpasser.cls.xml
===================================================================
diff -u
--- TECH/Mail/impl/MailMessageAanpasser.cls.xml	(revision 0)
+++ TECH/Mail/impl/MailMessageAanpasser.cls.xml	(revision 2719)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Mail.impl.MailMessageAanpasser">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="AdresAanpasser">
+<Type>TECH.Mail.impl.MailAdresAanpasser</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AdresAanpasser:TECH.Mail.impl.MailAdresAanpasser=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AdresAanpasser = $$$Inject(AdresAanpasser,##class(TECH.Mail.impl.MailAdresAanpasser).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MaakEmailAdressenAtVanhoeckeBe">
+<FormalSpec><![CDATA[&MailMessage:%Net.MailMessage]]></FormalSpec>
+<Implementation><![CDATA[
+	Set MailMessage.From = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(MailMessage.From,1)
+	Set MailMessage.Sender = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(MailMessage.Sender,1)
+	Set MailMessage.ReplyTo = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(MailMessage.ReplyTo,1)
+	Do ..MaakRecipientsAtVanhoeckeBe(MailMessage.To)
+	Do ..MaakRecipientsAtVanhoeckeBe(MailMessage.Cc)
+	Do ..MaakRecipientsAtVanhoeckeBe(MailMessage.Bcc)
+]]></Implementation>
+</Method>
+
+<Method name="MaakRecipientsAtVanhoeckeBe">
+<FormalSpec><![CDATA[&ListOfRecipients:%ListOfDataTypes]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If $IsObject(ListOfRecipients) {
+		Set Iterator = ##class(TECH.ListIterator).%New(ListOfRecipients)
+		While (Iterator.HasNext()) {
+			#dim Recipient As %String = Iterator.Next()
+			#dim Key As %String = Iterator.Key()
+			#dim IsEmailAdresGewijzigd As %Boolean = $$$True
+			Set Recipient = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(Recipient, .IsEmailAdresGewijzigd)
+			Do:(IsEmailAdresGewijzigd) ListOfRecipients.SetAt(Recipient,Key)
+		}
+	}
+	Quit
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Mail/impl/MailAdresAanpasser.cls.xml
===================================================================
diff -u
--- TECH/Mail/impl/MailAdresAanpasser.cls.xml	(revision 0)
+++ TECH/Mail/impl/MailAdresAanpasser.cls.xml	(revision 2719)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Mail.impl.MailAdresAanpasser">
+<Super>TECH.Mockable</Super>
+
+<Method name="GeefVolledigVanhoeckeBeAdres">
+<FormalSpec><![CDATA[EmailAdres:%String,&IsEmailAdresGewijzigd:%Boolean]]></FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set IsEmailAdresGewijzigd=0
+	If ($L(EmailAdres))&&(EmailAdres'["@") {
+		Set EmailAdres=EmailAdres_"@vanhoecke.be"
+		Set IsEmailAdresGewijzigd=1
+	}
+	Quit EmailAdres
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>