Index: AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml
===================================================================
diff -u -r38445 -r38447
--- AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml	(.../CustomerConverter.cls.xml)	(revision 38445)
+++ AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml	(.../CustomerConverter.cls.xml)	(revision 38447)
@@ -80,7 +80,7 @@
 	}
 	Set ..Customer.Fax = $Translate(..Partij.GeefTelefax(),",?;.:/=-_&|'(!)~{}[]^`%$=<>""","                        ")
 	Set ..Customer.VerkortNummer = ..Partij.GeefVerkortNummer()
-	Set ..Customer.Email = ..Partij.GeefEmail()
+	Set ..Customer.Email = $Translate(..Partij.GeefEmail(),"$#~","")
 	Set ..Customer.Taal = ..Formatter.FormatLanguageId(..Partij.GeefTaal())
 	Set ..Customer.BTWnummer = ..Formatter.FormatVATNumVoorDIXF(..Klant.GeefBTWNr())
 	Set ..Customer.Opmerking6 = $$$Replace(..Klant.GeefOpmerking6(),";","-")
Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/CustomerConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38445 -r38447
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/CustomerConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38445)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/CustomerConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38447)
@@ -445,6 +445,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: emailadres met # $ of ~ -&gt; eerste karakter verwijderen">
+<Implementation><![CDATA[
+	#dim GeconverteerdeKlant As AXBizTalk.Crm.Customer.Customer
+	
+	Do ..Partij.IndienMethodCall("GeefEmail").DanReturn("#info@example.com")
+	Set GeconverteerdeKlant = ..GeefCustomer(..Klant.GeefID())
+	Do $$$AssertEquals(GeconverteerdeKlant.Email,"info@example.com")
+	
+	Do ..Partij.IndienMethodCall("GeefEmail").DanReturn("$info@example.com")
+	Set GeconverteerdeKlant = ..GeefCustomer(..Klant.GeefID())
+	Do $$$AssertEquals(GeconverteerdeKlant.Email,"info@example.com")
+	
+	Do ..Partij.IndienMethodCall("GeefEmail").DanReturn("~info@example.com")
+	Set GeconverteerdeKlant = ..GeefCustomer(..Klant.GeefID())
+	Do $$$AssertEquals(GeconverteerdeKlant.Email,"info@example.com")
+]]></Implementation>
+</Method>
+
 <Method name="GeefCustomer">
 <FormalSpec>KlantId:%String</FormalSpec>
 <ReturnType>AXBizTalk.Crm.Customer.Customer</ReturnType>