7 files changed, 56 insertions, 73 deletions
diff --git a/skins/default/common.css b/skins/default/common.css
index 8591ab7f7..66ea82dd0 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -333,6 +333,52 @@ img
   padding-right: 10px;
 }
 
+.boxlistcontent
+{
+  position: absolute;
+  top: 20px;
+  bottom: 22px;
+  left: 0;
+  right: 0;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.boxfooter
+{
+  position: absolute;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  height: 22px;
+  border-top: 1px solid #999;
+  background: url('images/listheader.gif') top left repeat-x #CCC;
+}
+
+.boxfooter a.button,
+.boxfooter a.buttonPas
+{
+  display: block;
+  float: left;
+  width: 34px;
+  height: 22px;
+  padding: 0px;
+  margin: 0;
+  overflow: hidden;
+  background: url('images/icons/groupactions.png') 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+.boxfooter a.groupactions
+{
+  background-position: 0 -26px;
+}
+
+.boxfooter a.buttonPas
+{
+  opacity: 0.35;
+}
+
 .popupmenu
 {
   position: absolute;
@@ -389,58 +435,6 @@ img
   background-color: #c00;
 }
 
-#directorylist-title
-{
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-}
-
-#directorylistwarp
-{
-  position: absolute;
-  top: 20px;
-  bottom: 22px;
-  left: 0;
-  right: 0;
-  overflow-y: auto;
-  overflow-x: hidden;
-}
-
-#directorylistbuttons
-{
-  display: block;
-  position: absolute;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  height: 22px;
-  border-top: 1px solid #999;
-  background: url('images/listheader.gif') top left repeat-x #CCC;
-}
-
-#directorylistbuttons a.button,
-#directorylistbuttons a.buttonPas
-{
-  display: block;
-  float: left;
-  width: 34px;
-  height: 22px;
-  padding: 0px;
-  margin: 0;
-  overflow: hidden;
-  background: url('images/icons/groupactions.png') 0 0 no-repeat transparent;
-  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
-}
-
-#directorylistbuttons a.groupactions {
-  background-position: 0 -26px;
-}
-
-#directorylistbuttons a.buttonPas {
-  opacity: 0.35;
-}
 
 
 /***** common table settings ******/
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index 12621f44f..c59bf6543 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -73,8 +73,8 @@ ul.toolbarmenu li.separator_below
   padding-bottom: 3px;
 }
 
-#directorylistbuttons,
-#groups-title,
+.boxfooter,
+.boxtitle,
 #directorylist li a
 {
   width: 100%;
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 20de7e1b3..b41391964 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -80,17 +80,6 @@ span.tablink-selected a
   border: 1px solid #999999;
 }
 
-#identitieslistwarp
-{
-  position: absolute;
-  top: 0px;
-  bottom: 22px;
-  left: 0;
-  right: 0;
-  overflow-y: auto;
-  overflow-x: hidden;
-}
-
 #listbuttons
 {
   position: absolute;
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index e15bf5fb1..974622210 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -36,11 +36,11 @@
 
 <div id="directorylistbox">
 <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div>
-<div id="directorylistwarp">
+<div class="boxlistcontent">
   <roundcube:object name="directorylist" id="directorylist" />
   <roundcube:object name="groupslist" id="contactgroupslist" />
 </div>
-<div id="directorylistbuttons">
+<div class="boxfooter">
   <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
   <roundcube:button name="groupactions" id="groupactionslink" type="link" title="groupactions" class="button groupactions" onclick="rcmail_ui.show_groupmenu();return false" content=" " />
 </div>
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 71b691bb8..30177ade0 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -12,10 +12,10 @@
 <roundcube:include file="/includes/settingstabs.html" />
 
 <div id="identities-list">
-<div id="identitieslistwarp">
+<div class="boxlistcontent" style="top: 0px">
 <roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
 </div>
-<div id="directorylistbuttons">
+<div class="boxfooter">
 <roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" />
 </div>
 </div>
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index 81822ae9a..55094a061 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -12,10 +12,10 @@
 <roundcube:include file="/includes/settingstabs.html" />
 
 <div id="identities-list">
-<div id="identitieslistwarp">
+<div class="boxlistcontent" style="top: 0px">
 <roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
 </div>
-<div id="directorylistbuttons">
+<div class="boxfooter">
 <roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" />
 </div>
 </div>
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 504d07efb..fadf8da24 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -27,10 +27,10 @@
 <div id="mailleftcontainer">
 <div id="mailboxlist-container">
 <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
-<div id="directorylistwarp">
+<div class="boxlistcontent">
 <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
 </div>
-<div id="directorylistbuttons">
+<div class="boxfooter">
   <!--><roundcube:button name="togglequota" type="link" title="showquota" class="buttonPas showinfo" classAct="button showinfo" onclick="rcmail_ui.toggle_quotadisplay();return false" content=" " />-->
   <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " />
 </div>