diff --git a/.meteor/packages b/.meteor/packages
index 69d9ba153..b1e1eb7d9 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -144,4 +144,4 @@ rajit:bootstrap3-datepicker-zh-cn
 rajit:bootstrap3-datepicker-zh-tw
 staringatlights:fast-render
 spacebars
-georgemccann:meteor-emoji-picker
+easylogic:summernote
diff --git a/.meteor/versions b/.meteor/versions
index 5fed3db63..be5529b9c 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -56,6 +56,7 @@ ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.6.0
+easylogic:summernote@0.8.8
 ecmascript@0.15.0
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
@@ -67,7 +68,6 @@ fastclick@1.0.13
 fetch@0.1.1
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
-georgemccann:meteor-emoji-picker@0.1.74
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.0.11
@@ -226,6 +226,7 @@ templating-runtime@1.3.2
 templating-tools@1.1.2
 tmeasday:check-npm-versions@0.3.2
 tracker@1.2.0
+twbs:bootstrap@3.3.6
 ui@1.0.13
 underscore@1.0.10
 url@1.3.1
diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade
index 9baf95099..dbd617154 100644
--- a/client/components/main/editor.jade
+++ b/client/components/main/editor.jade
@@ -4,7 +4,6 @@ template(name="editor")
     class="{{class}}"
     id=id
     autofocus=autofocus
-    data-meteor-emoji="true"
     placeholder="{{_ 'comment-placeholder'}}")
     +Template.contentBlock
 
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 4b0783d20..bd7260c2b 100644
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -1,5 +1,4 @@
 Template.editor.onRendered(() => {
-  new MeteorEmoji();
   const textareaSelector = 'textarea';
   const mentions = [
     // User mentions
@@ -100,9 +99,7 @@ Template.editor.onRendered(() => {
     if (inputs.length === 0) {
       // only enable richereditor to new comment or edit comment no others
       enableTextarea();
-    }
-    /*
-      else {
+    } else {
       const placeholder = inputs.attr('placeholder') || '';
       const mSummernotes = [];
       const getSummernote = function(input) {
@@ -261,7 +258,6 @@ Template.editor.onRendered(() => {
         });
       });
     }
-    */
   } else {
     enableTextarea();
   }