diff --git a/CHANGES.md b/CHANGES.md
index 12e29d824..76cf1cb87 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@
 - The `/voice` MUC command didn't set the right role in order to grant voice again.
 
 ### New Features
+- Emojis are now sent in unicode instead of short names
 - #314 Add support for opening chat rooms with a URL fragment such as `#converse/room?jid=room@domain`
   and private chats with a URL fragment such as `#converse/chat?jid=user@domain`
 - #828 Add routing for the `#converse/login` and `#converse/register` URL
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 879a7ecdc..f62402c93 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -756,7 +756,7 @@
                         fullname,
                         sender: 'me',
                         time: moment().format(),
-                        message: text
+                        message: emojione.shortnameToUnicode(text)
                     });
                     this.sendMessage(message);
                 },