diff --git a/public/css/style.less b/public/css/style.less
index 5da5d4be06..de3353ad14 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -738,8 +738,9 @@ body .navbar .nodebb-inline-block {
 #chat-content {
 	width:95%;
 	height:200px;
+	resize:none;
 }
 
 #chat-message-input {
 	width:95%;
-}
\ No newline at end of file
+}
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index fc14592931..c2611a59ee 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -362,10 +362,13 @@
 		}
 
 		function sendMessage(chatModal, touid) {
-			var msg = app.strip_tags(chatModal.find('#chat-message-input').val()) + '\n';
-			socket.emit('sendChatMessage', { touid:touid, message:msg});
-			chatModal.find('#chat-message-input').val('');
-			appendChatMessage(chatModal, 'You : ' + msg);
+			var msg = app.strip_tags(chatModal.find('#chat-message-input').val());
+			if(msg.length) {
+				msg = msg +'\n';
+				socket.emit('sendChatMessage', { touid:touid, message:msg});
+				chatModal.find('#chat-message-input').val('');
+				appendChatMessage(chatModal, 'You : ' + msg);
+			}
 		}
 
 		socket.on('chatMessage', function(data){