Index: trunk/admin/config/addlang.php
===================================================================
diff -u -r898 -r954
--- trunk/admin/config/addlang.php	(.../addlang.php)	(revision 898)
+++ trunk/admin/config/addlang.php	(.../addlang.php)	(revision 954)
@@ -212,6 +212,7 @@
   }
 }
 
+	define('FORCE_CHARSET', $c->Get("Charset") );
   int_header($objListToolbar,NULL,$title);
 if ($objSession->GetVariable("HasChanges") == 1) {
 ?>
Index: trunk/admin/config/addlang_labels.php
===================================================================
diff -u -r822 -r954
--- trunk/admin/config/addlang_labels.php	(.../addlang_labels.php)	(revision 822)
+++ trunk/admin/config/addlang_labels.php	(.../addlang_labels.php)	(revision 954)
@@ -360,6 +360,8 @@
 
 $title = $title = GetTitle("la_Text_Pack", "la_tab_Labels", $c->Get('LanguageId'), $c->Get('LocalName'));///admin_language("la_Text_Configuration")." - '".$name."' ".admin_language("la_Text_Pack")." - ".admin_language("la_tab_Labels")." ($itemcount)";
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
+
+define('FORCE_CHARSET', $c->Get("Charset") );
 int_header($objListToolBar,NULL, $title,NULL,$h);
 
 if ($objSession->GetVariable("HasChanges") == 1) {
Index: trunk/admin/config/edit_label.php
===================================================================
diff -u -r721 -r954
--- trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 721)
+++ trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 954)
@@ -206,6 +206,20 @@
 
 $title = admin_language("la_Text_Editing")." ".admin_language("la_Text_Label");
 
+// substitute charset to match the ones from phrase: begin
+$tmp_id=GetVar('PhraseId');
+if($tmp_id)
+{
+	$tmp_id=explode(',',$tmp_id);
+	
+	$db=&GetADODBConnection();
+	$LangId=$db->GetOne('SELECT LanguageId FROM '.GetTablePrefix().'Phrase WHERE PhraseId='.$tmp_id[0]);
+	
+	$c = $objLanguages->GetItem($LangId);
+	define('FORCE_CHARSET', $c->Get("Charset") );
+}
+// substitute charset to match the ones from phrase: end
+
 int_header($objListToolBar,NULL,$title);
 ?>
 <form name="frmPhrase" ID="frmPhrase" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar;?>" method=POST>
Index: trunk/admin/include/elements.php
===================================================================
diff -u -r927 -r954
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 927)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 954)
@@ -122,6 +122,7 @@
         else
         {   
         	$charset = GetRegionalOption('Charset');
+        	if(defined('FORCE_CHARSET')&&FORCE_CHARSET) $charset=FORCE_CHARSET;
             print "<meta http-equiv=\"content-type\" content=\"text/html;charset=$charset\">\n";
             print "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n";
         }
Index: trunk/admin/config/addlang_email.php
===================================================================
diff -u -r872 -r954
--- trunk/admin/config/addlang_email.php	(.../addlang_email.php)	(revision 872)
+++ trunk/admin/config/addlang_email.php	(.../addlang_email.php)	(revision 954)
@@ -364,6 +364,7 @@
 $title = $title = GetTitle("la_Text_Pack", "la_tab_EmailEvents", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - '".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_EmailEvents");
 
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
+define('FORCE_CHARSET', $c->Get("Charset") );
 int_header($objListToolBar,NULL, $title,NULL,$h);
 
 if ($objSession->GetVariable("HasChanges") == 1) {
Index: trunk/admin/config/email_edit.php
===================================================================
diff -u -r898 -r954
--- trunk/admin/config/email_edit.php	(.../email_edit.php)	(revision 898)
+++ trunk/admin/config/email_edit.php	(.../email_edit.php)	(revision 954)
@@ -165,7 +165,8 @@
 $ado = &GetADODBConnection();
 
 /* page header */
-$charset = GetRegionalOption('Charset');
+
+$charset = $l->Get("Charset"); //GetRegionalOption('Charset');
 print <<<END
 <html>
 <head>