Index: TECH/Mail/impl/MailMessageAanpasser.cls.xml
===================================================================
diff -u -r2728 -r2780
--- TECH/Mail/impl/MailMessageAanpasser.cls.xml	(.../MailMessageAanpasser.cls.xml)	(revision 2728)
+++ TECH/Mail/impl/MailMessageAanpasser.cls.xml	(.../MailMessageAanpasser.cls.xml)	(revision 2780)
@@ -26,26 +26,29 @@
 	Set MailMessage.From = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(MailMessage.From)
 	Set MailMessage.Sender = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(MailMessage.Sender)
 	Set MailMessage.ReplyTo = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(MailMessage.ReplyTo)
-	Do ..MaakRecipientsAtVanhoeckeBe(MailMessage.To)
-	Do ..MaakRecipientsAtVanhoeckeBe(MailMessage.Cc)
-	Do ..MaakRecipientsAtVanhoeckeBe(MailMessage.Bcc)
+
+	Set MailMessage.To = ..MaakRecipientsAtVanhoeckeBe(MailMessage.To)
+	Set MailMessage.Cc = ..MaakRecipientsAtVanhoeckeBe(MailMessage.Cc)
+	Set MailMessage.Bcc = ..MaakRecipientsAtVanhoeckeBe(MailMessage.Bcc)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakRecipientsAtVanhoeckeBe">
-<FormalSpec><![CDATA[&ListOfRecipients:%ListOfDataTypes]]></FormalSpec>
+<FormalSpec>ListOfRecipients:%ListOfDataTypes</FormalSpec>
 <Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
+	Set AangepasteRecipients = ##class(%ListOfDataTypes).%New()
 	If $IsObject(ListOfRecipients) {
 		Set Iterator = ##class(TECH.ListIterator).%New(ListOfRecipients)
 		While (Iterator.HasNext()) {
-			#dim Recipient As %String = Iterator.Next()
-			#dim Key As %String = Iterator.Key()
-			Set Recipient = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(Recipient)
-			Do ListOfRecipients.SetAt(Recipient,Key)
+			#dim Recipient As %String = $$$Trim(Iterator.Next())
+			If $$$HasLength(Recipient) {
+				Do AangepasteRecipients.Insert(..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(Recipient))
+			}
 		}
 	}
-	Quit
+	Quit AangepasteRecipients
 ]]></Implementation>
 </Method>
 </Class>