Index: TECH/Mail/impl/SMTPVerzender.cls.xml
===================================================================
diff -u -r2731 -r2734
--- TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 2731)
+++ TECH/Mail/impl/SMTPVerzender.cls.xml	(.../SMTPVerzender.cls.xml)	(revision 2734)
@@ -26,17 +26,18 @@
 <Implementation><![CDATA[
 	Set ..MailMessageAanpasser = $$$Inject(MailMessageAanpasser,##class(TECH.Mail.impl.MailMessageAanpasser).%New())
 	
-	Set ..SMTP = ##class(%Net.SMTP).%New()
-	Set ..SMTP.smtpserver=..GeefSMTPServer()
+	Do ..InitSMTP()
+	
 	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()
+	If (..SMTP.smtpserver = "") {
+		Do ..InitSMTP()
+	}
 
 	#dim Status As %Status = ..SMTP.Send(..GeefMailMessage(Mail))
 
@@ -47,6 +48,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="InitSMTP">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..SMTP = ##class(%Net.SMTP).%New()
+	Set ..SMTP.smtpserver=..GeefSMTPServer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefSMTPServer">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>