5 files changed, 9 insertions, 20 deletions
diff --git a/plugins/help/content/about.html b/plugins/help/content/about.html
index 69ac080b6..c5bc2f477 100644
--- a/plugins/help/content/about.html
+++ b/plugins/help/content/about.html
@@ -1,5 +1,5 @@
 <div id="helpabout">
-<h3 align="center">Copyright &copy; 2005-2009, The Roundcube Dev Team</h3>
+<h3 align="center">Copyright &copy; 2005-2010, The Roundcube Dev Team</h3>
 
 <p>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2
diff --git a/plugins/help/skins/default/help.css b/plugins/help/skins/default/help.css
index e0b01bbf0..7c17489be 100644
--- a/plugins/help/skins/default/help.css
+++ b/plugins/help/skins/default/help.css
@@ -5,19 +5,10 @@
   background-image: url('help.gif');
 }
 
-#help-box
+.help-box
 {
-  position: absolute;
-  bottom: 30px; 
-  top: 95px;
-  left: 20px;
-  right: 20px;
-  border: 1px solid #999999;
   overflow: auto;  
   background-color: #F2F2F2;
-  /* IE hack */
-  height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
-  width: expression((parseInt(document.documentElement.clientWight)-40)+'px');
 }
 
 #helplicense, #helpabout
diff --git a/plugins/help/skins/default/templates/help.html b/plugins/help/skins/default/templates/help.html
index a44a70168..42f1a4a93 100644
--- a/plugins/help/skins/default/templates/help.html
+++ b/plugins/help/skins/default/templates/help.html
@@ -30,11 +30,9 @@ function help_init_settings_tabs()
 <script type="text/javascript"> if (window.rcmail) rcmail.add_onload(help_init_settings_tabs);</script>
 </div>
 
-<div id="help-box">
+<div id="mainscreen" class="box help-box">
 <roundcube:object name="helpcontent" id="helpcontentframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
 </div>
 
-<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>
-
 </body>
 </html>
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/default/managesieve.css
index 4349084af..6160807b8 100644
--- a/plugins/managesieve/skins/default/managesieve.css
+++ b/plugins/managesieve/skins/default/managesieve.css
@@ -6,11 +6,11 @@
   position: absolute;
   left: 20px;
   top: 120px;
-  bottom: 30px;
+  bottom: 20px;
   border: 1px solid #999999;
   overflow: auto;
   /* css hack for IE */
-  height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-140)+'px');
 }
 
 #filters-table
@@ -151,12 +151,12 @@
   position: absolute;
   top: 120px;
   right: 20px;
-  bottom: 30px;
+  bottom: 20px;
   border: 1px solid #999999;
   overflow: hidden;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-30-parseInt(document.getElementById('filterslist').offsetLeft)-parseInt(document.getElementById('filterslist').offsetWidth))+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-40-parseInt(document.getElementById('filterslist').offsetWidth))+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-140)+'px');
 }
 
 #filter-frame
diff --git a/plugins/password/password.php b/plugins/password/password.php
index eb0a30b0f..d5412c8dc 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -179,7 +179,7 @@ class password extends rcube_plugin
         $table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
         $table->add(null, $input_confpasswd->show());
 
-        $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'),
+        $out = html::div(array('class' => 'box'),
             html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
             html::div(array('class' => 'boxcontent'), $table->show() .
             html::p(null,