diff --git a/src/server/components/social.js b/src/server/components/social.js
index c7c60da0..f96ae37e 100644
--- a/src/server/components/social.js
+++ b/src/server/components/social.js
@@ -56,7 +56,7 @@ module.exports = {
 			data: {
 				messages: [{
 					class: color || 'q0',
-					message: msg,
+					msg,
 					type: 'chat'
 				}]
 			}
diff --git a/src/server/components/social/chat.js b/src/server/components/social/chat.js
index 6a5bb32b..bbaae1e8 100644
--- a/src/server/components/social/chat.js
+++ b/src/server/components/social/chat.js
@@ -3,21 +3,25 @@ const events = require('../../misc/events');
 const profanities = require('../../misc/profanities');
 const canChat = require('./canChat');
 
-const sendRegularMessage = ({ obj }, msg) => {
-	let charname = obj.auth.charname;
+const sendRegularMessage = ({ obj }, messageInfo) => {
+	const { source, msg, item } = messageInfo;
+
+	const prefix = roles.getRoleMessagePrefix(obj) || '';
+	const prefixClass = roles.getRoleMessageStyle(obj) || 'color-grayB';
 
-	let prefix = roles.getRoleMessagePrefix(obj) || '';
-	let msgStyle = roles.getRoleMessageStyle(obj) || 'color-grayB';
+	const msgClass = item ? `q${item.quality}` : 'color-grayB';
 
 	cons.emit('event', {
 		event: 'onGetMessages',
 		data: {
 			messages: [{
-				class: msgStyle,
-				message: prefix + charname + ': ' + msg.data.message,
-				item: msg.data.item,
 				type: 'chat',
-				source: obj.name
+				source,
+				prefix,
+				prefixClass,
+				msg,
+				msgClass,
+				item
 			}]
 		}
 	});
@@ -197,11 +201,12 @@ module.exports = (cpnSocial, msg) => {
 		return;
 	}
 
-	let msgEvent = {
+	const msgEvent = {
 		source: obj.auth.charname,
 		sourceObj: obj,
 		msg: messageString,
 		ignore: false,
+		item: msg.data.item,
 		error: null
 	};
 	events.emit('onBeforeSendMessage', msgEvent);
@@ -228,5 +233,5 @@ module.exports = (cpnSocial, msg) => {
 	if (!messageHandler)
 		return;
 
-	messageHandler(cpnSocial, msg);
+	messageHandler(cpnSocial, msgEvent);
 };
diff --git a/src/server/config/clientConfig.js b/src/server/config/clientConfig.js
index e0b84de5..9e087840 100644
--- a/src/server/config/clientConfig.js
+++ b/src/server/config/clientConfig.js
@@ -155,7 +155,6 @@ const config = {
 		'target',
 		'menu',
 		'spells',
-		'messages',
 		'online',
 		'mainMenu',
 		'context',
diff --git a/src/server/config/serverConfig.js b/src/server/config/serverConfig.js
index e6349fcc..e19e68be 100644
--- a/src/server/config/serverConfig.js
+++ b/src/server/config/serverConfig.js
@@ -8,7 +8,7 @@ module.exports = {
 	// sqlite
 	// rethink
 	//eslint-disable-next-line no-process-env
-	db: process.env.IWD_DB || 'sqlite',
+	db: process.env.IWD_DB || 'rethink',
 	//eslint-disable-next-line no-process-env
 	dbHost: process.env.IWD_DB_HOST || 'localhost',
 	//eslint-disable-next-line no-process-env