Index: TECH/Mail/MailAPI.cls.xml
===================================================================
diff -u -r514 -r517
--- TECH/Mail/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 514)
+++ TECH/Mail/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 517)
@@ -7,6 +7,20 @@
 <Abstract>1</Abstract>
 <ReturnType>TECH.Mail.Mail</ReturnType>
 </Method>
+
+<Method name="VerstuurMail">
+<Abstract>1</Abstract>
+<FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
+</Method>
+
+<Method name="ZetAuthenticatie">
+<Abstract>1</Abstract>
+<FormalSpec>Gebruikersnaam:%String,Wachtwoord:%String</FormalSpec>
+</Method>
+
+<Method name="WisAuthenticatie">
+<Abstract>1</Abstract>
+</Method>
 </Class>
 
 
Index: TECH/Mail/impl/MailAPI.cls.xml
===================================================================
diff -u -r514 -r517
--- TECH/Mail/impl/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 514)
+++ TECH/Mail/impl/MailAPI.cls.xml	(.../MailAPI.cls.xml)	(revision 517)
@@ -3,11 +3,64 @@
 <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()
 ]]></Implementation>
 </Method>
+
+<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>
+</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>
+
+<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/MailUtils.cls.xml
===================================================================
diff -u -r393 -r517
--- TECH/MailUtils.cls.xml	(.../MailUtils.cls.xml)	(revision 393)
+++ TECH/MailUtils.cls.xml	(.../MailUtils.cls.xml)	(revision 517)
@@ -162,7 +162,7 @@
 
 <Method name="GetNsLookUpLine">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Rec</FormalSpec>
+<FormalSpec>Rec:%String</FormalSpec>
 <Implementation><![CDATA[
 	If (Rec["Name") Set %NsLookUp=1
 	Quit
@@ -171,7 +171,7 @@
 
 <Method name="GetNsLookUpLineMX">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Rec</FormalSpec>
+<FormalSpec>Rec:%String</FormalSpec>
 <Implementation><![CDATA[
 	If (Rec["mail exchanger") Set %NsLookUp=1
 	Quit
FishEye: Tag 517 refers to a dead (removed) revision in file `TECH/Mail/impl/MailPRA.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 517 refers to a dead (removed) revision in file `TECH/Mail/MailVerstuurder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 517 refers to a dead (removed) revision in file `TECH/Mail/SmtpMailVerstuurder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: TECH/Mail/Mail.cls.xml
===================================================================
diff -u -r515 -r517
--- TECH/Mail/Mail.cls.xml	(.../Mail.cls.xml)	(revision 515)
+++ TECH/Mail/Mail.cls.xml	(.../Mail.cls.xml)	(revision 517)
@@ -91,10 +91,6 @@
 <FormalSpec>Stream:%Stream</FormalSpec>
 </Method>
 
-<Method name="Verstuur">
-<Abstract>1</Abstract>
-</Method>
-
 <Method name="MailOmleiden">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
@@ -147,6 +143,11 @@
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
 </Method>
+
+<Method name="GeefMailMessage">
+<Abstract>1</Abstract>
+<ReturnType>%Net.MailMessage</ReturnType>
+</Method>
 </Class>
 
 
Index: TECH/Mail/impl/Mail.cls.xml
===================================================================
diff -u -r515 -r517
--- TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 515)
+++ TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 517)
@@ -58,11 +58,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SMTP">
-<Type>%Net.SMTP</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="MailMessage">
 <Type>%Net.MailMessage</Type>
 <Private>1</Private>
@@ -74,8 +69,6 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..SMTP = ##class(%Net.SMTP).%New()
-	Set ..SMTP.smtpserver=..GeefSMTPServer()
 	set ..MailMessage = ##class(%Net.MailMessage).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -230,7 +223,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Verstuur">
+<Method name="GeefMailMessage">
+<ReturnType>%Net.MailMessage</ReturnType>
 <Implementation><![CDATA[
 	set ..MailMessage.From = ..GeefVerzender()
 	set ..MailMessage.To = ..GeefOntvangers()
@@ -251,24 +245,10 @@
 		do ..MailMessage.AttachFile(##class(TECH.File).GetDirectory(Bijlage),##class(TECH.File).GetFilename(Bijlage),1)
 	}
 	
-	
-	#dim Status As %Status = ..SMTP.Send(..MailMessage)
-	
-	If $$$ISERR(Status)
-	{
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon geen mail versturen",Status))
-	}
-	Quit
+	Quit ..MailMessage
 ]]></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="MailOmleiden">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit (..Omleiden) && (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("vhLib.Mail_RedirectMailToDevelopment"))