diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index 8dc1d8a582..64d0714353 100644
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -63,7 +63,7 @@ class TinyMCEPlugin extends Plugin
 
     function onEndShowStyles($action)
     {
-        $action->style('span#notice_data-text_container { float: left }');
+        $action->style('span#notice_data-text_container, span#notice_data-text_parent { float: left }');
         return true;
     }
 
@@ -136,7 +136,10 @@ class TinyMCEPlugin extends Plugin
             $('textarea#notice_data-text').tinymce({
                 script_url : '{$path}',
                 // General options
-                theme : "simple",
+                theme : "advanced",
+                theme_advanced_buttons1 : "bold,italic,strikethrough,|,undo,redo,|,link,unlink,image",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
                 add_form_submit_trigger : false
             });
             $('#notice_action-submit').click(function() {