9 files changed, 25 insertions, 12 deletions
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index f04ca2981..5f32887fd 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 1d8c46b96..e2b835d7f 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -5,7 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/googiespell.css" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
@@ -16,10 +16,10 @@
 <!-- inline address book -->
 <div id="compose-contacts" class="uibox listbox">
 <h2 class="boxtitle"><roundcube:label name="contacts" /></h2>
-<div class="scroller withfooter">
 	<roundcube:object name="adressbooks" id="directorylist" class="listing" />
-	<roundcube:object name="addresslist" id="contacts-table" class="listing" noheader="true" />
-</div>
+	<div class="scroller withfooter">
+		<roundcube:object name="addresslist" id="contacts-table" class="listing" noheader="true" />
+	</div>
 <div class="boxfooter">
 	<roundcube:button command="add-recipient" prop="to" type="link" title="to" class="listbutton addto disabled" classAct="listbutton addto" innerClass="inner" content="To+" /><roundcube:button command="add-recipient" prop="cc" type="link" title="cc" class="listbutton addcc disabled" classAct="listbutton addcc" innerClass="inner" content="Cc+" /><roundcube:button command="add-recipient" prop="bcc" type="link" title="bcc" class="listbutton addbcc disabled" classAct="listbutton addbcc" innerClass="inner" content="Bcc+" />
 </div>
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index 0b263e9fe..0b19d1a7f 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
index a48821871..428ebcee0 100644
--- a/skins/larry/templates/identities.html
+++ b/skins/larry/templates/identities.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index 7c861e8d3..b155f9a69 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -34,5 +34,19 @@
 
 <roundcube:include file="/includes/footer.html" />
 
+<roundcube:object name="preloader" images="
+  /images/ajaxloader.gif
+  /images/buttons.png
+  /images/addcontact.png
+  /images/filetypes.png
+  /images/listicons.png
+  /images/messages.png
+  /images/quota.png
+  /images/messageicons.png
+  /images/selector.png
+  /images/splitter.png
+  /images/watermark.jpg
+" />
+
 </body>
 </html>
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index d82b8927d..2608c93f6 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -10,9 +10,8 @@
 	#mailpreviewframe { display: block; }
 <roundcube:endif />
 </style>
-
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 144d464be..2509662fe 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/plugin.html b/skins/larry/templates/plugin.html
index 3a589ff26..341f604ac 100644
--- a/skins/larry/templates/plugin.html
+++ b/skins/larry/templates/plugin.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 15ce1e94f..0b398351f 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />