Index: TECH/Mail/impl/Mail.cls.xml
===================================================================
diff -u -r518 -r861
--- TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 518)
+++ TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 861)
@@ -209,6 +209,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVolledigeInhoudAlsStream">
+<ReturnType>%Stream</ReturnType>
+<Implementation><![CDATA[	Quit ..MailMessage.TextData
+]]></Implementation>
+</Method>
+
 <Method name="GeefMailMessage">
 <ReturnType>%Net.MailMessage</ReturnType>
 <Implementation><![CDATA[
Index: TECH/Mail/impl/MailAPI.cls.xml
===================================================================
diff -u -r521 -r861
--- TECH/Mail/impl/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 521)
+++ TECH/Mail/impl/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 861)
@@ -3,22 +3,6 @@
 <Class name="TECH.Mail.impl.MailAPI">
 <Super>TECH.Mail.MailAPI,%RegisteredObject</Super>
 
-<Property name="SMTP">
-<Type>%Net.SMTP</Type>
-</Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..SMTP = ##class(%Net.SMTP).%New()
-	Set ..SMTP.smtpserver=..GeefSMTPServer()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="MaakNieuwMail">
 <ReturnType>TECH.Mail.Mail</ReturnType>
 <Implementation><![CDATA[	Quit ##class(TECH.Mail.impl.Mail).%New()
@@ -36,40 +20,15 @@
 
 <Method name="VerstuurMail">
 <FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
-<Implementation><![CDATA[
-	Set ..SMTP = ##class(%Net.SMTP).%New()
-	Set ..SMTP.smtpserver=..GeefSMTPServer()
-	
-	#dim Status As %Status = ..SMTP.Send(Mail.GeefMailMessage())
-	
-	If $$$ISERR(Status)
-	{
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon geen mail versturen",Status))
-	}
-	Quit
+<Implementation><![CDATA[	Do ..GeefVerzender().Verzend(Mail)
 ]]></Implementation>
 </Method>
 
-<Method name="ZetAuthenticatie">
-<FormalSpec>Gebruikersnaam:%String,Wachtwoord:%String</FormalSpec>
-<Implementation><![CDATA[
-	set ..SMTP.authenticator = ##class(%Net.Authenticator).%New()
-	set ..SMTP.authenticator.UserName = Gebruikersnaam 
-	set ..SMTP.authenticator.Password = Wachtwoord
+<Method name="GeefVerzender">
+<ReturnType>TECH.Mail.Verzender</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Mail.impl.SMTPVerzender).%New()
 ]]></Implementation>
 </Method>
-
-<Method name="WisAuthenticatie">
-<Implementation><![CDATA[	set ..SMTP.authenticator = ""
-]]></Implementation>
-</Method>
-
-<Method name="GeefSMTPServer">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ##class(TECH.Config.ConfigMgr).Instance().GetString("MiniMail_SMTPServerNameOrIP")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: TECH/Mail/MailAPI.cls.xml
===================================================================
diff -u -r803 -r861
--- TECH/Mail/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 803)
+++ TECH/Mail/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 861)
@@ -19,14 +19,10 @@
 <FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
 </Method>
 
-<Method name="ZetAuthenticatie">
+<Method name="GeefVerzender">
 <Abstract>1</Abstract>
-<FormalSpec>Gebruikersnaam:%String,Wachtwoord:%String</FormalSpec>
+<ReturnType>TECH.Mail.Verzender</ReturnType>
 </Method>
-
-<Method name="WisAuthenticatie">
-<Abstract>1</Abstract>
-</Method>
 </Class>
 
 
Index: TECH/Mail/impl/SMTPVerzender.cls.xml
===================================================================
diff -u
--- TECH/Mail/impl/SMTPVerzender.cls.xml	(revision 0)
+++ TECH/Mail/impl/SMTPVerzender.cls.xml	(revision 861)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Mail.impl.SMTPVerzender">
+<Super>TECH.Mail.Verzender,TECH.RegisteredObject</Super>
+
+<Property name="SMTP">
+<Type>%Net.SMTP</Type>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SMTP = ##class(%Net.SMTP).%New()
+	Set ..SMTP.smtpserver=..GeefSMTPServer()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Verzend">
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+<Implementation><![CDATA[
+	
+	Set ..SMTP = ##class(%Net.SMTP).%New()
+	Set ..SMTP.smtpserver=..GeefSMTPServer()
+
+	#dim Status As %Status = ..SMTP.Send(Mail.GeefMailMessage())
+
+	If $$$ISERR(Status)
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon geen mail versturen",Status))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefSMTPServer">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ##class(TECH.Config.ConfigMgr).Instance().GetString("MiniMail_SMTPServerNameOrIP")
+]]></Implementation>
+</Method>
+
+<Method name="ZetAuthenticatie">
+<FormalSpec>Gebruikersnaam:%String,Wachtwoord:%String</FormalSpec>
+<Implementation><![CDATA[
+	set ..SMTP.authenticator = ##class(%Net.Authenticator).%New()
+	set ..SMTP.authenticator.UserName = Gebruikersnaam 
+	set ..SMTP.authenticator.Password = Wachtwoord
+]]></Implementation>
+</Method>
+
+<Method name="WisAuthenticatie">
+<Implementation><![CDATA[	set ..SMTP.authenticator = ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Mail/impl/MailAPIMetBestandVerzender.cls.xml
===================================================================
diff -u
--- TECH/Mail/impl/MailAPIMetBestandVerzender.cls.xml	(revision 0)
+++ TECH/Mail/impl/MailAPIMetBestandVerzender.cls.xml	(revision 861)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Mail.impl.MailAPIMetBestandVerzender">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Mail.impl.MailAPI,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="MockInstance">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BestandLocatie:%String</FormalSpec>
+<ReturnType>TECH.Mail.impl.MailAPIMetBestandVerzender</ReturnType>
+<Implementation><![CDATA[
+	do ##class(TECH.Context).Instance().PushMailAPIClassName("TECH.Mail.impl.MailAPIMetBestandVerzender")
+	#dim MailAPI As TECH.Mail.MailAPIMetBestandVerzender = ##class(TECH.Context).Instance().GeefMailAPI()
+	#dim BestandVerzender As TECH.Mail.Verzender = ##class(TECH.Mail.impl.BestandVerzender).%New(BestandLocatie)
+	Do MailAPI.IndienMethodCall("GeefVerzender").DanReturn(BestandVerzender)
+	Quit MailAPI
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerzender">
+<ReturnType>TECH.Mail.Verzender</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVerzender")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Mail/Mail.cls.xml
===================================================================
diff -u -r517 -r861
--- TECH/Mail/Mail.cls.xml	(.../Mail.cls.xml)	(revision 517)
+++ TECH/Mail/Mail.cls.xml	(.../Mail.cls.xml)	(revision 861)
@@ -119,6 +119,11 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
+<Method name="GeefVolledigeInhoudAlsStream">
+<Abstract>1</Abstract>
+<ReturnType>%Stream</ReturnType>
+</Method>
+
 <Method name="GeefOnderwerp">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
Index: TECH/Mail/Verzender.cls.xml
===================================================================
diff -u
--- TECH/Mail/Verzender.cls.xml	(revision 0)
+++ TECH/Mail/Verzender.cls.xml	(revision 861)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Mail.Verzender">
+<Abstract>1</Abstract>
+
+<Method name="Verzend">
+<Abstract>1</Abstract>
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Mail/impl/BestandVerzender.cls.xml
===================================================================
diff -u
--- TECH/Mail/impl/BestandVerzender.cls.xml	(revision 0)
+++ TECH/Mail/impl/BestandVerzender.cls.xml	(revision 861)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Mail.impl.BestandVerzender">
+<Super>TECH.Mail.Verzender,TECH.RegisteredObject</Super>
+
+<Property name="VerzondenMails">
+<Type>TECH.Mail.Mail</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Property name="BestandLocatie">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BestandLocatie:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..VerzondenMails = ##class(%ListOfObjects).%New()
+	Set ..BestandLocatie = BestandLocatie
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantalVerzondenMails">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..VerzondenMails.Count()
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerzondenMailIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..VerzondenMails)
+]]></Implementation>
+</Method>
+
+<Method name="Verzend">
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+<Implementation><![CDATA[
+	Do ..VerzondenMails.Insert(Mail)
+	Do ..SchrijfNaarBestand(Mail)
+]]></Implementation>
+</Method>
+
+<Method name="SchrijfNaarBestand">
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BestandVolledigeNaam As %String = ..BepaalBestandVolledigeNaam(Mail.GeefOnderwerp())
+ 	set File = ##class(TECH.File.FileWriter).%New(BestandVolledigeNaam)
+ 	Do File.WriteLine("Onderwerp: '"_Mail.GeefOnderwerp()_"'")
+ 	Do File.WriteLine("Verzender '"_Mail.GeefVerzender()_"'")
+ 	Do File.WriteLine("Ontvangers: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangers(),",")_"'")
+ 	Do File.WriteLine("Ontvangers CC: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersCC(),",")_"'")
+ 	Do File.WriteLine("Ontvangers BCC: '"_##class(TECH.ListUtils).ListToPieces(Mail.GeefOntvangersBCC(),",")_"'")
+ 	Do File.WriteLine("OrigineleOntvangersInfo: ")
+ 	Do File.WriteLine(Mail.GeefOrigineleOntvangersInfo())
+ 	Do File.WriteLine("----INHOUD------------------------------------------------")
+ 	Do File.WriteStream(Mail.GeefVolledigeInhoudAlsStream())
+ 	Do File.WriteLine()
+ 	Do File.WriteLine("----EINDE INHOUD------------------------------------------")
+	do File.Close()
+]]></Implementation>
+</Method>
+
+<Method name="BepaalBestandVolledigeNaam">
+<FormalSpec>Onderwerp:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim BestandVolledigeNaam As %String = ..BestandLocatie
+	Set BestandVolledigeNaam = ##class(TECH.Files).AppendFile(BestandVolledigeNaam,..VerzondenMails.Count()_"_"_Onderwerp_".txt")
+	Quit BestandVolledigeNaam
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>