2 files changed, 8 insertions, 0 deletions
diff --git a/Swift/resources/themes/Default/Template.html b/Swift/resources/themes/Default/Template.html
index e94701a..3885330 100755
--- a/Swift/resources/themes/Default/Template.html
+++ b/Swift/resources/themes/Default/Template.html
@@ -272,6 +272,10 @@
 		
 		var intervall_scroll;
 		function scrollToBottom() {
+			if (disableAutoScroll) {
+				return;
+			}
+
 			//document.body.scrollTop = (document.body.scrollHeight-window.innerHeight);
 			//return;
 			if( intervall_scroll ) clearInterval( intervall_scroll );
diff --git a/Swift/resources/themes/Default/main.css b/Swift/resources/themes/Default/main.css
index d2d4b57..25bd5bc 100755
--- a/Swift/resources/themes/Default/main.css
+++ b/Swift/resources/themes/Default/main.css
@@ -291,3 +291,7 @@ body {
 .outgoingItem .timeStamp {
 	color:#9ecf35;
 }
+
+html {
+	height: 101%;
+}