diff --git a/package.json b/package.json
index 1bfee49c4c..90bf48cf88 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "babel-plugin-lodash": "^3.2.11",
     "chromatism": "^3.0.0",
     "diff": "^3.0.1",
-    "entities": "^1.1.2",
     "karma-mocha-reporter": "^2.2.1",
     "localforage": "^1.5.0",
     "node-sass": "^3.10.1",
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 68d02ce3ab..3e6247dfe2 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -11,8 +11,7 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
 import fileType from 'src/services/file_type/file_type.service'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
-import { filter, find } from 'lodash'
-import entities from 'entities'
+import { filter, find, unescape } from 'lodash'
 
 const Status = {
   name: 'Status',
@@ -197,12 +196,12 @@ const Status = {
       }
       if (this.status.summary && this.localCollapseSubjectDefault) {
         return false
-      }
+      } 
       return true
     },
     replySubject () {
       if (!this.status.summary) return ''
-      const decodedSummary = entities.decodeHTML(this.status.summary)
+      const decodedSummary = unescape(this.status.summary)
       const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
             ? this.$store.state.instance.subjectLineBehavior
             : this.$store.state.config.subjectLineBehavior