:sushi:

Closes #12, #227 and #58

1 files changed, 7 insertions, 3 deletions

diff --git a/src/api/serializers/messaging-message.ts b/src/api/serializers/messaging-message.ts
index da63f8b99e..4ab95e42a3 100644
--- a/src/api/serializers/messaging-message.ts
+++ b/src/api/serializers/messaging-message.ts
@@ -1,13 +1,12 @@
-'use strict';
-
 /**
  * Module dependencies
  */
 import * as mongo from 'mongodb';
+import deepcopy = require('deepcopy');
 import Message from '../models/messaging-message';
 import serializeUser from './user';
 import serializeDriveFile from './drive-file';
-import deepcopy = require('deepcopy');
+import parse from '../common/text';
 
 /**
  * Serialize a message
@@ -47,6 +46,11 @@ export default (
 	_message.id = _message._id;
 	delete _message._id;
 
+	// Parse text
+	if (_message.text) {
+		_message.ast = parse(_message.text);
+	}
+
 	// Populate user
 	_message.user = await serializeUser(_message.user_id, me);