diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
index 37af26b40..2e196bc59 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1729,11 +1729,11 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
     NSString *body;
     if (event.content[kMXMessageContentKeyNewContent])
     {
-        body = event.content[kMXMessageContentKeyNewContent][kMXMessageBodyKey];
+        MXJSONModelSetString(body, event.content[kMXMessageContentKeyNewContent][kMXMessageBodyKey]);
     }
     else
     {
-        body = event.content[kMXMessageBodyKey];
+        MXJSONModelSetString(body, event.content[kMXMessageBodyKey]);
     }
     NSRange bodyRange = [str.string rangeOfString:body];
     if (bodyRange.location == NSNotFound)
@@ -1808,11 +1808,11 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
     NSString *body;
     if (event.content[kMXMessageContentKeyNewContent])
     {
-        body = event.content[kMXMessageContentKeyNewContent][kMXMessageBodyKey];
+        MXJSONModelSetString(body, event.content[kMXMessageContentKeyNewContent][kMXMessageBodyKey]);
     }
     else
     {
-        body = event.content[kMXMessageBodyKey];
+        MXJSONModelSetString(body, event.content[kMXMessageBodyKey]);
     }
     NSRange bodyRange = [str.string rangeOfString:body];
     if (bodyRange.location == NSNotFound)