diff --git a/e107_plugins/tinymce4/admin_config.php b/e107_plugins/tinymce4/admin_config.php
index d4d9dc2e3..e6efae484 100644
--- a/e107_plugins/tinymce4/admin_config.php
+++ b/e107_plugins/tinymce4/admin_config.php
@@ -56,9 +56,10 @@ e107::lan('tinymce4','admin', 'true');
 
 
 		protected $prefs = array(
-			'paste_as_text'		=> array('title'=> TMCEALAN_1, 'type'=>'boolean', 'data' => 'int','help'=> ''),
-			'browser_spellcheck' =>  array('title'=> TMCEALAN_2, 'type'=>'boolean', 'data' => 'int','help'=> TMCEALAN_3),
-			'visualblocks' =>  array('title'=> TMCEALAN_4, 'type'=>'boolean', 'data' => 'int','help'=> TMCEALAN_5),
+			'paste_as_text'		    => array('title'=> TMCEALAN_1, 'type'=>'boolean', 'data' => 'int','help'=> ''),
+			'browser_spellcheck'    => array('title'=> TMCEALAN_2, 'type'=>'boolean', 'data' => 'int','help'=> TMCEALAN_3),
+			'visualblocks'          => array('title'=> TMCEALAN_4, 'type'=>'boolean', 'data' => 'int','help'=> TMCEALAN_5),
+			'code_highlight_class'  => array('title'=> TMCEALAN_6, 'type'=>'text', 'data' => 'str','help'=> ''),
 
 		);
 
diff --git a/e107_plugins/tinymce4/languages/English_admin.php b/e107_plugins/tinymce4/languages/English_admin.php
index 1719f515f..fe1c7c4be 100644
--- a/e107_plugins/tinymce4/languages/English_admin.php
+++ b/e107_plugins/tinymce4/languages/English_admin.php
@@ -14,4 +14,5 @@ define("TMCEALAN_2", "Browser spellcheck");
 define("TMCEALAN_3", "Enable this if the browser internal spellchecker should be used.");
 define("TMCEALAN_4", "Visual Blocks");
 define("TMCEALAN_5", "Enable to make html blocks visible during editing.");
-?>
+define("TMCEALAN_6", "Code-Highlight CSS class.");
+
diff --git a/e107_plugins/tinymce4/plugin.xml b/e107_plugins/tinymce4/plugin.xml
index 2ed3b3553..72178400d 100644
--- a/e107_plugins/tinymce4/plugin.xml
+++ b/e107_plugins/tinymce4/plugin.xml
@@ -10,5 +10,6 @@
         <pref name="paste_as_text">0</pref>
         <pref name="browser_spellcheck">1</pref>
         <pref name="visualblocks">1</pref>
+        <pref name="code_highlight_class">prettyprint linenums</pref>
     </pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php
index 70c05c4d9..171ffe189 100644
--- a/e107_plugins/tinymce4/wysiwyg.php
+++ b/e107_plugins/tinymce4/wysiwyg.php
@@ -503,6 +503,8 @@ class wysiwyg
 
 		//@see http://www.tinymce.com/wiki.php/Configuration:formats
 
+		$codeHighlightClass = varset($tPref['code_highlight_class'], 'prettyprint linenums');
+
 		$formats = "[
                 {title: 'Headers', items: [
                     {title: 'Heading 1', block: 'h1'},
@@ -530,7 +532,7 @@ class wysiwyg
                     {title: 'Blockquote alt.', block: 'blockquote', classes: 'blockquote-alt blockquote__alternative'},
                     {title: 'Div', block: 'div'},
                     {title: 'Pre', block: 'pre'},
-                    {title: 'Code Highlighted', block: 'pre', classes: 'prettyprint linenums' }
+                    {title: 'Code Highlighted', block: 'pre', classes: '".$codeHighlightClass."' }
                 ]},
 
                   {title: 'Lists', items: [