From 3df7bae08cea1dbb848500c4a4affb8533541743 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 13 Jul 2016 17:32:00 +0300
Subject: [PATCH] closes #4834, closes #4830

---
 src/messaging.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/messaging.js b/src/messaging.js
index 276065158c..62dd569015 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -121,6 +121,7 @@ var async = require('async'),
 					message.self = self ? 1 : 0;
 					message.timestampISO = utils.toISOString(message.timestamp);
 					message.newSet = false;
+					message.roomId = String(message.roomId || roomId);
 					if (message.hasOwnProperty('edited')) {
 						message.editedISO = new Date(parseInt(message.edited, 10)).toISOString();
 					}