diff --git a/public/language/en-GB/modules.json b/public/language/en-GB/modules.json
index 8f8e4ad1ed..3d46004ad1 100644
--- a/public/language/en-GB/modules.json
+++ b/public/language/en-GB/modules.json
@@ -1,5 +1,5 @@
 {
-	"chat.chatting_with": "Chat with <span id=\"chat-with-name\"></span>",
+	"chat.chatting_with": "Chat with",
 	"chat.placeholder": "Type chat message here, press enter to send",
 	"chat.send": "Send",
 	"chat.no_active": "You have no active chats.",
diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 59e923fb8a..44e2a2afd1 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -407,22 +407,10 @@ define('forum/chats', [
 	};
 
 	Chats.resizeMainWindow = function () {
-		var messagesList = $('.expanded-chat .chat-content');
-		var searchHeight = $('.chat-search').height();
-		var searchListHeight = $('[component="chat/search/list"]').outerHeight(true) - $('[component="chat/search/list"]').height();
-		var fromTop = components.get('chat/recent').offset().top;
-
-		if (messagesList.length) {
-			var margin = $('.expanded-chat ul').outerHeight(true) - $('.expanded-chat ul').height();
-			var inputHeight = $('.chat-input').outerHeight(true);
-
-			messagesList.height($(window).height() - (fromTop + inputHeight + (margin * 4)));
-			components.get('chat/recent').height($('.expanded-chat').height() - (searchHeight + searchListHeight));
-			$('[component="chat/search/list"]').css('max-height', (components.get('chat/recent').height() / 2) + 'px');
-		} else {
-			components.get('chat/recent').height($(window).height() - (fromTop + searchHeight + searchListHeight));
-		}
+		var viewportHeight = $(window).height();
+		var fromTop = components.get('chat/nav-wrapper').offset().top;
 
+		$('.chats-full').height(viewportHeight - fromTop);
 		Chats.setActive();
 	};