Index: TECH/Mail/impl/SMTPVerzender.cls.xml
===================================================================
diff -u -r861 -r1577
--- TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 861)
+++ TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 1577)
@@ -7,6 +7,11 @@
 <Type>%Net.SMTP</Type>
 </Property>
 
+<Property name="MailMessage">
+<Type>%Net.MailMessage</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -15,6 +20,9 @@
 <Implementation><![CDATA[
 	Set ..SMTP = ##class(%Net.SMTP).%New()
 	Set ..SMTP.smtpserver=..GeefSMTPServer()
+
+	set ..MailMessage = ##class(%Net.MailMessage).%New()
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -26,7 +34,7 @@
 	Set ..SMTP = ##class(%Net.SMTP).%New()
 	Set ..SMTP.smtpserver=..GeefSMTPServer()
 
-	#dim Status As %Status = ..SMTP.Send(Mail.GeefMailMessage())
+	#dim Status As %Status = ..SMTP.Send(..GeefMailMessage(Mail))
 
 	If $$$ISERR(Status)
 	{
@@ -55,6 +63,101 @@
 <Implementation><![CDATA[	set ..SMTP.authenticator = ""
 ]]></Implementation>
 </Method>
+
+<Method name="GeefMailMessage">
+<Description>
+Deze was  [ Private ] , nu public gemaakt voor UT :-(((( 
+</Description>
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+<ReturnType>%Net.MailMessage</ReturnType>
+<Implementation><![CDATA[
+	set ..MailMessage.From = Mail.GeefVerzender()
+	set ..MailMessage.To = Mail.GeefOntvangers()
+	set ..MailMessage.Cc = Mail.GeefOntvangersCC()
+	set ..MailMessage.Bcc = Mail.GeefOntvangersBCC()
+	set ..MailMessage.ReplyTo = Mail.GeefAntwoordenNaar()
+	set ..MailMessage.Subject = Mail.GeefOnderwerp()
+	set ..MailMessage.IsHTML= Mail.GeefIsHTML()
+	
+	if ..MailOmleiden(Mail) {
+		do ..VoegToeOrigineleInfo(Mail)
+		do ..WijzigOrigineleOntvangers()
+		do ..WijzigOrigineleVerzender()
+	}
+ 
+	set itBijlagen = ##class(TECH.ListIterator).%New(Mail.GeefBijlagen())
+	while itBijlagen.HasNext() {
+		#dim Bijlage As %String = itBijlagen.Next()
+		do ..MailMessage.AttachFile(##class(TECH.File).GetDirectory(Bijlage),##class(TECH.File).GetFilename(Bijlage),1)
+	}
+	
+	Quit ..MailMessage
+]]></Implementation>
+</Method>
+
+<Method name="MailOmleiden">
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit (Mail.GeefOmleiden()) && (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("vhLib.Mail_RedirectMailToDevelopment"))
+]]></Implementation>
+</Method>
+
+<Method name="WijzigOrigineleVerzender">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..MailMessage.From = $$$SystemMail("Redirected mail")
+]]></Implementation>
+</Method>
+
+<Method name="WijzigOrigineleOntvangers">
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ..MailMessage.To.Clear()
+	do ..MailMessage.Cc.Clear()
+	do ..MailMessage.Bcc.Clear()
+	
+	#dim RedirectTo As %String
+	#dim GebruikerInitialen As %String =##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
+	If ($$USERID^vhUSER(GebruikerInitialen) '= "") {
+		Set RedirectTo = GebruikerInitialen_"@vanhoecke.be"
+	}Else{
+		Set RedirectTo = ##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Mail.DefaultRedirectMailAddress")
+	}
+	If $length(RedirectTo) do ..MailMessage.To.Insert(RedirectTo)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeOrigineleInfo">
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	;set Stream = ##class(%GlobalCharacterStream).%New()
+	;do Stream.CopyFrom(Mail.GeefInhoud())
+		
+	do ..MailMessage.TextData.Clear()
+	do ..MailMessage.TextData.WriteLine(..GeefOrigineleInfo())
+	do ..MailMessage.TextData.CopyFrom(Mail.GeefInhoud())
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrigineleInfo">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#define ListHasItems(%v)   ($IsObject(%v))&&(%v.Count()>0)
+	#dim RecipientsInfo As %String = "Intended Recipients : (redirected by configitem vhLib.Mail_RedirectMailToDevelopment)"_$$$CRLF
+	Set:(..MailMessage.From'="") RecipientsInfo=RecipientsInfo_"  From: "_..MailMessage.From_$$$CRLF
+	Set:(..MailMessage.To.Count()>0) RecipientsInfo=RecipientsInfo_"  To  : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.To,", ")_$$$CRLF
+	Set:(..MailMessage.Cc.Count()>0) RecipientsInfo=RecipientsInfo_"  Cc  : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.Cc,", ")_$$$CRLF
+	Set:(..MailMessage.Bcc.Count()>0) RecipientsInfo=RecipientsInfo_"  Bcc : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.Bcc,", ")_$$$CRLF
+	Set RecipientsInfo=RecipientsInfo_"============================================================"_$$$CRLF
+	If ..MailMessage.IsHTML {
+		Set RecipientsInfo=$$$Replace(RecipientsInfo,$$$CRLF,"<BR>")
+		Set RecipientsInfo=RecipientsInfo_"<BR>"
+	}
+	Quit RecipientsInfo
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: TECH/Mail/impl/Mail.cls.xml
===================================================================
diff -u -r1576 -r1577
--- TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1576)
+++ TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1577)
@@ -97,6 +97,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOmleiden">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..Omleiden
+]]></Implementation>
+</Method>
+
 <Method name="VoegToeBijlagen">
 <FormalSpec>BijlageLocaties:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[	do ##class(TECH.ListUtils).CopyListOfDataTypes(BijlageLocaties,..Bijlagen)
@@ -150,7 +156,7 @@
 <Implementation><![CDATA[
 	Set ..Onderwerp = Onderwerp
 	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("MiniMail_VoegServerPrefixToe")){
-		Set:($$$UCase(..Onderwerp)'[($$$Server)) ..Onderwerp = "["_$$$Server_"] "_..Onderwerp
+		Set:($$$UCase(..Onderwerp)'[(##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam())) ..Onderwerp = "["_##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()_"] "_..Onderwerp
 	}
 ]]></Implementation>
 </Method>
@@ -213,74 +219,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefMailMessage">
-<ReturnType>%Net.MailMessage</ReturnType>
-<Implementation><![CDATA[
-	set ..MailMessage.From = ..GeefVerzender()
-	set ..MailMessage.To = ..GeefOntvangers()
-	set ..MailMessage.Cc = ..GeefOntvangersCC()
-	set ..MailMessage.Bcc = ..GeefOntvangersBCC()
-	set ..MailMessage.ReplyTo = ..GeefAntwoordenNaar()
-	set ..MailMessage.Subject = ..Onderwerp
-	set ..MailMessage.IsHTML=..IsHTML
-	
-	if ..MailOmleiden() {
-		do ..VoegToeOrigineleInfo()
-		do ..WijzigOrigineleOntvangers()
-		do ..WijzigOrigineleVerzender()
-	}
- 
-	set itBijlagen = ##class(TECH.ListIterator).%New(..Bijlagen)
-	while itBijlagen.HasNext() {
-		#dim Bijlage As %String = itBijlagen.Next()
-		do ..MailMessage.AttachFile(##class(TECH.File).GetDirectory(Bijlage),##class(TECH.File).GetFilename(Bijlage),1)
-	}
-	
-	Quit ..MailMessage
-]]></Implementation>
-</Method>
-
-<Method name="MailOmleiden">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit (..Omleiden) && (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("vhLib.Mail_RedirectMailToDevelopment"))
-]]></Implementation>
-</Method>
-
-<Method name="WijzigOrigineleVerzender">
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..MailMessage.From = $$$SystemMail("Redirected mail")
-]]></Implementation>
-</Method>
-
-<Method name="WijzigOrigineleOntvangers">
-<Private>1</Private>
-<Implementation><![CDATA[
-	do ..MailMessage.To.Clear()
-	do ..MailMessage.Cc.Clear()
-	do ..MailMessage.Bcc.Clear()
-	
-	#dim RedirectTo As %String
-	#dim GebruikerInitialen As %String =##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
-	If ($$USERID^vhUSER(GebruikerInitialen) '= "") {
-		Set RedirectTo = GebruikerInitialen_"@vanhoecke.be"
-	}Else{
-		Set RedirectTo = ##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Mail.DefaultRedirectMailAddress")
-	}
-	If $length(RedirectTo) do ..MailMessage.To.Insert(RedirectTo)
-]]></Implementation>
-</Method>
-
-<Method name="VoegToeOrigineleInfo">
-<Implementation><![CDATA[
-	set Stream = ##class(%GlobalCharacterStream).%New()
-	do Stream.CopyFrom(..MailMessage.TextData)
-		
-	do ..MailMessage.TextData.Clear()
-	do ..MailMessage.TextData.WriteLine(..GeefOrigineleInfo())
-	do ..MailMessage.TextData.CopyFrom(Stream)
-]]></Implementation>
-</Method>
-
 <Method name="GeefVerzender">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..Verzender
