diff --git a/admin/_config.php b/admin/_config.php
index bc696cc86..dcd812565 100644
--- a/admin/_config.php
+++ b/admin/_config.php
@@ -25,7 +25,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"
 ));
 
-HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen');
+HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen', 'autoresize');
 HtmlEditorConfig::get('cms')->enablePlugins(array('ssbuttons' => '../../../cms/javascript/tinymce_ssbuttons/editor_plugin_src.js'));
 			
 HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index 83b4c7d93..d9885188f 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -13,7 +13,7 @@ class HtmlEditorField extends TextareaField {
 	 */
 	static $use_gzip = true;
 
-	protected $rows = 30;
+	protected $rows = null;
 	
 	/**
 	 * Includes the JavaScript neccesary for this field to work using the {@link Requirements} system.
@@ -83,7 +83,6 @@ class HtmlEditorField extends TextareaField {
 			parent::getAttributes(),
 			array(
 				'tinymce' => 'true',
-				'style'   => 'width: 97%; height: ' . ($this->rows * 16) . 'px', // prevents horizontal scrollbars
 				'value' => null,
 			)
 		);