Index: TECH/Mail/Mail.cls.xml
===================================================================
diff -u -r514 -r515
--- TECH/Mail/Mail.cls.xml	(.../Mail.cls.xml)	(revision 514)
+++ TECH/Mail/Mail.cls.xml	(.../Mail.cls.xml)	(revision 515)
@@ -81,6 +81,11 @@
 <FormalSpec>String:%String</FormalSpec>
 </Method>
 
+<Method name="VoegToeLijn">
+<Abstract>1</Abstract>
+<FormalSpec>Tekst:%String</FormalSpec>
+</Method>
+
 <Method name="ZetInhoudStream">
 <Abstract>1</Abstract>
 <FormalSpec>Stream:%Stream</FormalSpec>
@@ -113,6 +118,16 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
+<Method name="GeefInhoud">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefOnderwerp">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="GeefOntvangers">
 <Abstract>1</Abstract>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: TECH/Context.cls.xml
===================================================================
diff -u -r514 -r515
--- TECH/Context.cls.xml	(.../Context.cls.xml)	(revision 514)
+++ TECH/Context.cls.xml	(.../Context.cls.xml)	(revision 515)
@@ -52,7 +52,7 @@
 </Method>
 
 <Method name="GeefMailAPI">
-<ReturnType>DOM.VKP.OrderAPI</ReturnType>
+<ReturnType>TECH.Mail.MailAPI</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefAPIObject(..#MailAPI)
 ]]></Implementation>
 </Method>
Index: TECH/Mail/impl/Mail.cls.xml
===================================================================
diff -u -r514 -r515
--- TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 514)
+++ TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 515)
@@ -176,23 +176,43 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOnderwerp">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Onderwerp
+]]></Implementation>
+</Method>
+
 <Method name="ZetInhoud">
-<FormalSpec>String:%String</FormalSpec>
+<FormalSpec>Tekst:%String</FormalSpec>
 <Implementation><![CDATA[
 	do ..MailMessage.TextData.Clear()
-	do ..VoegToeInhoud(String)
+	do ..VoegToeInhoud(Tekst)
 ]]></Implementation>
 </Method>
 
 <Method name="VoegToeInhoud">
-<FormalSpec>String:%String</FormalSpec>
+<FormalSpec>Tekst:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..MailMessage.TextData.Write( ..VervangXhtmlBreaksDoorNietXmlBreaksIndienHtmlMail(Tekst) )
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeLijn">
+<FormalSpec>Tekst:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..MailMessage.TextData.WriteLine( ..VervangXhtmlBreaksDoorNietXmlBreaksIndienHtmlMail(Tekst) )
+]]></Implementation>
+</Method>
+
+<Method name="VervangXhtmlBreaksDoorNietXmlBreaksIndienHtmlMail">
+<Description>
+Blijkbaar negeren sommige mail clients (met name Lotus Notes) XHTML break tags niet...</Description>
+<FormalSpec>Tekst:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ..IsHTML {
-		do ..MailMessage.TextData.WriteLine($Replace(String,"<BR/>","<BR>", , ,1))   ; ..VervangBRMetSlash(String))
-	}
-	Else {
-		do ..MailMessage.TextData.WriteLine(String)
-	}
+		Set Tekst = $Replace( Tekst, "<BR/>", "<BR>", , , /*case insensitive=*/ 1 )
+	} 
+	Quit Tekst
 ]]></Implementation>
 </Method>
 
@@ -204,6 +224,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefInhoud">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..MailMessage.TextData.ReadLine()
+]]></Implementation>
+</Method>
+
 <Method name="Verstuur">
 <Implementation><![CDATA[
 	set ..MailMessage.From = ..GeefVerzender()