Index: csp/vhLibError.cls.xml
===================================================================
diff -u -r108 -r307
--- csp/vhLibError.cls.xml	(.../vhLibError.cls.xml)	(revision 108)
+++ csp/vhLibError.cls.xml	(.../vhLibError.cls.xml)	(revision 307)
@@ -42,7 +42,7 @@
 	Do ##class(csp.errorvh).DefaultEHandlerInit(.lbErrTypes)
 	Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("LogDB","Email","ErrPage")
 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","LogDB")=$LB("DFL","TBX_Err_CSP",$LB("CustomLogError","cspBasis.GAProdTBox",1))
- 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
+ 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  	Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("%CSP.Error","OnPage")   ; $LB("","OnPageMinimum")
 	Quit
 	*/
@@ -85,7 +85,7 @@
 dehBuildArPageLoadError        ; PageLoadError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","ErrPage")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL")
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
  Set tmpAr("ACTIONS","ErrPage")=$LB("~")
  Quit
 dehBuildArPreHTTPTimeOut       ; PreHTTPTimeOut
@@ -95,7 +95,7 @@
 dehBuildArHyperEventError      ; HyperEventError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","JSAlert")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL")
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
  Set tmpAr("ACTIONS","JSAlert")=$LB("Error returned by server call")
  Quit 
 dehBuildArHyperEventTimeOut    ;HyperEventTimeOut
@@ -420,7 +420,7 @@
 <FormalSpec><![CDATA[lbArgs:%List,&arErrInfo:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-#define DflFrom      """NoValue"" <ICT@vanhoecke.be>"
+#define DflFrom      $$$SystemMail("NoValue")
 #define DflSubject   "CSP ERROR"
 	Quit:($G(lbArgs)=$LB("Skip")) ""  ; Don't send E-mail
 	New From,lbTo,Subject,Body,BodyIsStream,blnHTML,msg,CustomMsg,sc,tmpStream