diff --git a/lib/editor/tinymce/tiny_mce/3.4.6/plugins/spellchecker/classes/PSpell.php b/lib/editor/tinymce/tiny_mce/3.4.6/plugins/spellchecker/classes/PSpell.php
index cac33bb6a59..2ab09da3e8b 100644
--- a/lib/editor/tinymce/tiny_mce/3.4.6/plugins/spellchecker/classes/PSpell.php
+++ b/lib/editor/tinymce/tiny_mce/3.4.6/plugins/spellchecker/classes/PSpell.php
@@ -21,7 +21,7 @@ class PSpell extends SpellChecker {
 		$outWords = array();
 		foreach ($words as $word) {
 			if (!pspell_check($plink, trim($word)))
-				$outWords[] = utf8_encode($word);
+				$outWords[] = $word;
 		}
 
 		return $outWords;
@@ -37,9 +37,6 @@ class PSpell extends SpellChecker {
 	function &getSuggestions($lang, $word) {
 		$words = pspell_suggest($this->_getPLink($lang), $word);
 
-		for ($i=0; $i<count($words); $i++)
-			$words[$i] = utf8_encode($words[$i]);
-
 		return $words;
 	}
 
@@ -56,7 +53,7 @@ class PSpell extends SpellChecker {
 			$lang,
 			$this->_config['PSpell.spelling'],
 			$this->_config['PSpell.jargon'],
-			$this->_config['PSpell.encoding'],
+			empty($this->_config['PSpell.encoding']) ? 'utf-8' : $this->_config['PSpell.encoding'],
 			$this->_config['PSpell.mode']
 		);