diff --git a/Dockerfile b/Dockerfile
index f50515d..51b07a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,8 @@ RUN composer install --working-dir /vanillapp/plugins/Topcoder
 RUN composer install --working-dir /vanillapp/plugins/Filestack
 # Install Groups dependencies
 RUN composer install --working-dir /vanillapp/plugins/Groups
+# Install TopcoderEditor dependencies
+RUN composer install --working-dir /vanillapp/plugins/TopcoderEditor
 # Copy Vanilla configuration files
 COPY ./config/vanilla/. /vanillapp/conf/.
 # Copy Topcoder Vanilla files
diff --git a/config/vanilla/config.php b/config/vanilla/config.php
index e9ebf1b..016ffe4 100644
--- a/config/vanilla/config.php
+++ b/config/vanilla/config.php
@@ -26,7 +26,7 @@
 $Configuration['EnabledPlugins']['stubcontent'] = false;
 $Configuration['EnabledPlugins']['Topcoder'] = true;
 $Configuration['EnabledPlugins']['TopcoderEditor'] = true;
-$Configuration['EnabledPlugins']['rich-editor'] = false;
+$Configuration['EnabledPlugins']['rich-editor'] = true;
 $Configuration['EnabledPlugins']['editor'] = false;
 $Configuration['EnabledPlugins']['emojiextender'] = true;
 $Configuration['EnabledPlugins']['GooglePrettify'] = true;
@@ -60,6 +60,7 @@
 $Configuration['Garden']['UpdateToken'] = '105e786dc643fd20143d3c137b593af168560c13';
 $Configuration['Garden']['InputFormatter'] = 'Markdown';
 $Configuration['Garden']['MobileInputFormatter'] = 'Markdown';
+$Configuration['Garden']['ForceInputFormatter'] = false;
 $Configuration['Garden']['Version'] = 'Undefined';
 $Configuration['Garden']['CanProcessImages'] = true;
 $Configuration['Garden']['Theme'] = 'topcoder';
diff --git a/vanilla/applications/vanilla/controllers/class.postcontroller.php b/vanilla/applications/vanilla/controllers/class.postcontroller.php
index 2485974..579fd7e 100644
--- a/vanilla/applications/vanilla/controllers/class.postcontroller.php
+++ b/vanilla/applications/vanilla/controllers/class.postcontroller.php
@@ -446,6 +446,9 @@ public function editDiscussion($discussionID = '', $draftID = '') {
             }
         } else {
             $record = $this->DiscussionModel->getID($discussionID);
+            // FIX: Issues-308: Editor - supporting old and new formats
+            $this->EventArguments['Discussion'] = &$record;
+            $this->fireEvent('BeforeEditDiscussion');
             $this->setData('Discussion', $record, true);
             $this->CategoryID = $this->Discussion->CategoryID;
         }