diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
index 9df025037..37af26b40 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -2187,7 +2187,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
         }
         else
         {
-            message = event.content[kMXMessageBodyKey];
+            MXJSONModelSetString(message, event.content[kMXMessageBodyKey]);
         }
 
         if (_emojiOnlyTextFont && [MXKTools isEmojiOnlyString:message])