Index: TECH/Mail/impl/Mail.cls.xml
===================================================================
diff -u -r921 -r941
--- TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 921)
+++ TECH/Mail/impl/Mail.cls.xml	(.../Mail.cls.xml)	(revision 941)
@@ -220,8 +220,9 @@
 	set ..MailMessage.IsHTML=..IsHTML
 	
 	if ..MailOmleiden() {
-		do ..VoegToeInfoOrigineleOntvangers()
+		do ..VoegToeOrigineleInfo()
 		do ..WijzigOrigineleOntvangers()
+		do ..WijzigOrigineleVerzender()
 	}
  
 	set itBijlagen = ##class(TECH.ListIterator).%New(..Bijlagen)
@@ -240,40 +241,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="WijzigOrigineleVerzender">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..MailMessage.From = $$$SystemMail("Redirected mail")
+]]></Implementation>
+</Method>
+
 <Method name="WijzigOrigineleOntvangers">
+<Private>1</Private>
 <Implementation><![CDATA[
-
 	do ..MailMessage.To.Clear()
 	do ..MailMessage.Cc.Clear()
 	do ..MailMessage.Bcc.Clear()
 	
-	#dim RedirectTo As %String =##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
-	If RedirectTo="SYS"
-	{
-		set RedirectTo = ""
+	#dim RedirectTo As %String
+	#dim GebruikerInitialen As %String =##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
+	If ($$USERID^vhUSER(GebruikerInitialen) '= "") {
+		Set RedirectTo = GebruikerInitialen_"@vanhoecke.be"
+	}Else{
+		Set RedirectTo = ##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress")
 	}
-	Else
-	{
-		set RedirectTo = RedirectTo_"@vanhoecke.be"	
-	}
-	if RedirectTo="" set RedirectTo=##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress")
-	
-	if $length(RedirectTo) do ..MailMessage.To.Insert(RedirectTo)
-	
-	quit
+	If $length(RedirectTo) do ..MailMessage.To.Insert(RedirectTo)
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeInfoOrigineleOntvangers">
+<Method name="VoegToeOrigineleInfo">
 <Implementation><![CDATA[
 	set Stream = ##class(%GlobalCharacterStream).%New()
 	do Stream.CopyFrom(..MailMessage.TextData)
 		
 	do ..MailMessage.TextData.Clear()
-	do ..MailMessage.TextData.WriteLine(..GeefOrigineleOntvangersInfo())
+	do ..MailMessage.TextData.WriteLine(..GeefOrigineleInfo())
 	do ..MailMessage.TextData.CopyFrom(Stream)
-	
-	quit
 ]]></Implementation>
 </Method>
 
@@ -307,11 +306,12 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOrigineleOntvangersInfo">
+<Method name="GeefOrigineleInfo">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#define ListHasItems(%v)   ($IsObject(%v))&&(%v.Count()>0)
 	#dim RecipientsInfo As %String = "Intended Recipients : (redirected by configitem vhLib.Mail_RedirectMailToDevelopment)"_$$$CRLF
+	Set:(..MailMessage.From'="") RecipientsInfo=RecipientsInfo_"  From: "_..MailMessage.From_$$$CRLF
 	Set:(..MailMessage.To.Count()>0) RecipientsInfo=RecipientsInfo_"  To  : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.To,", ")_$$$CRLF
 	Set:(..MailMessage.Cc.Count()>0) RecipientsInfo=RecipientsInfo_"  Cc  : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.Cc,", ")_$$$CRLF
 	Set:(..MailMessage.Bcc.Count()>0) RecipientsInfo=RecipientsInfo_"  Bcc : "_##class(TECH.ListUtils).ListToPieces(..MailMessage.Bcc,", ")_$$$CRLF