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"))