diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index 5bbd665468a..ac912e7cf44 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -158,7 +158,7 @@ class tinymce_texteditor extends texteditor {
             'plugins' => 'lists,table,style,layer,advhr,advlink,emotions,inlinepopups,' .
                 'searchreplace,paste,directionality,fullscreen,nonbreaking,contextmenu,' .
                 'insertdatetime,save,iespell,preview,print,noneditable,visualchars,' .
-                'xhtmlxtras,template,pagebreak,wrap',
+                'xhtmlxtras,template,pagebreak',
             'gecko_spellcheck' => true,
             'theme_advanced_font_sizes' => "1,2,3,4,5,6,7",
             'theme_advanced_layout_manager' => "SimpleLayout",
diff --git a/lib/editor/tinymce/plugins/wrap/pix/icon.png b/lib/editor/tinymce/plugins/wrap/pix/icon.png
deleted file mode 100644
index 3f21ab4b4ea..00000000000
Binary files a/lib/editor/tinymce/plugins/wrap/pix/icon.png and /dev/null differ
diff --git a/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js
index 95df13ae1d2..af3d992d4dc 100644
--- a/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js
+++ b/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js
@@ -46,7 +46,7 @@
             return '</td>' +
                    '<td style="position: relative" class="' + this.groupEndClass + '">' + separator + '</td>' +
                    '<td style="position: relative" class="' + this.groupStartClass + ' ' + this.wrapClass + '">' + separator + '</td>';
-        },
+        }
 
 
     });
@@ -60,7 +60,7 @@
          * @return mixed - false or the new control
          */
         createControl : function(name, cc) {
-            if (name === "wrap" || name === "!") {
+            if (name === "wrap") {
                 return new tinymce.ui.Wrap();
             }
             return false;
diff --git a/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif b/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif
deleted file mode 100644
index 1eea21982b6..00000000000
Binary files a/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif and /dev/null differ
diff --git a/lib/editor/tinymce/upgrade.txt b/lib/editor/tinymce/upgrade.txt
index ae7aa6ddbe2..a8b2c157424 100644
--- a/lib/editor/tinymce/upgrade.txt
+++ b/lib/editor/tinymce/upgrade.txt
@@ -5,6 +5,8 @@ information provided here is intended especially for developers.
 === 2.6 ===
 
 * added a new plugin to toggle the 2nd and 3rd toolbars
+* added a new plugin to wrap the toolbars on small screens.
+This plugin will be automatically added to existing toolbars by replacing the middle occurrence of | with "wrap".
 
 === 2.5 ===