@@ -311,24 +249,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOrigineleInfo">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#define ListHasItems(%v)   ($IsObject(%v))&&(%v.Count()>0)
-	#dim RecipientsInfo As %String = "Intended Recipients : (redirected by configitem vhLib.Mail_RedirectMailToDevelopment)"_$$$CRLF
-	Set:(..MailMessage.From'="") RecipientsInfo=RecipientsInfo_"  From: "_..MailMessage.From_$$$CRLF
-	Set:(..MailMessage.To.Count()>0) RecipientsInfo=RecipientsInfo_"  To  : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.To,", ")_$$$CRLF
-	Set:(..MailMessage.Cc.Count()>0) RecipientsInfo=RecipientsInfo_"  Cc  : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.Cc,", ")_$$$CRLF
-	Set:(..MailMessage.Bcc.Count()>0) RecipientsInfo=RecipientsInfo_"  Bcc : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.Bcc,", ")_$$$CRLF
-	Set RecipientsInfo=RecipientsInfo_"============================================================"_$$$CRLF
-	If ..IsHTML {
-		Set RecipientsInfo=$$$Replace(RecipientsInfo,$$$CRLF,"<BR>")
-		Set RecipientsInfo=RecipientsInfo_"<BR>"
-	}
-	Quit RecipientsInfo
-]]></Implementation>
-</Method>
-
 <Method name="GeefBijlagen">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[	Quit ..Bijlagen