Index: TECH/Mail/impl/SMTPVerzender.cls.xml
===================================================================
diff -u -r1591 -r1593
--- TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 1591)
+++ TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 1593)
@@ -69,6 +69,7 @@
 <ReturnType>%Net.MailMessage</ReturnType>
 <Implementation><![CDATA[
 	set ..MailMessage = ##class(%Net.MailMessage).%New()
+	do ..MailMessage.TextData.Clear()
 
 	set ..MailMessage.From = Mail.GeefVerzender()
 	set ..MailMessage.To = Mail.GeefOntvangers()
@@ -79,9 +80,9 @@
 	set ..MailMessage.IsHTML= Mail.GeefIsHTML()
 	
 	if ..MailOmleiden(Mail) {
-		do ..VoegToeOrigineleInfo(Mail)
 		do ..WijzigOrigineleOntvangers()
 		do ..WijzigOrigineleVerzender()
+		do ..MailMessage.TextData.WriteLine(..GeefOrigineleInfo(Mail))
 	}
 	
 	do ..MailMessage.TextData.CopyFrom(Mail.GeefInhoud())
@@ -128,31 +129,19 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeOrigineleInfo">
+<Method name="GeefOrigineleInfo">
 <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:(Mail.GeefVerzender()'="") RecipientsInfo=RecipientsInfo_"  From: "_Mail.GeefVerzender()_$$$CRLF
+	Set:(Mail.GeefOntvangers().Count()>0) RecipientsInfo=RecipientsInfo_"  To  : "_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangers(),", ")_$$$CRLF
+	Set:(Mail.GeefOntvangersCC().Count()>0) RecipientsInfo=RecipientsInfo_"  Cc  : "_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersCC(),", ")_$$$CRLF
+	Set:(Mail.GeefOntvangersBCC().Count()>0) RecipientsInfo=RecipientsInfo_"  Bcc : "_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersBCC(),", ")_$$$CRLF
 	Set RecipientsInfo=RecipientsInfo_"============================================================"_$$$CRLF
-	If ..MailMessage.IsHTML {
+	If Mail.GeefIsHTML() {
 		Set RecipientsInfo=$$$Replace(RecipientsInfo,$$$CRLF,"<BR>")
 		Set RecipientsInfo=RecipientsInfo_"<BR>"
 	}