diff --git a/VERSION b/VERSION
index 8ce028c9..0d8e203a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.1 (2012-10-18 13:02:13) dev
+Version 2.1.1 (2012-10-18 13:42:45) dev
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index 6555ab50..c8b1a93f 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -134,7 +134,7 @@ jQuery(document).ready(function(){
     <textarea style="width: auto; height:400px;direction:ltr;" rows="58" cols="100" -amy-enabled="true" id="body" name="data">{{=data}}</textarea>
     <script>window.eamy = eamy;</script>
     {{elif TEXT_EDITOR == 'codemirror':}}
-    <textarea style="width: auto; height:400px;direction:ltr;" id="body" name="data">{{=data}}</textarea>
+    <textarea style="width: auto; height:auto; direction:ltr;" id="body" name="data">{{=data}}</textarea>
     <script>
       function isFullScreen(instance) {
           return /\bCodeMirror-fullscreen\b/.test(instance.getWrapperElement().className);
@@ -197,6 +197,7 @@ jQuery(document).ready(function(){
          document.getElementById("body"),cm_opts);
       var hlLine = editor.setLineClass(0, "activeline");
       window.mirror = editor;
+      jQuery(function(){jQuery('.CodeMirror-scroll').css("height","auto").css("overflow-x","auto");});
     </script>
     {{elif TEXT_EDITOR == 'ace':}}
     <div id="editor" style="height: 500px; width: auto; position: relative">{{=data}}</div>