diff --git a/e107_plugins/tinymce/e_meta.php b/e107_plugins/tinymce/e_meta.php
index b37711b4d..44f2f0e93 100644
--- a/e107_plugins/tinymce/e_meta.php
+++ b/e107_plugins/tinymce/e_meta.php
@@ -15,10 +15,12 @@
 if (!defined('e107_INIT')) { exit; }
 
 e107::css('inline','
-a.e-wysiwyg-toggle { margin-top:5px }
+	a.e-wysiwyg-toggle { margin-top:5px }
 ');
 
-if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php") )
+$pref = e107::getPref();
+
+if((e_WYSIWYG && check_class($pref['post_html'])) || strpos(e_SELF,"tinymce/admin_config.php") )
 {
 	if(e_PAGE != 'image.php')
 	{
diff --git a/e107_plugins/tinymce/plugins/e107bbcode/parser.php b/e107_plugins/tinymce/plugins/e107bbcode/parser.php
index aeffecb61..815c65f33 100644
--- a/e107_plugins/tinymce/plugins/e107bbcode/parser.php
+++ b/e107_plugins/tinymce/plugins/e107bbcode/parser.php
@@ -89,12 +89,12 @@ if($_POST['mode'] == 'tobbcode')
         
         echo ($content) ? "[html]".$content."[/html]" : ""; // Add the tags before saving to DB. 
     }
-    else  // bbcode Mode. 
+    else  // bbcode Mode. //XXX Disabled at the moment in tinymce/e_meta.php - post_html is required to activate. 
     {
      //   [img width=400]/e107_2.0/thumb.php?src={e_MEDIA_IMAGE}2012-12/e107org_white_stripe.png&w=400&h=0[/img]
        // $content = str_replace("{e_BASE}","", $content); // We want {e_BASE} in the final data going to the DB, but not the editor. 
    
-        echo e107::getBB()->htmltoBBcode($content);     
+        echo e107::getBB()->htmltoBBcode($content);   // not reliable enough yet.   
     }
 		
 }