Index: TECH/Mail/impl/SMTPVerzender.cls.xml
===================================================================
diff -u -r1577 -r1591
--- TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 1577)
+++ TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 1591)
@@ -20,9 +20,6 @@
 <Implementation><![CDATA[
 	Set ..SMTP = ##class(%Net.SMTP).%New()
 	Set ..SMTP.smtpserver=..GeefSMTPServer()
-
-	set ..MailMessage = ##class(%Net.MailMessage).%New()
-
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -71,6 +68,8 @@
 <FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
 <ReturnType>%Net.MailMessage</ReturnType>
 <Implementation><![CDATA[
+	set ..MailMessage = ##class(%Net.MailMessage).%New()
+
 	set ..MailMessage.From = Mail.GeefVerzender()
 	set ..MailMessage.To = Mail.GeefOntvangers()
 	set ..MailMessage.Cc = Mail.GeefOntvangersCC()
@@ -84,7 +83,9 @@
 		do ..WijzigOrigineleOntvangers()
 		do ..WijzigOrigineleVerzender()
 	}
- 
+	
+	do ..MailMessage.TextData.CopyFrom(Mail.GeefInhoud())
+	
 	set itBijlagen = ##class(TECH.ListIterator).%New(Mail.GeefBijlagen())
 	while itBijlagen.HasNext() {
 		#dim Bijlage As %String = itBijlagen.Next()
@@ -134,9 +135,9 @@
 	;set Stream = ##class(%GlobalCharacterStream).%New()
 	;do Stream.CopyFrom(Mail.GeefInhoud())
 		
-	do ..MailMessage.TextData.Clear()
+	;do ..MailMessage.TextData.Clear()
 	do ..MailMessage.TextData.WriteLine(..GeefOrigineleInfo())
-	do ..MailMessage.TextData.CopyFrom(Mail.GeefInhoud())
+	;do ..MailMessage.TextData.CopyFrom(Mail.GeefInhoud())
 ]]></Implementation>
 </Method>