diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 95fa9266b7..68ee5bf98a 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -148,22 +148,10 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 		});
 
 		socket.on('event:chats.userStartTyping', function(withUid) {
-			var typingNotifEl = $('.user-typing');
-
-			if (Chats.isCurrentChat(withUid)) {
-				typingNotifEl.removeClass('hide');
-			}
-
 			$('.chats-list li[data-uid="' + withUid + '"]').addClass('typing');
 		});
 
 		socket.on('event:chats.userStopTyping', function(withUid) {
-			var typingNotifEl = $('.user-typing');
-
-			if (Chats.isCurrentChat(withUid)) {
-				typingNotifEl.addClass('hide');
-			}
-
 			$('.chats-list li[data-uid="' + withUid + '"]').removeClass('typing');
 		});
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 54b8fbe93f..da4efcafd5 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -312,8 +312,6 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 					}
 				});
 
-				chatModal.find('.user-typing .text').translateText('[[modules:chat.user_typing, ' + data.username + ']]');
-
 				taskbar.push('chat', chatModal.attr('UUID'), {
 					title: data.username,
 					touid: data.touid,
@@ -459,14 +457,13 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 	}
 
 	module.appendChatMessage = function(chatModal, data, done) {
-		var chatContent = chatModal.find('#chat-content'),
-			typingNotif = chatModal.find('.user-typing');
+		var chatContent = chatModal.find('#chat-content');
 
 		Chats.parseMessage(data, function(html) {
 			var message = $(html);
 			message.find('img:not(".chat-user-image")').addClass('img-responsive');
 			message.find('.timeago').timeago();
-			message.insertBefore(typingNotif);
+			message.appendTo(chatContent);
 			Chats.scrollToBottom(chatContent);
 
 			if (typeof done === 'function') {