diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee
index 3d9606b..0c7b8dd 100644
--- a/file/js/be.bastelstu.Chat.litcoffee
+++ b/file/js/be.bastelstu.Chat.litcoffee
@@ -82,7 +82,6 @@ Initialize **Tims Chat**. Bind needed DOM events and initialize data structures.
 			return false if initialized
 			initialized = true
 			
-			messageContainerSize = $('.timsChatMessageContainer').height()
 			userListSize = $('#timsChatUserList').height()
 			
 			v.config = config
@@ -328,6 +327,8 @@ Toggle fullscreen mode.
 				$('.dropdownMenu').data 'orientationX', ''
 				
 				if $(@).data 'status'
+					messageContainerSize = $('.timsChatMessageContainer').height()
+					
 					$('html').addClass 'fullscreen'
 					do $(window).resize
 				else
diff --git a/file/style/be.bastelstu.chat.less b/file/style/be.bastelstu.chat.less
index 593b20f..1daf11f 100644
--- a/file/style/be.bastelstu.chat.less
+++ b/file/style/be.bastelstu.chat.less
@@ -145,9 +145,11 @@
 		}
 		
 		.timsChatMessageContainer {
+			min-height: 100px;
 			height: 300px;
 			overflow-y: scroll;
 			overflow-x: hidden;
+			resize: vertical;
 			
 			.timsChatMarkContainer {
 				display: none;
@@ -487,7 +489,6 @@
 	}
 }
 
-// TODO
 html.fullscreen {
 	html, body {
 		padding: 0;
@@ -518,6 +519,14 @@ html.fullscreen {
 		padding-bottom: 0;
 	}
 	
+	#tplChat {
+		#content {
+			.timsChatMessageContainer {
+				resize: none;
+			}
+		}
+	}
+	
 	#main, #content {
 		padding-top: 0;
 		border-top: none;