diff --git a/app/js/controllers.js b/app/js/controllers.js
index 9152704d..81504e86 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2379,6 +2379,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
 
     function editMessage() {
       var text = $scope.draftMessage.text
+      text = RichTextProcessor.parseEmojis(text)
 
       AppMessagesManager.editMessage(editMessageID, text).then(function () {
         editMessageID = false