diff --git a/package.json b/package.json
index ed70e73fd..c3b3e9e85 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "deepcopy": "0.6.3",
     "download": "5.0.3",
     "elasticsearch": "12.1.3",
+    "emojinize": "1.0.0",
     "escape-html": "1.0.3",
     "escape-regexp": "0.0.1",
     "event-stream": "3.3.4",
diff --git a/src/common/text/elements/emoji.js b/src/common/text/elements/emoji.js
new file mode 100644
index 000000000..e24231a22
--- /dev/null
+++ b/src/common/text/elements/emoji.js
@@ -0,0 +1,14 @@
+/**
+ * Emoji
+ */
+
+module.exports = text => {
+	const match = text.match(/^:[a-zA-Z0-9+-_]+:/);
+	if (!match) return null;
+	const emoji = match[0];
+	return {
+		type: 'emoji',
+		content: emoji,
+		emoji: emoji.substr(1, emoji.length - 2)
+	};
+};
diff --git a/src/common/text/index.js b/src/common/text/index.js
index 9da3a26b9..442416903 100644
--- a/src/common/text/index.js
+++ b/src/common/text/index.js
@@ -8,7 +8,8 @@ const elements = [
 	require('./elements/mention'),
 	require('./elements/hashtag'),
 	require('./elements/code'),
-	require('./elements/inline-code')
+	require('./elements/inline-code'),
+	require('./elements/emoji')
 ];
 
 function analyze(source) {
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js
index c9eb73e87..a3c1fe8dd 100644
--- a/src/web/app/common/scripts/text-compiler.js
+++ b/src/web/app/common/scripts/text-compiler.js
@@ -1,5 +1,6 @@
 const riot = require('riot');
 const nyaize = require('nyaize').default;
+const emojinize = require('emojinize');
 const CONFIG = require('./config');
 
 const escape = function(text) {
@@ -35,6 +36,8 @@ module.exports = function(tokens, shouldBreak, shouldEscape) {
 				return '<pre><code>' + token.html + '</code></pre>';
 			case 'inline-code':
 				return '<code>' + token.html + '</code>';
+			case 'emoji':
+				return emojinize.encode(token.content)
 		}
 	}).join('');