Index: branches/unlabeled/unlabeled-1.58.2/kernel/include/emailmessage.php
===================================================================
diff -u -r6137 -r6410
--- branches/unlabeled/unlabeled-1.58.2/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 6137)
+++ branches/unlabeled/unlabeled-1.58.2/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 6410)
@@ -901,6 +901,8 @@
 
     function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
     {
+		$charset = GetRegionalOption('Charset');
+
     	$HasFile = FALSE;
     	$HasFile = (strlen($FileName)>0);
     	$OB="----=_OuterBoundary_000".md5( uniqid (rand()));
@@ -963,7 +965,7 @@
     	if(strlen($Html)>0)
     	{
     		$msg .= "--" . $boundary . "\n";
-    		$msg .= "Content-Type: text/html; charset=\"iso-8859-1\""."\n";
+    		$msg .= "Content-Type: text/html; charset=\"".$charset."\""."\n";
     		$msg .= "Content-Transfer-Encoding:	8bit"."\n"."\n";
     		$msg .= stripslashes($Html);
     		$msg .= "\n"."\n";
Index: branches/unlabeled/unlabeled-1.15.2/core/kernel/utility/email.php
===================================================================
diff -u -r6103 -r6410
--- branches/unlabeled/unlabeled-1.15.2/core/kernel/utility/email.php	(.../email.php)	(revision 6103)
+++ branches/unlabeled/unlabeled-1.15.2/core/kernel/utility/email.php	(.../email.php)	(revision 6410)
@@ -34,7 +34,10 @@
 		//$this->TextBoundary = uniqid(adodb_mktime());
 		$this->EmailBoundary = uniqid(adodb_mktime());
 		$this->LineFeed = "\n";
-		$this->Charset='ISO-8859-1';
+		
+		$lang =& $this->Application->recallObject('lang.current');
+		$this->Charset = $lang->GetDBField('Charset') ? $lang->GetDBField('Charset') : 'ISO-8859-1';
+		
 		$this->TransferEncoding='8bit';
 		$this->Body = '';
 		$this->setHeader('Subject', 'Automatically generated message');
Index: branches/unlabeled/unlabeled-1.62.2/core/kernel/processors/main_processor.php
===================================================================
diff -u -r6367 -r6410
--- branches/unlabeled/unlabeled-1.62.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6367)
+++ branches/unlabeled/unlabeled-1.62.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6410)
@@ -898,7 +898,7 @@
 
 	function XMLTemplate($params)
 	{
-		define('DBG_SKIP_REPORTING', 1);
+		safeDefine('DBG_SKIP_REPORTING', 1);
 		$lang =& $this->Application->recallObject('lang.current');
 		header('Content-type: text/xml; charset='.$lang->GetDBField('Charset'));
 	}