From c40419bdfe866932fecf9fcb1f552312c669c228 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 12:00:52 +0200
Subject: Rename old 'default' skin folder to 'classic'

---
 skins/classic/README                             |   23 +
 skins/classic/addressbook.css                    |  413 ++++++
 skins/classic/common.css                         |  977 ++++++++++++++
 skins/classic/editor_content.css                 |   31 +
 skins/classic/functions.js                       |  831 ++++++++++++
 skins/classic/googiespell.css                    |  119 ++
 skins/classic/ie6hacks.css                       |  178 +++
 skins/classic/iehacks.css                        |  295 +++++
 skins/classic/images/abook_toolbar.gif           |  Bin 0 -> 5753 bytes
 skins/classic/images/abook_toolbar.png           |  Bin 0 -> 16395 bytes
 skins/classic/images/blank.gif                   |  Bin 0 -> 54 bytes
 skins/classic/images/buttons/add_act.png         |  Bin 0 -> 179 bytes
 skins/classic/images/buttons/add_pas.png         |  Bin 0 -> 197 bytes
 skins/classic/images/buttons/add_sel.png         |  Bin 0 -> 148 bytes
 skins/classic/images/buttons/bg.gif              |  Bin 0 -> 197 bytes
 skins/classic/images/cleardot.png                |  Bin 0 -> 101 bytes
 skins/classic/images/contactpic.png              |  Bin 0 -> 375 bytes
 skins/classic/images/dbutton.png                 |  Bin 0 -> 240 bytes
 skins/classic/images/dimple.png                  |  Bin 0 -> 174 bytes
 skins/classic/images/display/icons.gif           |  Bin 0 -> 2329 bytes
 skins/classic/images/display/icons.png           |  Bin 0 -> 4246 bytes
 skins/classic/images/display/loading.gif         |  Bin 0 -> 2942 bytes
 skins/classic/images/display/loading_blue.gif    |  Bin 0 -> 847 bytes
 skins/classic/images/favicon.ico                 |  Bin 0 -> 1150 bytes
 skins/classic/images/googiespell/change_lang.gif |  Bin 0 -> 111 bytes
 skins/classic/images/googiespell/indicator.gif   |  Bin 0 -> 722 bytes
 skins/classic/images/googiespell/ok.gif          |  Bin 0 -> 143 bytes
 skins/classic/images/googiespell/spellc.gif      |  Bin 0 -> 354 bytes
 skins/classic/images/icons/attachment.png        |  Bin 0 -> 657 bytes
 skins/classic/images/icons/blank.gif             |  Bin 0 -> 54 bytes
 skins/classic/images/icons/collapsed.png         |  Bin 0 -> 184 bytes
 skins/classic/images/icons/columnpicker.gif      |  Bin 0 -> 133 bytes
 skins/classic/images/icons/delete.png            |  Bin 0 -> 841 bytes
 skins/classic/images/icons/deleted.png           |  Bin 0 -> 543 bytes
 skins/classic/images/icons/dot.png               |  Bin 0 -> 244 bytes
 skins/classic/images/icons/down_small.gif        |  Bin 0 -> 106 bytes
 skins/classic/images/icons/expanded.png          |  Bin 0 -> 123 bytes
 skins/classic/images/icons/extwin.png            |  Bin 0 -> 263 bytes
 skins/classic/images/icons/flagged.png           |  Bin 0 -> 674 bytes
 skins/classic/images/icons/folders.gif           |  Bin 0 -> 2568 bytes
 skins/classic/images/icons/folders.png           |  Bin 0 -> 4957 bytes
 skins/classic/images/icons/forwarded.png         |  Bin 0 -> 315 bytes
 skins/classic/images/icons/forwarded_replied.png |  Bin 0 -> 375 bytes
 skins/classic/images/icons/glass.gif             |  Bin 0 -> 909 bytes
 skins/classic/images/icons/glass.png             |  Bin 0 -> 433 bytes
 skins/classic/images/icons/glass_roll.png        |  Bin 0 -> 544 bytes
 skins/classic/images/icons/groupactions.gif      |  Bin 0 -> 1602 bytes
 skins/classic/images/icons/groupactions.png      |  Bin 0 -> 1454 bytes
 skins/classic/images/icons/minus.gif             |  Bin 0 -> 82 bytes
 skins/classic/images/icons/plus.gif              |  Bin 0 -> 93 bytes
 skins/classic/images/icons/rename.png            |  Bin 0 -> 747 bytes
 skins/classic/images/icons/replied.png           |  Bin 0 -> 317 bytes
 skins/classic/images/icons/reset.gif             |  Bin 0 -> 164 bytes
 skins/classic/images/icons/silhouette.png        |  Bin 0 -> 255 bytes
 skins/classic/images/icons/sort.gif              |  Bin 0 -> 148 bytes
 skins/classic/images/icons/unflagged.png         |  Bin 0 -> 389 bytes
 skins/classic/images/icons/unread.png            |  Bin 0 -> 460 bytes
 skins/classic/images/icons/unread_children.png   |  Bin 0 -> 441 bytes
 skins/classic/images/icons/up_small.gif          |  Bin 0 -> 106 bytes
 skins/classic/images/listheader.gif              |  Bin 0 -> 322 bytes
 skins/classic/images/mail_footer.gif             |  Bin 0 -> 1336 bytes
 skins/classic/images/mail_footer.png             |  Bin 0 -> 1027 bytes
 skins/classic/images/mail_toolbar.gif            |  Bin 0 -> 12822 bytes
 skins/classic/images/mail_toolbar.png            |  Bin 0 -> 37571 bytes
 skins/classic/images/messageactions.gif          |  Bin 0 -> 1916 bytes
 skins/classic/images/messageactions.png          |  Bin 0 -> 2607 bytes
 skins/classic/images/messageicons.gif            |  Bin 0 -> 2226 bytes
 skins/classic/images/messageicons.png            |  Bin 0 -> 4868 bytes
 skins/classic/images/pagenav.gif                 |  Bin 0 -> 357 bytes
 skins/classic/images/quota-colors.png            |  Bin 0 -> 492 bytes
 skins/classic/images/quota.gif                   |  Bin 0 -> 998 bytes
 skins/classic/images/quota.png                   |  Bin 0 -> 216 bytes
 skins/classic/images/roundcube_logo.png          |  Bin 0 -> 7530 bytes
 skins/classic/images/searchfield.gif             |  Bin 0 -> 336 bytes
 skins/classic/images/tabs-left.gif               |  Bin 0 -> 295 bytes
 skins/classic/images/tabs-right.gif              |  Bin 0 -> 837 bytes
 skins/classic/images/taskbar.gif                 |  Bin 0 -> 2041 bytes
 skins/classic/images/taskbar.png                 |  Bin 0 -> 2425 bytes
 skins/classic/images/taskicons.gif               |  Bin 0 -> 1732 bytes
 skins/classic/images/taskicons.png               |  Bin 0 -> 1732 bytes
 skins/classic/images/tree.gif                    |  Bin 0 -> 92 bytes
 skins/classic/images/watermark.gif               |  Bin 0 -> 10237 bytes
 skins/classic/includes/header.html               |    2 +
 skins/classic/includes/links.html                |   13 +
 skins/classic/includes/messagetoolbar.html       |   65 +
 skins/classic/includes/settingstabs.html         |    8 +
 skins/classic/includes/taskbar.html              |    7 +
 skins/classic/mail.css                           | 1539 ++++++++++++++++++++++
 skins/classic/pngbehavior.htc                    |   84 ++
 skins/classic/print.css                          |  137 ++
 skins/classic/safari.css                         |   22 +
 skins/classic/settings.css                       |  215 +++
 skins/classic/splitter.js                        |  203 +++
 skins/classic/templates/about.html               |   35 +
 skins/classic/templates/addressbook.html         |  110 ++
 skins/classic/templates/compose.html             |  160 +++
 skins/classic/templates/contact.html             |   29 +
 skins/classic/templates/contactadd.html          |   41 +
 skins/classic/templates/contactedit.html         |   41 +
 skins/classic/templates/contactsearch.html       |   18 +
 skins/classic/templates/error.html               |   16 +
 skins/classic/templates/folderedit.html          |   26 +
 skins/classic/templates/folders.html             |   62 +
 skins/classic/templates/identities.html          |   46 +
 skins/classic/templates/identityedit.html        |   33 +
 skins/classic/templates/importcontacts.html      |   26 +
 skins/classic/templates/login.html               |   51 +
 skins/classic/templates/mail.html                |  203 +++
 skins/classic/templates/message.html             |   70 +
 skins/classic/templates/messageerror.html        |   78 ++
 skins/classic/templates/messagepart.html         |   25 +
 skins/classic/templates/messagepreview.html      |   20 +
 skins/classic/templates/messageprint.html        |   19 +
 skins/classic/templates/plugin.html              |   23 +
 skins/classic/templates/settings.html            |   41 +
 skins/classic/templates/settingsedit.html        |   22 +
 skins/classic/watermark.html                     |   19 +
 117 files changed, 6376 insertions(+)
 create mode 100644 skins/classic/README
 create mode 100644 skins/classic/addressbook.css
 create mode 100644 skins/classic/common.css
 create mode 100644 skins/classic/editor_content.css
 create mode 100644 skins/classic/functions.js
 create mode 100644 skins/classic/googiespell.css
 create mode 100644 skins/classic/ie6hacks.css
 create mode 100644 skins/classic/iehacks.css
 create mode 100644 skins/classic/images/abook_toolbar.gif
 create mode 100644 skins/classic/images/abook_toolbar.png
 create mode 100644 skins/classic/images/blank.gif
 create mode 100644 skins/classic/images/buttons/add_act.png
 create mode 100644 skins/classic/images/buttons/add_pas.png
 create mode 100644 skins/classic/images/buttons/add_sel.png
 create mode 100644 skins/classic/images/buttons/bg.gif
 create mode 100644 skins/classic/images/cleardot.png
 create mode 100644 skins/classic/images/contactpic.png
 create mode 100644 skins/classic/images/dbutton.png
 create mode 100644 skins/classic/images/dimple.png
 create mode 100644 skins/classic/images/display/icons.gif
 create mode 100644 skins/classic/images/display/icons.png
 create mode 100644 skins/classic/images/display/loading.gif
 create mode 100644 skins/classic/images/display/loading_blue.gif
 create mode 100644 skins/classic/images/favicon.ico
 create mode 100644 skins/classic/images/googiespell/change_lang.gif
 create mode 100644 skins/classic/images/googiespell/indicator.gif
 create mode 100644 skins/classic/images/googiespell/ok.gif
 create mode 100644 skins/classic/images/googiespell/spellc.gif
 create mode 100644 skins/classic/images/icons/attachment.png
 create mode 100644 skins/classic/images/icons/blank.gif
 create mode 100644 skins/classic/images/icons/collapsed.png
 create mode 100644 skins/classic/images/icons/columnpicker.gif
 create mode 100644 skins/classic/images/icons/delete.png
 create mode 100644 skins/classic/images/icons/deleted.png
 create mode 100644 skins/classic/images/icons/dot.png
 create mode 100644 skins/classic/images/icons/down_small.gif
 create mode 100644 skins/classic/images/icons/expanded.png
 create mode 100644 skins/classic/images/icons/extwin.png
 create mode 100644 skins/classic/images/icons/flagged.png
 create mode 100644 skins/classic/images/icons/folders.gif
 create mode 100644 skins/classic/images/icons/folders.png
 create mode 100644 skins/classic/images/icons/forwarded.png
 create mode 100644 skins/classic/images/icons/forwarded_replied.png
 create mode 100644 skins/classic/images/icons/glass.gif
 create mode 100644 skins/classic/images/icons/glass.png
 create mode 100644 skins/classic/images/icons/glass_roll.png
 create mode 100644 skins/classic/images/icons/groupactions.gif
 create mode 100644 skins/classic/images/icons/groupactions.png
 create mode 100644 skins/classic/images/icons/minus.gif
 create mode 100644 skins/classic/images/icons/plus.gif
 create mode 100644 skins/classic/images/icons/rename.png
 create mode 100644 skins/classic/images/icons/replied.png
 create mode 100644 skins/classic/images/icons/reset.gif
 create mode 100644 skins/classic/images/icons/silhouette.png
 create mode 100644 skins/classic/images/icons/sort.gif
 create mode 100644 skins/classic/images/icons/unflagged.png
 create mode 100644 skins/classic/images/icons/unread.png
 create mode 100644 skins/classic/images/icons/unread_children.png
 create mode 100644 skins/classic/images/icons/up_small.gif
 create mode 100644 skins/classic/images/listheader.gif
 create mode 100644 skins/classic/images/mail_footer.gif
 create mode 100644 skins/classic/images/mail_footer.png
 create mode 100644 skins/classic/images/mail_toolbar.gif
 create mode 100644 skins/classic/images/mail_toolbar.png
 create mode 100644 skins/classic/images/messageactions.gif
 create mode 100644 skins/classic/images/messageactions.png
 create mode 100644 skins/classic/images/messageicons.gif
 create mode 100644 skins/classic/images/messageicons.png
 create mode 100644 skins/classic/images/pagenav.gif
 create mode 100644 skins/classic/images/quota-colors.png
 create mode 100644 skins/classic/images/quota.gif
 create mode 100644 skins/classic/images/quota.png
 create mode 100644 skins/classic/images/roundcube_logo.png
 create mode 100644 skins/classic/images/searchfield.gif
 create mode 100644 skins/classic/images/tabs-left.gif
 create mode 100644 skins/classic/images/tabs-right.gif
 create mode 100644 skins/classic/images/taskbar.gif
 create mode 100644 skins/classic/images/taskbar.png
 create mode 100644 skins/classic/images/taskicons.gif
 create mode 100644 skins/classic/images/taskicons.png
 create mode 100644 skins/classic/images/tree.gif
 create mode 100644 skins/classic/images/watermark.gif
 create mode 100644 skins/classic/includes/header.html
 create mode 100644 skins/classic/includes/links.html
 create mode 100644 skins/classic/includes/messagetoolbar.html
 create mode 100644 skins/classic/includes/settingstabs.html
 create mode 100644 skins/classic/includes/taskbar.html
 create mode 100644 skins/classic/mail.css
 create mode 100644 skins/classic/pngbehavior.htc
 create mode 100644 skins/classic/print.css
 create mode 100644 skins/classic/safari.css
 create mode 100644 skins/classic/settings.css
 create mode 100644 skins/classic/splitter.js
 create mode 100644 skins/classic/templates/about.html
 create mode 100644 skins/classic/templates/addressbook.html
 create mode 100644 skins/classic/templates/compose.html
 create mode 100644 skins/classic/templates/contact.html
 create mode 100644 skins/classic/templates/contactadd.html
 create mode 100644 skins/classic/templates/contactedit.html
 create mode 100644 skins/classic/templates/contactsearch.html
 create mode 100644 skins/classic/templates/error.html
 create mode 100644 skins/classic/templates/folderedit.html
 create mode 100644 skins/classic/templates/folders.html
 create mode 100644 skins/classic/templates/identities.html
 create mode 100644 skins/classic/templates/identityedit.html
 create mode 100644 skins/classic/templates/importcontacts.html
 create mode 100644 skins/classic/templates/login.html
 create mode 100644 skins/classic/templates/mail.html
 create mode 100644 skins/classic/templates/message.html
 create mode 100644 skins/classic/templates/messageerror.html
 create mode 100644 skins/classic/templates/messagepart.html
 create mode 100644 skins/classic/templates/messagepreview.html
 create mode 100644 skins/classic/templates/messageprint.html
 create mode 100644 skins/classic/templates/plugin.html
 create mode 100644 skins/classic/templates/settings.html
 create mode 100644 skins/classic/templates/settingsedit.html
 create mode 100644 skins/classic/watermark.html

(limited to 'skins/classic')

diff --git a/skins/classic/README b/skins/classic/README
new file mode 100644
index 000000000..ba690d733
--- /dev/null
+++ b/skins/classic/README
@@ -0,0 +1,23 @@
+ROUNDCUBE WEBMAIL DEFAULT SKIN
+==============================
+
+This skin package contains the current development theme of the Roundcube
+Webmail software. It can be used, modified and redistributed according to
+the terms described in the LICENSE section.
+
+For information about building or modifiying Roundcube skins please visit
+http://trac.roundcube.net/wiki/Doc_Skins
+
+The theme uses icons originally designed by Stephen Horlander and Kevin Gerich
+for Mozilla.org. In case of redistribution giving credit to these artwork
+creators is mandatory.
+
+
+LICENSE
+-------
+The contents of this folder are subject to the Creative Commons
+Attribution-ShareAlike License. It is allowed to copy, distribute,
+transmit and to adapt the work by keeping credits to the original
+autors in the README file.
+See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+
diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css
new file mode 100644
index 000000000..a398325b4
--- /dev/null
+++ b/skins/classic/addressbook.css
@@ -0,0 +1,413 @@
+/***** Roundcube|Mail address book task styles *****/
+
+#abooktoolbar
+{
+  position: absolute;
+  top: 45px;
+  left: 225px;
+  height: 35px;
+}
+
+#abooktoolbar a
+{
+  padding-right: 10px;
+}
+
+#abooktoolbar a.button,
+#abooktoolbar a.buttonPas,
+#abooktoolbar span.separator {
+  display: block;
+  float: left;
+  width: 32px;
+  height: 32px;
+  padding: 0;
+  margin-right: 10px;
+  overflow: hidden;
+  background: url(images/abook_toolbar.png) 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+#abooktoolbar a.buttonPas {
+  opacity: 0.35;
+}
+
+#abooktoolbar a.addcontactSel {
+  background-position: 0 -32px;
+}
+
+#abooktoolbar a.compose {
+  background-position: -32px 0;
+}
+
+#abooktoolbar a.composeSel {
+  background-position: -32px -32px;
+}
+
+#abooktoolbar a.delete {
+  background-position: -64px 0;
+}
+
+#abooktoolbar a.deleteSel {
+  background-position: -64px -32px;
+}
+
+#abooktoolbar a.import {
+  background-position: -96px 0;
+}
+
+#abooktoolbar a.importSel {
+  background-position: -96px -32px;
+}
+
+#abooktoolbar a.export {
+  background-position: -128px 0;
+}
+
+#abooktoolbar a.exportSel {
+  background-position: -128px -32px;
+}
+
+#abooktoolbar span.separator {
+  width: 5px;
+  background-position: -162px 0;
+}
+
+#abooktoolbar a.search {
+  background-position: -170px 0;
+}
+
+#abooktoolbar a.searchSel {
+  background-position: -170px -32px;
+}
+
+#abookcountbar
+{
+  margin-top: 4px;
+  margin-left: 4px;
+  min-width: 250px;
+}
+
+#addressscreen
+{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 205px;
+}
+
+#directorylistbox
+{
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 195px;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  overflow: hidden;
+}
+
+#directorylistbox input
+{
+  margin: 0px;
+  font-size: 11px;
+  width: 90%;
+}
+
+#addresslist
+{
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  overflow: hidden;
+}
+
+#contactgroupslist
+{
+  border-top: 1px solid #999;
+}
+
+#addresslist
+{
+  left: 0px;
+  width: 280px;
+}
+
+#directorylist
+{
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  background-color: #FFFFFF;
+}
+
+#directorylist li
+{
+  display: block;
+  font-size: 11px;
+  background: url(images/icons/folders.png) 5px -108px no-repeat;
+  border-bottom: 1px solid #EBEBEB;
+  white-space: nowrap;
+}
+
+#directorylist li a
+{
+  cursor: default;
+  display: block;
+  padding-left: 25px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  text-decoration: none;
+  white-space: nowrap;
+}
+
+#directorylist li.contactgroup
+{
+  padding-left: 15px;
+  background-position: 20px -143px;
+}
+
+#directorylist li.contactsearch
+{
+  background-position: 6px -162px;
+}
+
+#directorylist li.selected
+{
+  background-color: #929292;
+  border-bottom: 1px solid #898989;
+}
+
+#directorylist li.selected a
+{
+  color: #FFF;
+  font-weight: bold;
+}
+
+#directorylist li.droptarget
+{
+  background-color: #FFFFA6;
+}
+
+#contacts-table
+{
+  width: 100%;
+  table-layout: fixed;
+}
+
+#contacts-table tbody td
+{
+  cursor: default;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
+
+#contacts-box
+{
+  position: absolute;
+  top: 0px;
+  left: 290px;
+  right: 0px;
+  bottom: 0px;
+  border: 1px solid #999999;
+  overflow: hidden;
+}
+
+body.iframe,
+#contact-frame
+{
+  background-color: #F2F2F2;
+  border: none;
+  min-height: 100%; /* Chrome 14 bug */
+}
+
+#contacttabs
+{
+	position: relative;
+	padding-bottom: 12px;
+}
+
+#contacttabs div.tabsbar {
+	top: 0;
+	left: 2px;
+}
+
+#contacttabs fieldset.tabbed {
+	position: relative;
+	top: 22px;
+	min-height: 5em;
+}
+
+#contacthead
+{
+	margin-bottom: 1em;
+	border: 0;
+	padding: 0;
+}
+
+#contacthead .names span.namefield,
+#contacthead .names input
+{
+	font-size: 140%;
+}
+
+#contacthead .displayname span.namefield
+{
+	font-size: 120%;
+}
+
+#contacthead span.nickname:before,
+#contacthead span.nickname:after,
+#contacthead input.ff_nickname:before,
+#contacthead input.ff_nickname:after
+{
+	content: '"';
+}
+
+#contacthead input
+{
+	margin-right: 6px;
+	margin-bottom: 0.2em;
+}
+
+#contacthead .names input,
+#contacthead .addnames input
+{
+	width: 180px;
+}
+
+#contacthead input.ff_prefix,
+#contacthead input.ff_suffix
+{
+	width: 90px;
+}
+
+#contacthead .addnames input.ff_name
+{
+	width: 374px;
+}
+
+#contactphoto
+{
+	float: right;
+	width: 60px;
+	margin-left: 3em;
+	margin-right: 4px;
+}
+
+#contactpic
+{
+	width: 60px;
+	min-height: 60px;
+	border: 1px solid #ccc;
+	background: white;
+}
+
+#contactpic img {
+	width: 60px;
+}
+
+#contactpic.droptarget.hover {
+	background-color: #f0f0ee;
+	box-shadow: 0 0 5px 0 #999;
+	-moz-box-shadow: 0 0 5px 0 #999;
+	-o-box-shadow: 0 0 5px 0 #999;
+}
+
+#contactphoto .formlinks
+{
+	margin-top: 0.5em;
+	text-align: center;
+}
+
+fieldset.contactfieldgroup
+{
+	border: 0;
+	margin: 0.5em 0;
+	padding: 0.2em 2px;
+}
+
+fieldset.contactfieldgroupmulti
+{
+	padding: 0.5em 2px;
+}
+
+fieldset.contactfieldgroup legend
+{
+	font-size: 0.9em;
+}
+
+.contactfieldgroup .row
+{
+	position: relative;
+	margin: 0.2em 0;
+}
+
+.contactfieldgroup .contactfieldlabel
+{
+	position: absolute;
+	top: 0;
+	left: 2px;
+	width: 110px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	color: #666;
+	font-weight: bold;
+}
+
+.contactfieldgroup .contactfieldlabel select
+{
+	width: 100%;
+	background: none;
+	border: 0;
+	color: #666;
+	font-weight: bold;
+	padding-left: 0;
+}
+
+.contactfieldgroup .contactfieldcontent
+{
+	padding-left: 120px;
+	min-height: 1em;
+	line-height: 1.3em;
+}
+
+.contactfieldgroup .contactfield {
+	line-height: 1.3em;
+}
+
+.contactcontrolleraddress .contactfieldcontent input {
+	margin-bottom: 0.1em;
+}
+
+.contactfieldcontent .contactfieldbutton {
+	vertical-align: middle;
+	margin-left: 0.5em;
+}
+
+#upload-form
+{
+	padding: 6px;
+}
+
+#upload-form div
+{
+	padding: 2px;
+}
+
+#sourcename
+{
+  color: #666;
+  font-size: 10px;
+  margin: -5px 0 8px 2px;
+}
+
+#contact-title
+{
+  /* fixes issue where tabs were overlapping box title when scrolling */
+  z-index: 10;
+}
diff --git a/skins/classic/common.css b/skins/classic/common.css
new file mode 100644
index 000000000..735a73614
--- /dev/null
+++ b/skins/classic/common.css
@@ -0,0 +1,977 @@
+/***** Roundcube|Mail basic styles *****/
+
+body
+{
+  font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+  margin: 8px;
+  background-color: #F6F6F6;
+  color: #000;
+  font-size: 12px;
+}
+
+body.iframe
+{
+  margin: 20px 0 0 0;
+  background-color: #FFF;
+}
+
+body.extwin
+{
+  margin: 10px;
+}
+
+td, th, div, p, select, input, textarea
+{
+  font-size: 12px;
+  font-family: inherit;
+}
+
+th
+{
+  font-weight: normal;
+}
+
+h3
+{
+  font-size: 18px;
+}
+
+a, a:active, a:visited
+{
+  color: #000;
+  outline: none;
+}
+
+a.button, a.button:visited, a.tab, a.tab:visited, a.axislist
+{
+  color: #000;
+  text-decoration: none;
+}
+
+a.tab
+{
+  width: 80px;
+  display: block;
+  text-align: center;
+}
+
+hr
+{
+  height: 1px;
+  background-color: #666;
+  border-style: none;
+}
+
+input[type="text"],
+input[type="button"],
+input[type="password"],
+textarea
+{
+  border: 1px solid #666;
+  color: #333;
+  background-color: #FFF;
+}
+
+input, textarea
+{
+  color: black;
+  padding: 1px 3px;
+}
+
+input.placeholder,
+textarea.placeholder,
+input:-moz-placeholder,
+textarea:-moz-placeholder
+{
+  color: #aaa;
+}
+
+input.button
+{
+  height: 20px;
+  color: #333333;
+  font-size: 12px;
+  padding-left: 8px;
+  padding-right: 8px;
+  background: url(images/buttons/bg.gif) repeat-x #f0f0f0;
+  border: 1px solid #a4a4a4;
+}
+
+input.button:hover
+{
+  color: black;
+}
+
+input.button[disabled],
+input.button[disabled]:hover
+{
+  color: #aaa;
+  border-color: #ccc;
+}
+
+input.mainaction
+{
+  font-weight: bold;
+  border: 1px solid #999;
+}
+
+img
+{
+  border: 0;
+}
+
+.alttext
+{
+  font-size: 11px;
+}
+
+.hint
+{
+  color: #666;
+  font-size: 11px;
+}
+
+.formlinks a,
+.formlinks a:visited
+{
+  color: #CC0000;
+  font-size: 11px;
+  text-decoration: none;
+}
+
+.formlinks a.disabled,
+.formlinks a.disabled:visited
+{
+  color: #999999;
+}
+
+/** common user interface objects */
+
+#mainscreen
+{
+  position: absolute;
+  top: 85px;
+  right: 20px;
+  bottom: 20px;
+  left: 20px;
+}
+
+body > #logo
+{
+  margin-left: 12px;
+  cursor: pointer;
+}
+
+#taskbar
+{
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  height: 24px;
+  left: 250px;
+  background: url(images/taskbar.png) top right no-repeat;
+  padding: 10px 6px 5px 0px;
+  text-align: right;
+  white-space: nowrap;
+  z-index: 2;
+}
+
+#taskbar a
+{
+  font-size: 11px;
+  color: #666666;
+  text-decoration: none;
+  padding: 6px 12px 6px 26px;
+  background: url(images/taskicons.gif) no-repeat;
+}
+
+#taskbar a:hover
+{
+  color: #333333;
+}
+
+#taskbar a.button-mail
+{
+  background-position: 0 0;
+}
+
+#taskbar a.button-addressbook
+{
+  background-position: 0 -25px;
+}
+
+#taskbar a.button-settings
+{
+  background-position: 0 -50px;
+}
+
+#taskbar a.button-logout
+{
+  background-position: 0 -75px;
+}
+
+body > #message
+{
+  position: absolute;
+  display: none;
+  top: -1px;
+  margin-left: -225px;
+  left: 50%;
+  z-index: 5000;
+  opacity: 0.85;
+}
+
+body > #message div
+{
+  width: 400px;
+  margin: 0px;
+  min-height: 22px;
+  padding: 8px 10px 8px 46px;
+}
+
+body > #message div.notice,
+body > #messagebody .part-notice,
+#message-objects div.notice
+{
+  background: url(images/display/icons.png) 6px 3px no-repeat;
+  background-color: #F7FDCB;
+  border: 1px solid #C2D071;
+}
+
+body > #message div.error,
+body > #message div.warning,
+#message-objects div.warning,
+#message-objects div.error
+{
+  background: url(images/display/icons.png) 6px -97px no-repeat;
+  background-color: #EF9398;
+  border: 1px solid #DC5757;
+}
+
+body > #message div.confirmation,
+#message-objects div.confirmation
+{
+  background: url(images/display/icons.png) 6px -47px no-repeat;
+  background-color: #A6EF7B;
+  border: 1px solid #76C83F;
+}
+
+body > #message div.loading,
+#message-objects div.loading
+{
+  background: url(images/display/loading.gif) 6px 3px no-repeat;
+  background-color: #EBEBEB;
+  border: 1px solid #CCCCCC;
+}
+
+body > #message a
+{
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+.box
+{
+  border: 1px solid #999;
+}
+
+.boxtitle
+{
+  height: 12px !important;
+  padding: 2px 10px 5px 5px;
+  border-bottom: 1px solid #999;
+  color: #333;
+  font-size: 11px;
+  font-weight: bold;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  white-space: nowrap;
+  background: url(images/listheader.gif) top left repeat-x #CCC;
+}
+
+.boxtitle .rightalign
+{
+  float: right;
+}
+
+body.iframe .boxtitle
+{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+
+.boxcontent
+{
+  padding: 15px 10px 10px 10px;
+  background-color: #F2F2F2;
+}
+
+.boxcontent table td.title
+{
+  color: #666;
+  padding-right: 10px;
+}
+
+.boxlistcontent
+{
+  position: absolute;
+  top: 20px;
+  bottom: 22px;
+  left: 0;
+  right: 0;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.boxsubject
+{
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  overflow: hidden;
+  height: 22px;
+  border-bottom: 1px solid #999;
+  background: url(images/listheader.gif) top left repeat-x #CCC;
+}
+
+.boxfooter
+{
+  position: absolute;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  overflow: hidden;
+  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.delgroup {
+  background-position: 0 -49px;
+}
+
+.boxfooter a.buttonPas
+{
+  opacity: 0.35;
+}
+
+.pagenav span
+{
+  color: #444;
+  font-size: 11px;
+  text-shadow: white 1px 1px;
+  white-space: nowrap;
+}
+
+.pagenav a.button,
+.pagenav a.buttonPas
+{
+  display: block;
+  float: left;
+  width: 11px;
+  height: 11px;
+  padding: 0;
+  margin: 1px;
+  margin-top: 2px;
+  overflow: hidden;
+  background: url(images/pagenav.gif) 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+.pagenav a.buttonPas {
+  opacity: 0.35;
+}
+
+.pagenav a.firstpageSel {
+  background-position: 0 -11px;
+}
+
+.pagenav a.prevpage {
+  background-position: -11px 0;
+}
+
+.pagenav a.prevpageSel {
+  background-position: -11px -11px;
+}
+
+.pagenav a.nextpage {
+  background-position: -22px 0;
+}
+
+.pagenav a.nextpageSel {
+  background-position: -22px -11px;
+}
+
+.pagenav a.lastpage {
+  background-position: -33px 0;
+}
+
+.pagenav a.lastpageSel {
+  background-position: -33px -11px;
+}
+
+.splitter
+{
+  user-select: none;
+  -moz-user-select: none;
+  -khtml-user-select: none;
+  position: absolute;
+  background: url(images/dimple.png) center no-repeat;
+}
+
+.splitter-h
+{
+  cursor: n-resize; cursor: row-resize;
+  background-position: center 2px;
+}
+
+.splitter-v
+{
+  cursor: e-resize; cursor: col-resize;
+  background-position: 2px center;
+}
+
+.popupmenu
+{
+  position: absolute;
+  top: 32px;
+  left: 90px;
+  width: auto;
+  display: none;
+  background-color: #fff;
+  background-color: rgba(255, 255, 255, 0.95);
+  border: 1px solid #999;
+  padding: 4px;
+  z-index: 240;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -moz-box-shadow: 1px 1px 12px #999;
+  -webkit-box-shadow: #999 1px 1px 12px;
+}
+
+.popupmenu ul
+{
+  margin: -4px 0;
+  padding: 0;
+  list-style: none;
+}
+
+.popupmenu ul li
+{
+  font-size: 11px;
+  white-space: nowrap;
+  min-width: 100px;
+  margin: 3px -4px;
+}
+
+.popupmenu li a
+{
+  display: block;
+  color: #a0a0a0;
+  padding: 2px 10px;
+  text-decoration: none;
+  min-height: 14px;
+  background: transparent;
+}
+
+.popupmenu li a.active,
+.popupmenu li a.active:active,
+.popupmenu li a.active:visited
+{
+  color: #333;
+}
+
+.popupmenu li a.active:hover,
+.popupmenu.selectable li a.selected:hover
+{
+  color: #fff;
+  background-color: #c00;
+}
+
+.popupmenu li.block input
+{
+  float: left;
+}
+
+.popupmenu.selectable li a.selected
+{
+  background: url(images/messageicons.png) 2px -372px no-repeat;
+}
+
+.popupmenu.selectable li a
+{
+  padding-left: 20px;
+}
+
+.darkbg
+{
+  background-color: #F2F2F2 !important;
+}
+
+.dropbutton,
+.dropbutton span
+{
+  float: left;
+  height: 32px;
+}
+
+.dropbutton:hover
+{
+/*  background: url(images/dbutton.png) 0 0 no-repeat transparent; */
+}
+
+.dropbutton span
+{
+  width: 9px;
+  background: url(images/dbutton.png) -53px 0 no-repeat transparent;
+}
+
+.dropbutton span:hover
+{
+  cursor: pointer;
+  background-position: -74px 0;
+}
+
+img.uploading
+{
+  width: 16px;
+  height: 16px;
+}
+
+/***** common table settings ******/
+
+table.records-table thead tr td
+{
+  height: 20px;
+  padding: 0px 4px 0px 4px;
+  vertical-align: middle;
+  border-bottom: 1px solid #999999;
+  color: #333333;
+  background: url(images/listheader.gif) top left repeat-x #CCC;
+  font-size: 11px;
+  font-weight: bold;
+}
+
+table.records-table tbody tr td
+{
+  height: 16px;
+  padding: 2px 4px 2px 4px;
+  font-size: 11px;
+  white-space: nowrap;
+  border-bottom: 1px solid #EBEBEB;
+  overflow: hidden;
+  text-align: left;  
+}
+
+table.records-table tr
+{
+  background-color: #FFFFFF;
+}
+
+table.records-table tr.selected td
+{
+  color: #FFFFFF;
+  background-color: #CC3333;
+}
+
+table.records-table tr.focused td
+{
+}
+
+table.records-table tr.unfocused td
+{
+  color: #FFFFFF;
+  background-color: #929292;
+}
+
+
+/***** mac-style quicksearch field *****/
+
+#quicksearchbar
+{
+  position: absolute;
+  top: 55px;
+  right: 10px;
+  width: 190px;
+  height: 20px;
+  text-align: right;
+  background: url(images/searchfield.gif) top left no-repeat;
+}
+
+#searchreset
+{
+  position: absolute;
+  top: 3px;
+  right: 12px;
+  text-decoration: none;
+}
+
+#searchmenulink
+{
+ position: absolute;
+ top: 3px;
+ right: 168px;
+}
+
+#quicksearchbar img
+{
+  vertical-align: middle;
+}
+
+#quicksearchbox
+{
+  position: absolute;
+  top: 2px;
+  left: 24px;
+  width: 140px;
+  height: 15px;
+  font-size: 11px;
+  padding: 0px;
+  border: none;
+}
+
+/***** roundcube webmail pre-defined classes *****/
+
+#rcmversion
+{
+  position: absolute;
+  bottom: 10px;
+  right: 20px;
+  text-align: right;
+  white-space: nowrap;
+  font-size: 8pt;
+  color: #999;
+}
+
+#rcmdraglayer
+{
+  min-width: 300px;
+  width: auto !important;
+  width: 300px;
+  border: 1px solid #999999;
+  background-color: #fff;
+  padding-left: 8px;
+  padding-right: 8px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  font-size: 11px;
+  white-space: nowrap;
+  opacity: 0.82;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -moz-box-shadow: 1px 1px 12px #999;
+  -webkit-box-shadow: #999 1px 1px 12px;
+}
+
+.draglayercopy:before
+{
+  position: absolute;
+  bottom: -5px;
+  left: -6px;
+  content: " ";
+  width: 14px;
+  height: 14px;
+  background: url(images/messageactions.png) -2px -128px no-repeat;
+}
+
+a.rcmContactAddress
+{
+  text-decoration: none;
+}
+
+a.rcmContactAddress:hover
+{
+  text-decoration: underline;
+}
+
+#rcmKSearchpane
+{
+  background-color: #F9F9F9;
+  border: 1px solid #CCCCCC;
+}
+
+#rcmKSearchpane ul
+{
+  margin: 0px;
+  padding: 2px;
+  list-style-image: none;
+  list-style-type: none;
+}
+
+#rcmKSearchpane ul li
+{
+  display: block;
+  height: 16px;
+  font-size: 11px;
+  padding-left: 6px;
+  padding-top: 2px;
+  padding-right: 6px;
+  white-space: nowrap;
+  cursor: pointer;
+}
+
+#rcmKSearchpane ul li.selected
+{
+  color: #ffffff;
+  background-color: #CC3333;
+}
+
+#login-form
+{
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+  width: 400px;
+  border: 1px solid #999;
+}
+
+#login-form table td.title
+{
+  text-align: right;
+  white-space: nowrap;
+}
+
+#login-form table
+{
+  width: 1%;
+  margin: auto;
+}
+
+#login-form table td.input input
+{
+  width: 200px;
+}
+
+#login-bottomline
+{
+	width: 400px;
+	margin: 5em auto;
+	font-size: 85%;
+	text-align: center;
+	color: #666;
+}
+
+#console
+{
+  opacity: 0.8;
+}
+
+.disabled,
+a.disabled
+{
+  color: #999;
+}
+
+font.bold
+{
+  font-weight: bold;
+}
+
+
+/***** onclick menu list *****/
+
+ul.toolbarmenu
+{
+  margin: -4px 0 -4px 0;
+  padding: 0;
+  list-style: none;
+}
+
+ul.toolbarmenu li
+{
+  font-size: 11px;
+  white-space: nowrap;
+  min-width: 130px;
+  margin: 2px -4px;
+}
+
+ul.toolbarmenu li a
+{
+  display: block;
+  color: #a0a0a0;
+  padding: 1px 12px 3px 28px;
+  text-decoration: none;
+  min-height: 14px;
+}
+
+ul.toolbarmenu li a.active,
+ul.toolbarmenu li a.active:active,
+ul.toolbarmenu li a.active:visited
+{
+  color: #333;
+}
+
+ul.toolbarmenu li input
+{
+  vertical-align: middle;
+}
+
+ul.toolbarmenu li hr
+{
+  color: #ccc;
+  width: 130px;
+  height: 1px;
+  margin: 2px 1px 2px 1px;
+}
+
+ul.toolbarmenu li img
+{
+  float: left;
+  margin: 0 2px;
+}
+
+div.popupmenu ul li.separator_below,
+ul.toolbarmenu li.separator_below
+{
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+}
+
+div.popupmenu ul li.separator_above,
+ul.toolbarmenu li.separator_above
+{
+  border-top: 1px solid #ccc;
+  margin-top: 2px;
+  padding-top: 2px;
+}
+
+#searchmenu
+{
+  width: 160px;
+}
+
+#searchmenu ul.toolbarmenu
+{
+  margin: 0;
+}
+
+#searchmenu ul.toolbarmenu li
+{
+  margin: 1px 4px 1px;
+}
+
+
+/***** tabbed interface elements *****/
+
+div.tabsbar,
+#tabsbar
+{
+  position: absolute;
+  top: 50px;
+  left: 220px;
+  right: 20px;
+  height: 22px;
+  border-bottom: 1px solid #999999;
+  white-space: nowrap;
+}
+
+div.tabsbar
+{
+  top: 35px;
+  left: 12px;
+  right: 12px;
+}
+
+span.tablink,
+span.tablink-selected
+{
+  float: left;
+  height: 23px !important;
+  height: 22px;
+  overflow: hidden;
+  background: url(images/tabs-left.gif) top left no-repeat;
+}
+
+span.tablink
+{
+  cursor: pointer;
+}
+
+span.tablink-selected
+{
+  cursor: default;
+  background-position: 0px -23px;
+}
+
+span.tablink a,
+span.tablink-selected a
+{
+  display: inline-block;
+  padding: 5px 10px 0 5px;
+  margin-left: 5px;
+  height: 23px;
+  color: #555555;
+  max-width: 185px;
+  text-decoration: none;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  background: url(images/tabs-right.gif) top right no-repeat;
+}
+
+span.tablink-selected a
+{
+  cursor: inherit;
+  color: #000000;
+  background-position: right -23px;
+}
+
+fieldset
+{
+  margin-bottom: 1em;
+  border: 1px solid #999999;
+  padding: 4px 8px 9px 8px; 
+}
+
+legend
+{
+  color: #999999;
+}
+
+fieldset.tabbed
+{
+  margin-top: 22px;
+  padding-top: 12px;
+}
+
+.quota_text {
+  text-align: center;
+  font-size: 10px;
+  color: #666;
+  border: 1px solid #999;
+  cursor: default;
+}
+.quota_bg { background-color: white; }
+.quota_high { background: url(images/quota-colors.png) repeat-x 0 -28px #f90509; }
+.quota_mid { background: url(images/quota-colors.png) repeat-x 0 -14px #e3e909; }
+.quota_low { background: url(images/quota-colors.png) repeat-x 0 0px #05f905; }
+.quota_text_high { color: white; }
+.quota_text_mid { color: #666; }
+.quota_text_low { color: #666; }
diff --git a/skins/classic/editor_content.css b/skins/classic/editor_content.css
new file mode 100644
index 000000000..aabed07b5
--- /dev/null
+++ b/skins/classic/editor_content.css
@@ -0,0 +1,31 @@
+/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
+
+body, td, pre {
+	font-family: "Lucida Grande", Verdana,  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+}
+
+body {
+	background-color: #FFFFFF;
+	margin-left: 4px;
+	margin-right: 4px;
+	margin-top: 2px;
+}
+
+pre
+{
+	margin: 0;
+	padding: 0;
+	white-space: -moz-pre-wrap !important;
+	white-space: pre-wrap !important;
+	white-space: pre;
+	word-wrap: break-word; /* IE (and Safari) */
+}
+
+blockquote
+{
+	padding-left: 5px;
+	border-left: #1010ff 2px solid;
+	margin-left: 5px;
+	width: 100%;
+}
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
new file mode 100644
index 000000000..48f9acd75
--- /dev/null
+++ b/skins/classic/functions.js
@@ -0,0 +1,831 @@
+/**
+ * Roundcube functions for default skin interface
+ */
+
+/**
+ * Settings
+ */
+
+function rcube_init_settings_tabs()
+{
+  var el, cl, container = $('#tabsbar'),
+    last_tab = $('span:last', container),
+    tab = '#settingstabdefault',
+    action = window.rcmail && rcmail.env.action ? rcmail.env.action : null;
+
+  // move About tab to the end
+  if (last_tab && last_tab.attr('id') != 'settingstababout' && (el = $('#settingstababout'))) {
+    cl = el.clone(true);
+    el.remove();
+    last_tab.after(cl);
+  }
+
+  // get selected tab
+  if (action)
+    tab = '#settingstab' + (action == 'preferences' ? 'default' : (action.indexOf('identity')>0 ? 'identities' : action.replace(/\./g, '')));
+
+  $(tab).addClass('tablink-selected');
+  $('a', tab).removeAttr('onclick').click(function() { return false; });
+}
+
+function rcube_show_advanced(visible)
+{
+  $('tr.advanced').css('display', (visible ? (bw.ie ? 'block' : 'table-row') : 'none'));
+}
+
+// Fieldsets-to-tabs converter
+// Warning: don't place "caller" <script> inside page element (id)
+function rcube_init_tabs(id, current)
+{
+  var content = $('#'+id),
+    fs = content.children('fieldset');
+
+  if (!fs.length)
+    return;
+
+  current = current ? current : 0;
+
+  // first hide not selected tabs
+  fs.each(function(idx) { if (idx != current) $(this).hide(); });
+
+  // create tabs container
+  var tabs = $('<div>').addClass('tabsbar').appendTo(content);
+
+  // convert fildsets into tabs
+  fs.each(function(idx) {
+    var tab, a, elm = $(this), legend = elm.children('legend');
+
+    // create a tab
+    a   = $('<a>').text(legend.text()).attr('href', '#');
+    tab = $('<span>').attr({'id': 'tab'+idx, 'class': 'tablink'})
+        .click(function() { rcube_show_tab(id, idx); return false })
+
+    // remove legend
+    legend.remove();
+    // style fieldset
+    elm.addClass('tabbed');
+    // style selected tab
+    if (idx == current)
+      tab.addClass('tablink-selected');
+
+    // add the tab to container
+    tab.append(a).appendTo(tabs);
+  });
+}
+
+function rcube_show_tab(id, index)
+{
+  var fs = $('#'+id).children('fieldset');
+
+  fs.each(function(idx) {
+    // Show/hide fieldset (tab content)
+    $(this)[index==idx ? 'show' : 'hide']();
+    // Select/unselect tab
+    $('#tab'+idx).toggleClass('tablink-selected', idx==index);
+  });
+}
+
+/**
+ * Mail UI
+ */
+
+function rcube_mail_ui()
+{
+  this.popups = {
+    markmenu:       {id:'markmessagemenu'},
+    replyallmenu:   {id:'replyallmenu'},
+    forwardmenu:    {id:'forwardmenu', editable:1},
+    searchmenu:     {id:'searchmenu', editable:1},
+    messagemenu:    {id:'messagemenu'},
+    listmenu:       {id:'listmenu', editable:1},
+    dragmessagemenu:{id:'dragmessagemenu', sticky:1},
+    groupmenu:      {id:'groupoptionsmenu', above:1},
+    mailboxmenu:    {id:'mailboxoptionsmenu', above:1},
+    composemenu:    {id:'composeoptionsmenu', editable:1, overlap:1},
+    spellmenu:      {id:'spellmenu'},
+    // toggle: #1486823, #1486930
+    uploadmenu:     {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux },
+    uploadform:     {id:'upload-form', editable:1, toggle:!bw.ie&&!bw.linux }
+  };
+
+  var obj;
+  for (var k in this.popups) {
+    obj = $('#'+this.popups[k].id)
+    if (obj.length)
+      this.popups[k].obj = obj;
+    else {
+      delete this.popups[k];
+    }
+  }
+}
+
+rcube_mail_ui.prototype = {
+
+show_popup: function(popup, show, config)
+{
+  var obj;
+  // auto-register menu object
+  if (!this.popups[popup] && (obj = $('#'+popup)) && obj.length)
+    this.popups[popup] = $.extend(config, {id: popup, obj: obj});
+
+  if (typeof this[popup] == 'function')
+    return this[popup](show);
+  else
+    return this.show_popupmenu(popup, show);
+},
+
+show_popupmenu: function(popup, show)
+{
+  var obj = this.popups[popup].obj,
+    above = this.popups[popup].above,
+    ref = rcube_find_object(popup+'link');
+
+  if (typeof show == 'undefined')
+    show = obj.is(':visible') ? false : true;
+  else if (this.popups[popup].toggle && show && this.popups[popup].obj.is(':visible') )
+    show = false;
+
+  if (show && ref) {
+    var parent = $(ref).parent(),
+      win = $(window),
+      pos = parent.hasClass('dropbutton') ? parent.offset() : $(ref).offset();
+
+    if (!above && pos.top + ref.offsetHeight + obj.height() > win.height())
+      above = true;
+    if (pos.left + obj.width() > win.width())
+      pos.left = win.width() - obj.width() - 30;
+
+    obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) });
+  }
+
+  obj[show?'show':'hide']();
+
+  if (bw.ie6 && this.popups[popup].overlap) {
+    $('select').css('visibility', show?'hidden':'inherit');
+    $('select', obj).css('visibility', 'inherit');
+  }
+},
+
+dragmessagemenu: function(show)
+{
+  this.popups.dragmessagemenu.obj[show?'show':'hide']();
+},
+
+forwardmenu: function(show)
+{
+  $("input[name='forwardtype'][value="+(rcmail.env.forward_attachment ? 1 : 0)+"]", this.popups.forwardmenu.obj)
+    .prop('checked', true);
+  this.show_popupmenu('forwardmenu', show);
+},
+
+uploadmenu: function(show)
+{
+  if (typeof show == 'object') // called as event handler
+    show = false;
+
+  // clear upload form
+  if (!show) {
+    try { $('#attachment-form form')[0].reset(); }
+    catch(e){}  // ignore errors
+  }
+
+  this.show_popupmenu('uploadmenu', show);
+
+  if (!document.all && this.popups.uploadmenu.obj.is(':visible'))
+    $('#attachment-form input[type=file]').click();
+},
+
+searchmenu: function(show)
+{
+  var obj = this.popups.searchmenu.obj,
+    ref = rcube_find_object('searchmenulink');
+
+  if (typeof show == 'undefined')
+    show = obj.is(':visible') ? false : true;
+
+  if (show && ref) {
+    var pos = $(ref).offset();
+    obj.css({left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
+
+    if (rcmail.env.search_mods) {
+      var n, all,
+        list = $('input:checkbox[name="s_mods[]"]', obj),
+        mbox = rcmail.env.mailbox,
+        mods = rcmail.env.search_mods;
+
+      if (rcmail.env.task == 'mail') {
+        mods = mods[mbox] ? mods[mbox] : mods['*'];
+        all = 'text';
+      }
+      else {
+        all = '*';
+      }
+
+      if (mods[all])
+        list.map(function() {
+          this.checked = true;
+          this.disabled = this.value != all;
+        });
+      else {
+        list.prop('disabled', false).prop('checked', false);
+        for (n in mods)
+          $('#s_mod_' + n).prop('checked', true);
+      }
+    }
+  }
+  obj[show?'show':'hide']();
+},
+
+set_searchmod: function(elem)
+{
+  var all, m, task = rcmail.env.task,
+    mods = rcmail.env.search_mods,
+    mbox = rcmail.env.mailbox;
+
+  if (!mods)
+    mods = {};
+
+  if (task == 'mail') {
+    if (!mods[mbox])
+      mods[mbox] = rcube_clone_object(mods['*']);
+    m = mods[mbox];
+    all = 'text';
+  }
+  else { //addressbook
+    m = mods;
+    all = '*';
+  }
+
+  if (!elem.checked)
+    delete(m[elem.value]);
+  else
+    m[elem.value] = 1;
+
+  // mark all fields
+  if (elem.value != all)
+    return;
+
+  $('input:checkbox[name="s_mods[]"]').map(function() {
+    if (this == elem)
+      return;
+
+    this.checked = true;
+    if (elem.checked) {
+      this.disabled = true;
+      delete m[this.value];
+    }
+    else {
+      this.disabled = false;
+      m[this.value] = 1;
+    }
+  });
+},
+
+listmenu: function(show)
+{
+  var obj = this.popups.listmenu.obj,
+    ref = rcube_find_object('listmenulink');
+
+  if (typeof show == 'undefined')
+    show = obj.is(':visible') ? false : true;
+
+  if (show && ref) {
+    var pos = $(ref).offset(),
+      menuwidth = obj.width(),
+      pagewidth = $(document).width();
+
+    if (pagewidth - pos.left < menuwidth && pos.left > menuwidth)
+      pos.left = pos.left - menuwidth;
+
+    obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
+    // set form values
+    $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
+    $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
+    $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
+    $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
+    $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
+    // list columns
+    var found, cols = $('input[name="list_col[]"]');
+    for (var i=0; i<cols.length; i++) {
+      if (cols[i].value != 'from')
+        found = jQuery.inArray(cols[i].value, rcmail.env.coltypes) != -1;
+      else
+        found = (jQuery.inArray('from', rcmail.env.coltypes) != -1
+	        || jQuery.inArray('to', rcmail.env.coltypes) != -1);
+      $(cols[i]).prop('checked', found);
+    }
+  }
+
+  obj[show?'show':'hide']();
+
+  if (show) {
+    var maxheight=0;
+    $('#listmenu fieldset').each(function() {
+      var height = $(this).height();
+      if (height > maxheight) {
+        maxheight = height;
+      }
+    });
+    $('#listmenu fieldset').css("min-height", maxheight+"px")
+    // IE6 complains if you set this attribute using either method:
+    //$('#listmenu fieldset').css({'height':'auto !important'});
+    //$('#listmenu fieldset').css("height","auto !important");
+      .height(maxheight);
+  };
+},
+
+open_listmenu: function(e)
+{
+  this.listmenu();
+},
+
+save_listmenu: function()
+{
+  this.listmenu();
+
+  var sort = $('input[name="sort_col"]:checked').val(),
+    ord = $('input[name="sort_ord"]:checked').val(),
+    thread = $('input[name="view"]:checked').val(),
+    cols = $('input[name="list_col[]"]:checked')
+      .map(function(){ return this.value; }).get();
+
+  rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
+},
+
+spellmenu: function(show)
+{
+  var link, li,
+    lang = rcmail.spellcheck_lang(),
+    menu = this.popups.spellmenu.obj,
+    ul = $('ul', menu);
+
+  if (!ul.length) {
+    ul = $('<ul>');
+
+    for (i in rcmail.env.spell_langs) {
+      li = $('<li>');
+      link = $('<a href="#">').text(rcmail.env.spell_langs[i])
+        .addClass('active').data('lang', i)
+        .click(function() {
+          rcmail.spellcheck_lang_set($(this).data('lang'));
+        });
+
+      link.appendTo(li);
+      li.appendTo(ul);
+    }
+
+    ul.appendTo(menu);
+  }
+
+  // select current language
+  $('li', ul).each(function() {
+    var el = $('a', this);
+    if (el.data('lang') == lang)
+      el.addClass('selected');
+    else if (el.hasClass('selected'))
+      el.removeClass('selected');
+  });
+
+  this.show_popupmenu('spellmenu', show);
+},
+
+body_mouseup: function(evt, p)
+{
+  var i, target = rcube_event.get_target(evt);
+
+  for (i in this.popups) {
+    if (this.popups[i].obj.is(':visible') && target != rcube_find_object(i+'link')
+      && !this.popups[i].toggle
+      && (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id))
+      && (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id)))
+    ) {
+      window.setTimeout('rcmail_ui.show_popup("'+i+'",false);', 50);
+    }
+  }
+},
+
+target_overlaps: function (target, elementid)
+{
+  var element = rcube_find_object(elementid);
+  while (target.parentNode) {
+    if (target.parentNode == element)
+      return true;
+    target = target.parentNode;
+  }
+  return false;
+},
+
+body_keydown: function(evt, p)
+{
+  if (rcube_event.get_keycode(evt) == 27) {
+    for (var k in this.popups) {
+      if (this.popups[k].obj.is(':visible'))
+        this.show_popup(k, false);
+    }
+  }
+},
+
+switch_preview_pane: function(elem)
+{
+  var uid, prev_frm = $('#mailpreviewframe');
+
+  if (elem.checked) {
+    rcmail.env.contentframe = 'messagecontframe';
+    if (mailviewsplit.layer) {
+      mailviewsplit.resize();
+      mailviewsplit.layer.elm.style.display = '';
+    }
+    else
+      mailviewsplit.init();
+
+    if (bw.opera) {
+      $('#messagelistcontainer').css({height: ''});
+    }
+    prev_frm.show();
+
+    if (uid = rcmail.message_list.get_single_selection())
+      rcmail.show_message(uid, false, true);
+  }
+  else {
+    prev_frm.hide();
+    if (bw.ie6 || bw.ie7) {
+      var fr = document.getElementById('mailcontframe');
+      fr.style.bottom = 0;
+      fr.style.height = parseInt(fr.parentNode.offsetHeight)+'px';
+    }
+    else {
+      $('#mailcontframe').css({height: 'auto', bottom: 0});
+      if (bw.opera)
+        $('#messagelistcontainer').css({height: 'auto'});
+    }
+    if (mailviewsplit.layer)
+      mailviewsplit.layer.elm.style.display = 'none';
+
+    rcmail.env.contentframe = null;
+    rcmail.show_contentframe(false);
+  }
+
+  rcmail.command('save-pref', {name: 'preview_pane', value: (elem.checked?1:0)});
+},
+
+/* Message composing */
+init_compose_form: function()
+{
+  var f, field, fields = ['cc', 'bcc', 'replyto', 'followupto'],
+    div = document.getElementById('compose-div'),
+    headers_div = document.getElementById('compose-headers-div');
+
+  // Show input elements with non-empty value
+  for (f=0; f<fields.length; f++) {
+    if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
+      rcmail_ui.show_header_form(fields[f]);
+  }
+
+  // prevent from form data loss when pressing ESC key in IE
+  if (bw.ie) {
+    var form = rcube_find_object('form');
+    form.onkeydown = function (e) {
+      if (rcube_event.get_keycode(e) == 27)
+        rcube_event.cancel(e);
+    };
+  }
+
+  $(window).resize(function() {
+    rcmail_ui.resize_compose_body();
+  });
+
+  $('#compose-container').resize(function() {
+    rcmail_ui.resize_compose_body();
+  });
+
+  div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px';
+  $(window).resize();
+},
+
+resize_compose_body: function()
+{
+  var div = $('#compose-div .boxlistcontent'), w = div.width(), h = div.height();
+  w -= 8;  // 2 x 3px padding + 2 x 1px border
+  h -= 4;
+
+  $('#compose-body_tbl').width((w+6)+'px').height('');
+  $('#compose-body_ifr').width((w+6)+'px').height((h-54)+'px');
+  $('#compose-body').width(w+'px').height(h+'px');
+  $('#googie_edit_layer').height(h+'px');
+},
+
+resize_compose_body_ev: function()
+{
+  window.setTimeout(function(){rcmail_ui.resize_compose_body();}, 100);
+},
+
+show_header_form: function(id)
+{
+  var row, s,
+    link = document.getElementById(id + '-link');
+
+  if ((s = this.next_sibling(link)))
+    s.style.display = 'none';
+  else if ((s = this.prev_sibling(link)))
+    s.style.display = 'none';
+
+  link.style.display = 'none';
+
+  if ((row = document.getElementById('compose-' + id))) {
+    var div = document.getElementById('compose-div'),
+      headers_div = document.getElementById('compose-headers-div');
+    row.style.display = (document.all && !window.opera) ? 'block' : 'table-row';
+    div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px';
+    this.resize_compose_body();
+  }
+
+  return false;
+},
+
+hide_header_form: function(id)
+{
+  var row, ns,
+    link = document.getElementById(id + '-link'),
+    parent = link.parentNode,
+    links = parent.getElementsByTagName('a');
+
+  link.style.display = '';
+
+  for (var i=0; i<links.length; i++)
+    if (links[i].style.display != 'none')
+      for (var j=i+1; j<links.length; j++)
+	    if (links[j].style.display != 'none')
+          if ((ns = this.next_sibling(links[i]))) {
+	        ns.style.display = '';
+	        break;
+	      }
+
+  document.getElementById('_' + id).value = '';
+
+  if ((row = document.getElementById('compose-' + id))) {
+    var div = document.getElementById('compose-div'),
+      headers_div = document.getElementById('compose-headers-div');
+    row.style.display = 'none';
+    div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px';
+    this.resize_compose_body();
+  }
+
+  return false;
+},
+
+next_sibling: function(elm)
+{
+  var ns = elm.nextSibling;
+  while (ns && ns.nodeType == 3)
+    ns = ns.nextSibling;
+  return ns;
+},
+
+prev_sibling: function(elm)
+{
+  var ps = elm.previousSibling;
+  while (ps && ps.nodeType == 3)
+    ps = ps.previousSibling;
+  return ps;
+}
+
+};
+
+/**
+ * Scroller
+ */
+
+function rcmail_scroller(list, top, bottom)
+{
+  var ref = this;
+
+  this.list = $(list);
+  this.top = $(top);
+  this.bottom = $(bottom);
+  this.step_size = 6;
+  this.step_time = 20;
+  this.delay = 500;
+
+  this.top
+    .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
+    .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
+
+  this.bottom
+    .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
+    .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
+
+  this.scroll = function(dir)
+  {
+    var ref = this, size = this.step_size;
+
+    if (!rcmail.drag_active)
+      return;
+
+    if (dir == 'down')
+      size *= -1;
+
+    this.list.get(0).scrollTop += size;
+    this.ts = window.setTimeout(function() { ref.scroll(dir); }, this.step_time);
+  };
+};
+
+
+// Events handling in iframes (eg. preview pane)
+function iframe_events()
+{
+  // this==iframe
+  var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+  rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
+};
+
+// Abbreviate mailbox names to fit width of the container
+function rcube_render_mailboxlist()
+{
+  var list = $('#mailboxlist > li a, #mailboxlist ul:visible > li a');
+
+  // it's too slow with really big number of folders, especially on IE
+  if (list.length > 500 * (bw.ie ? 0.2 : 1))
+    return;
+
+  list.each(function(){
+    var elem = $(this),
+      text = elem.data('text');
+
+    if (!text) {
+      text = elem.text().replace(/\s+\(.+$/, '');
+      elem.data('text', text);
+    }
+    if (text.length < 6)
+      return;
+
+    var abbrev = fit_string_to_size(text, elem, elem.width() - elem.children('span.unreadcount').width());
+    if (abbrev != text)
+      elem.attr('title', text);
+    elem.contents().filter(function(){ return (this.nodeType == 3); }).get(0).data = abbrev;
+  });
+};
+
+// inspired by https://gist.github.com/24261/7fdb113f1e26111bd78c0c6fe515f6c0bf418af5
+function fit_string_to_size(str, elem, len)
+{
+  var w, span, result = str, ellip = '...';
+
+  if (!rcmail.env.tmp_span) {
+    // it should be appended to elem to use the same css style
+    // but for performance reasons we'll append it to body (once)
+    span = $('<b>').css({visibility: 'hidden', padding: '0px'})
+      .appendTo($('body', document)).get(0);
+    rcmail.env.tmp_span = span;
+  }
+  else {
+    span = rcmail.env.tmp_span;
+  }
+  span.innerHTML = result;
+
+  // on first run, check if string fits into the length already.
+  w = span.offsetWidth;
+  if (w > len) {
+    var cut = Math.max(1, Math.floor(str.length * ((w - len) / w) / 2)),
+      mid = Math.floor(str.length / 2),
+      offLeft = mid,
+      offRight = mid;
+
+    while (true) {
+      offLeft = mid - cut;
+      offRight = mid + cut;
+      span.innerHTML = str.substring(0,offLeft) + ellip + str.substring(offRight);
+
+      // break loop if string fits size
+      if (offLeft < 3 || span.offsetWidth)
+        break;
+
+      cut++;
+    }
+
+    // build resulting string
+    result = str.substring(0,offLeft) + ellip + str.substring(offRight);
+  }
+
+  return result;
+};
+
+function update_quota(data)
+{
+  percent_indicator(rcmail.gui_objects.quotadisplay, data);
+};
+
+// percent (quota) indicator
+function percent_indicator(obj, data)
+{
+  if (!data || !obj)
+    return false;
+
+  var limit_high = 80,
+    limit_mid  = 55,
+    width = data.width ? data.width : rcmail.env.indicator_width ? rcmail.env.indicator_width : 100,
+    height = data.height ? data.height : rcmail.env.indicator_height ? rcmail.env.indicator_height : 14,
+    quota = data.percent ? Math.abs(parseInt(data.percent)) : 0,
+    quota_width = parseInt(quota / 100 * width),
+    pos = $(obj).position();
+
+  // workarounds for Opera and Webkit bugs
+  pos.top = Math.max(0, pos.top);
+  pos.left = Math.max(0, pos.left);
+
+  rcmail.env.indicator_width = width;
+  rcmail.env.indicator_height = height;
+
+  // overlimit
+  if (quota_width > width) {
+    quota_width = width;
+    quota = 100;
+  }
+
+  if (data.title)
+    data.title = rcmail.get_label('quota') + ': ' +  data.title;
+
+  // main div
+  var main = $('<div>');
+  main.css({position: 'absolute', top: pos.top, left: pos.left,
+      width: width + 'px', height: height + 'px', zIndex: 100, lineHeight: height + 'px'})
+    .attr('title', data.title).addClass('quota_text').html(quota + '%');
+  // used bar
+  var bar1 = $('<div>');
+  bar1.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
+      width: quota_width + 'px', height: height + 'px', zIndex: 99});
+  // background
+  var bar2 = $('<div>');
+  bar2.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
+      width: width + 'px', height: height + 'px', zIndex: 98})
+	.addClass('quota_bg');
+
+  if (quota >= limit_high) {
+    main.addClass(' quota_text_high');
+    bar1.addClass('quota_high');
+  }
+  else if(quota >= limit_mid) {
+    main.addClass(' quota_text_mid');
+    bar1.addClass('quota_mid');
+  }
+  else {
+    main.addClass(' quota_text_low');
+    bar1.addClass('quota_low');
+  }
+
+  // replace quota image
+  $(obj).html('').append(bar1).append(bar2).append(main);
+  // update #quotaimg title
+  $('#quotaimg').attr('title', data.title);
+};
+
+// Optional parameters used by TinyMCE
+var rcmail_editor_settings = {
+  skin : "default", // "default", "o2k7"
+  skin_variant : "" // "", "silver", "black"
+};
+
+var rcmail_ui;
+
+function rcube_init_mail_ui()
+{
+  rcmail_ui = new rcube_mail_ui();
+  rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
+  rcube_event.add_listener({ object:rcmail_ui, method:'body_keydown', event:'keydown' });
+
+  if (rcmail.env.quota_content)
+    update_quota(rcmail.env.quota_content);
+  rcmail.addEventListener('setquota', update_quota);
+
+  $('iframe').load(iframe_events)
+    .contents().mouseup(function(e){rcmail_ui.body_mouseup(e)});
+
+  if (rcmail.env.task == 'mail') {
+    rcmail.addEventListener('menu-open', 'open_listmenu', rcmail_ui);
+    rcmail.addEventListener('menu-save', 'save_listmenu', rcmail_ui);
+    rcmail.addEventListener('aftersend-attachment', 'uploadmenu', rcmail_ui);
+    rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
+    rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
+
+    if (rcmail.gui_objects.mailboxlist) {
+      rcmail.addEventListener('responseaftermark', rcube_render_mailboxlist);
+      rcmail.addEventListener('responseaftergetunread', rcube_render_mailboxlist);
+      rcmail.addEventListener('responseaftercheck-recent', rcube_render_mailboxlist);
+      rcmail.addEventListener('aftercollapse-folder', rcube_render_mailboxlist);
+
+      new rcmail_scroller('#mailboxlist-content', '#mailboxlist-title', '#mailboxlist-footer');
+    }
+
+    if (rcmail.env.action == 'compose')
+      rcmail_ui.init_compose_form();
+  }
+  else if (rcmail.env.task == 'addressbook') {
+    rcmail.addEventListener('afterupload-photo', function(){ rcmail_ui.show_popup('uploadform', false); });
+
+    if (rcmail.gui_objects.folderlist)
+      new rcmail_scroller('#directorylist-content', '#directorylist-title', '#directorylist-footer');
+  }
+  else if (rcmail.env.task == 'settings') {
+    if (rcmail.gui_objects.subscriptionlist)
+      new rcmail_scroller('#folderlist-content', '#folderlist-title', '#folderlist-footer');
+  }
+}
diff --git a/skins/classic/googiespell.css b/skins/classic/googiespell.css
new file mode 100644
index 000000000..8adadc256
--- /dev/null
+++ b/skins/classic/googiespell.css
@@ -0,0 +1,119 @@
+/***** modified styles for GoogieSpell *****/
+
+.googie_window {
+  font-size: 11px;
+  width: 185px;
+  margin: 0;
+  padding: 0;
+}
+
+.googie_edit_layer {
+  background-color: #ffffff;
+  padding: 0 4px;
+  font-size: 9pt;
+  font-family: monospace;
+  border: 1px solid #999;
+}
+
+.googie_edit_layer span {
+  font-family: monospace;
+}
+
+.googie_list {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+}
+
+.googie_list td {
+  font-size: 11px;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  cursor: pointer;
+  list-style-type: none;
+}
+
+.googie_list_onhover {
+  color: #FFFFFF;
+  background-color: #CC3333;
+}
+
+.googie_list_onout {
+  background-color: #fff;
+}
+
+.googie_list_selected {
+  background-color: #cccccc;
+  font-weight: bold;
+}
+
+.googie_list_close {
+  font-size: 11px;
+  color: #b91414;
+}
+
+.googie_list_onhover .googie_list_close {
+  color: #FFFFFF;
+}
+
+.googie_list_revert {
+  font-size: 11px;
+  color: #b91414;
+}
+
+.googie_list_revert:hover {
+  color: #fff;
+}
+
+.googie_link {
+  color: #b91414;
+  text-decoration: underline;
+  cursor: pointer;
+  font-size: 9pt;
+  font-family: monospace;
+}
+
+.googie_check_spelling_link {
+  color: #CC0000;
+  font-size: 11px;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.googie_check_spelling_link:hover {
+  text-decoration: underline;
+}
+
+.googie_no_style {
+  text-decoration: none;
+}
+
+.googie_check_spelling_ok,
+.googie_resume_editing {
+  color: green;
+  font-size: 11px;
+  cursor: pointer;
+}
+
+.googie_check_spelling_ok:hover,
+.googie_resume_editing:hover {
+  text-decoration: underline;
+}
+
+.googie_lang_3d_click img {
+  vertical-align: middle;
+  border-top: 1px solid #555;
+  border-left: 1px solid #555;
+  border-right: 1px solid #b1b1b1;
+  border-bottom: 1px solid #b1b1b1;
+}
+
+.googie_lang_3d_on img {
+  vertical-align: middle;
+  border-top: 1px solid #b1b1b1;
+  border-left: 1px solid #b1b1b1;
+  border-right: 1px solid #555;
+  border-bottom: 1px solid #555;
+}
diff --git a/skins/classic/ie6hacks.css b/skins/classic/ie6hacks.css
new file mode 100644
index 000000000..53a2e5e1d
--- /dev/null
+++ b/skins/classic/ie6hacks.css
@@ -0,0 +1,178 @@
+/* CSS hacks for IE versions 5,6 */
+
+#taskbar
+{
+  background: url(images/taskbar.gif) top right no-repeat;
+}
+
+img
+{
+  behavior: url(skins/default/pngbehavior.htc);
+}
+
+#logo
+{
+  width: 178px;
+  height: 47px;
+}
+
+body > #message div.notice,
+body > #message div.error,
+body > #message div.warning,
+body > #message div.confirmation,
+#message-objects div.notice,
+#message-objects div.error,
+#message-objects div.warning,
+#message-objects div.confirmation
+{
+  background-image: url(images/display/icons.gif);
+}
+
+#messagemenu li a
+{
+  background-image: url(images/messageactions.gif);
+}
+
+#mailboxlist li
+{
+  background-image: url(images/icons/folders.gif);
+}
+
+#attachment-list
+{
+  height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
+}
+
+#messagetoolbar a
+{
+  display: block;
+  float: left;
+  padding-right: 10px;
+}
+
+.boxfooter a.button,
+.boxfooter a.buttonPas
+{
+  background-image: url(images/icons/groupactions.gif);
+}
+
+.pagenav
+{
+  width: 250px;
+}
+
+.pagenav a.button,
+.pagenav a.buttonPas
+{
+  background-image: url(images/pagenav.gif);
+}
+
+#listcontrols a.button,
+#listcontrols a.buttonPas {
+  background-image: url(images/mail_footer.gif);
+}
+
+#messagetoolbar a.button,
+#messagetoolbar a.buttonPas {
+  background-image: url(images/mail_toolbar.gif);
+}
+
+#abooktoolbar a.button,
+#abooktoolbar a.buttonPas,
+#abooktoolbar span.separator {
+  background-image: url(images/abook_toolbar.gif);
+}
+
+ul.toolbarmenu li a,
+.popupmenu li a
+{
+  clear: left;
+  height: expression(Math.min(14, parseInt(document.documentElement.clientHeight))+'px');
+  width: expression(Math.min(130, parseInt(document.documentElement.clientWidth))+'px');
+}
+
+ul.toolbarmenu li.separator_below
+{
+  padding-bottom: 3px;
+}
+
+.boxfooter
+{
+  width: 100%;
+  bottom: -1px;
+}
+
+.boxtitle,
+#directorylist li a
+{
+  width: auto;
+}
+
+#directorylist li
+{
+  background-image: url(images/icons/folders.gif);
+}
+
+.boxlistcontent
+{
+  top: 21px;
+  height: expression((parseInt(this.parentNode.offsetHeight)-24-parseInt(this.style.top?this.style.top:21))+'px');
+}
+
+#compose-div .boxlistcontent
+{
+  height: expression((parseInt(this.parentNode.offsetHeight)-23-parseInt(this.style.top?this.style.top:21))+'px');
+}
+
+#folder-manager
+{
+  height: expression((parseInt(document.documentElement.clientHeight)-105)+'px');
+}
+
+#messagelist tr td div.collapsed,
+#messagelist tr td div.expanded,
+#messagelist tr td.threads div.listmenu,
+#messagelist tr td.attachment span.attachment,
+#messagelist tr td.attachment span.report,
+#messagelist tr td.priority span.priority,
+#messagelist tr td.priority span.prio1,
+#messagelist tr td.priority span.prio2,
+#messagelist tr td.priority span.prio3,
+#messagelist tr td.priority span.prio4,
+#messagelist tr td.priority span.prio5,
+#messagelist tr td.flag span.flagged,
+#messagelist tr td.flag span.unflagged:hover,
+#messagelist tr td.status span.status,
+#messagelist tr td.status span.msgicon,
+#messagelist tr td.status span.deleted,
+#messagelist tr td.status span.unread,
+#messagelist tr td.status span.unreadchildren,
+#messagelist tr td.subject span.msgicon,
+#messagelist tr td.subject span.deleted,
+#messagelist tr td.subject span.unread,
+#messagelist tr td.subject span.replied,
+#messagelist tr td.subject span.forwarded,
+#messagelist tr td.subject span.unreadchildren
+{
+  background-image: url(images/messageicons.gif);
+}
+
+#messagelist tr td div.collapsed,
+#messagelist tr td div.expanded {
+	background-color: #fff;
+}
+
+body.iframe .boxtitle
+{
+  position: absolute;
+}
+
+#subscription-table
+{
+  width: auto;
+}
+
+#sourcename
+{
+  zoom: 1;
+}
diff --git a/skins/classic/iehacks.css b/skins/classic/iehacks.css
new file mode 100644
index 000000000..d09be3d80
--- /dev/null
+++ b/skins/classic/iehacks.css
@@ -0,0 +1,295 @@
+
+input, textarea
+{
+  border-style: expression(this.type=='checkbox' || this.type=='radio' || this.id=='quicksearchbox' ? 'none' : 'solid');
+  border-width: expression(this.type=='checkbox' || this.type=='radio' ? '0' : '1px');
+  border-color: expression(this.type=='checkbox' || this.type=='radio' ? '' : '#666666');
+  background-color: expression(this.type=='checkbox' || this.type=='radio' ? 'transparent' : '#ffffff');
+}
+
+body.iframe
+{
+  margin-top: 0px;
+}
+
+body.iframe div.boxcontent
+{
+  margin-top: 20px;
+  z-index: 2;
+}
+
+body.iframe div.boxtitle
+{
+  z-index: 100;
+}
+
+body.iframe #prefs-details
+{
+  padding-top: 1px;
+}
+
+#login-form form
+{
+  margin-top: 0;
+}
+
+.pagenav a.buttonPas
+{
+  filter: alpha(opacity=35);
+}
+
+body > #message
+{
+  filter: alpha(opacity=85);
+}
+
+.popupmenu
+{
+  background-color: #ffffff;
+}
+
+#tabsbar,
+#partheader
+{
+  width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
+}
+
+#mainscreen
+{
+  height: expression((parseInt(document.documentElement.clientHeight)-105)+'px');
+}
+
+#mainscreen,
+#messagepartcontainer
+{
+  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
+}
+
+#messagetoolbar
+{
+  width: expression((parseInt(document.documentElement.clientWidth)-215)+'px');
+  z-index: 240;
+}
+
+#messagetoolbar select.mboxlist
+{
+  margin: 0 8px;
+  top: 8px;
+}
+
+div.messageheaderbox
+{
+  margin-top: 0px;
+}
+
+body.iframe div.messageheaderbox
+{
+  margin-top: 6px;
+}
+
+#abooktoolbar a.buttonPas
+{
+  filter: alpha(opacity=35);
+  background-image: url(images/abook_toolbar.gif);
+}
+
+#messagetoolbar a.buttonPas
+{
+  filter: alpha(opacity=35);
+  background-image: url(images/mail_toolbar.gif);
+}
+
+#listcontrols a.buttonPas
+{
+  filter: alpha(opacity=35);
+}
+
+#quicksearchbar
+{
+  z-index: 250;
+}
+
+#addresslist,
+#sectionslist,
+#identities-list,
+#mailleftcontainer,
+#mailrightcontainer,
+#compose-container,
+#compose-attachments,
+#mailcontframe,
+#mailboxlist-container,
+#mailrightcontent,
+#messageframe,
+#identity-details,
+#contacts-box,
+#prefs-box,
+#folder-box,
+#directorylistbox,
+#addressscreen
+{
+  height: expression(parseInt(this.parentNode.offsetHeight)+'px');
+}
+
+#mailrightcontainer
+{
+  width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px');
+}
+
+#messagepartcontainer
+{
+  height: expression((parseInt(document.documentElement.clientHeight)-90)+'px');
+}
+
+#mailrightcontent
+{
+  width: 100%;
+}
+
+#compose-div
+{
+  height: expression((parseInt(this.parentNode.offsetHeight)-1-parseInt(document.getElementById('compose-headers').offsetHeight))+'px');
+}
+
+#messagelist
+{
+  width: inherit;
+  *width: auto; /* IE6/7 conditional hack */
+  border-collapse: collapse;
+}
+
+#messagelist thead tr td,
+#messagelist tbody tr td
+{
+  height: 18px;
+}
+
+#messagelist tbody tr.unroot td.subject
+{
+  text-decoration: underline;
+}
+
+#messageframe
+{
+  width: expression((parseInt(this.parentNode.offsetWidth)-180)+'px');
+  overflow: hidden;
+}
+
+#countcontrols
+{
+  width: 24em;
+  padding-right: 10px;
+}
+
+body.iframe 
+{
+  width: expression((parseInt(document.documentElement.clientWidth))+'px');
+}
+
+div.message-part pre,
+div.message-htmlpart pre,
+div.message-part div.pre
+{
+  word-wrap: break-word;
+}
+
+#addressscreen
+{
+  width: expression((parseInt(document.documentElement.clientWidth)-245)+'px');
+}
+
+#contacts-table
+{
+  width: expression(document.getElementById('addresslist').clientWidth);
+}
+
+#contacts-box,
+#prefs-box,
+#folder-box
+{
+  width: expression((parseInt(this.parentNode.offsetWidth)-555)+'px');
+  overflow: hidden;
+}
+
+#rcmdraglayer
+{
+  filter: alpha(opacity=82);
+  padding-left: 20px;
+}
+
+div.draglayercopy
+{
+  border-color: #00cc00;
+  background: url(images/messageactions.png) 0 -125px no-repeat #fff;
+}
+
+html.ie8 .draglayercopy:before
+{
+  content: "";
+  display: none;
+}
+
+ul.toolbarmenu
+{
+  margin: 0 0 -4px 0;
+}
+
+.popupmenu ul li,
+ul.toolbarmenu li
+{
+  min-width: auto;
+}
+
+.popupmenu ul li a,
+ul.toolbarmenu li a
+{
+  min-height: auto;
+}
+
+.popupmenu li.block a
+{
+  clear: none;
+  display: inline-block;
+  padding-left: 2px;
+}
+
+#console
+{
+  filter: alpha(opacity=80);
+}
+
+table.records-table thead tr td
+{
+  height: 19px;
+}
+
+#listmenu fieldset
+{
+  margin: 0 4px;
+  padding: 0.8em;
+}
+
+#listcontrols input
+{
+  margin-top: 2px;
+}
+
+#contact-details
+{
+  margin-top: 20px;
+}
+
+#contact-details form {
+  margin-top: -1px;
+}
+
+.contactfieldgroup legend
+{
+	padding: 0 0 0.5em 0;
+	margin-left: -4px;
+}
+
+/* fix "jumping" login form in IE7 */
+#login-form div.boxcontent
+{
+  overflow: hidden;
+}
diff --git a/skins/classic/images/abook_toolbar.gif b/skins/classic/images/abook_toolbar.gif
new file mode 100644
index 000000000..2e8f4e259
Binary files /dev/null and b/skins/classic/images/abook_toolbar.gif differ
diff --git a/skins/classic/images/abook_toolbar.png b/skins/classic/images/abook_toolbar.png
new file mode 100644
index 000000000..feb95c026
Binary files /dev/null and b/skins/classic/images/abook_toolbar.png differ
diff --git a/skins/classic/images/blank.gif b/skins/classic/images/blank.gif
new file mode 100644
index 000000000..7dd464ea3
Binary files /dev/null and b/skins/classic/images/blank.gif differ
diff --git a/skins/classic/images/buttons/add_act.png b/skins/classic/images/buttons/add_act.png
new file mode 100644
index 000000000..e94fcd6a0
Binary files /dev/null and b/skins/classic/images/buttons/add_act.png differ
diff --git a/skins/classic/images/buttons/add_pas.png b/skins/classic/images/buttons/add_pas.png
new file mode 100644
index 000000000..9f67c5202
Binary files /dev/null and b/skins/classic/images/buttons/add_pas.png differ
diff --git a/skins/classic/images/buttons/add_sel.png b/skins/classic/images/buttons/add_sel.png
new file mode 100644
index 000000000..2a3719fba
Binary files /dev/null and b/skins/classic/images/buttons/add_sel.png differ
diff --git a/skins/classic/images/buttons/bg.gif b/skins/classic/images/buttons/bg.gif
new file mode 100644
index 000000000..be39f4a35
Binary files /dev/null and b/skins/classic/images/buttons/bg.gif differ
diff --git a/skins/classic/images/cleardot.png b/skins/classic/images/cleardot.png
new file mode 100644
index 000000000..98c3bfcca
Binary files /dev/null and b/skins/classic/images/cleardot.png differ
diff --git a/skins/classic/images/contactpic.png b/skins/classic/images/contactpic.png
new file mode 100644
index 000000000..bdb6cdcc0
Binary files /dev/null and b/skins/classic/images/contactpic.png differ
diff --git a/skins/classic/images/dbutton.png b/skins/classic/images/dbutton.png
new file mode 100644
index 000000000..7a85e3c5d
Binary files /dev/null and b/skins/classic/images/dbutton.png differ
diff --git a/skins/classic/images/dimple.png b/skins/classic/images/dimple.png
new file mode 100644
index 000000000..4de496c87
Binary files /dev/null and b/skins/classic/images/dimple.png differ
diff --git a/skins/classic/images/display/icons.gif b/skins/classic/images/display/icons.gif
new file mode 100644
index 000000000..e6dfb1bc6
Binary files /dev/null and b/skins/classic/images/display/icons.gif differ
diff --git a/skins/classic/images/display/icons.png b/skins/classic/images/display/icons.png
new file mode 100644
index 000000000..7bf4278bf
Binary files /dev/null and b/skins/classic/images/display/icons.png differ
diff --git a/skins/classic/images/display/loading.gif b/skins/classic/images/display/loading.gif
new file mode 100644
index 000000000..747c65661
Binary files /dev/null and b/skins/classic/images/display/loading.gif differ
diff --git a/skins/classic/images/display/loading_blue.gif b/skins/classic/images/display/loading_blue.gif
new file mode 100644
index 000000000..2ea6b19ae
Binary files /dev/null and b/skins/classic/images/display/loading_blue.gif differ
diff --git a/skins/classic/images/favicon.ico b/skins/classic/images/favicon.ico
new file mode 100644
index 000000000..b3bd18c12
Binary files /dev/null and b/skins/classic/images/favicon.ico differ
diff --git a/skins/classic/images/googiespell/change_lang.gif b/skins/classic/images/googiespell/change_lang.gif
new file mode 100644
index 000000000..81451832c
Binary files /dev/null and b/skins/classic/images/googiespell/change_lang.gif differ
diff --git a/skins/classic/images/googiespell/indicator.gif b/skins/classic/images/googiespell/indicator.gif
new file mode 100644
index 000000000..b556bb00f
Binary files /dev/null and b/skins/classic/images/googiespell/indicator.gif differ
diff --git a/skins/classic/images/googiespell/ok.gif b/skins/classic/images/googiespell/ok.gif
new file mode 100644
index 000000000..04727e28d
Binary files /dev/null and b/skins/classic/images/googiespell/ok.gif differ
diff --git a/skins/classic/images/googiespell/spellc.gif b/skins/classic/images/googiespell/spellc.gif
new file mode 100644
index 000000000..6ed936090
Binary files /dev/null and b/skins/classic/images/googiespell/spellc.gif differ
diff --git a/skins/classic/images/icons/attachment.png b/skins/classic/images/icons/attachment.png
new file mode 100644
index 000000000..0fcf46499
Binary files /dev/null and b/skins/classic/images/icons/attachment.png differ
diff --git a/skins/classic/images/icons/blank.gif b/skins/classic/images/icons/blank.gif
new file mode 100644
index 000000000..7dd464ea3
Binary files /dev/null and b/skins/classic/images/icons/blank.gif differ
diff --git a/skins/classic/images/icons/collapsed.png b/skins/classic/images/icons/collapsed.png
new file mode 100644
index 000000000..07cc1ec7d
Binary files /dev/null and b/skins/classic/images/icons/collapsed.png differ
diff --git a/skins/classic/images/icons/columnpicker.gif b/skins/classic/images/icons/columnpicker.gif
new file mode 100644
index 000000000..e776519b3
Binary files /dev/null and b/skins/classic/images/icons/columnpicker.gif differ
diff --git a/skins/classic/images/icons/delete.png b/skins/classic/images/icons/delete.png
new file mode 100644
index 000000000..f1cf0aee7
Binary files /dev/null and b/skins/classic/images/icons/delete.png differ
diff --git a/skins/classic/images/icons/deleted.png b/skins/classic/images/icons/deleted.png
new file mode 100644
index 000000000..cffb7f507
Binary files /dev/null and b/skins/classic/images/icons/deleted.png differ
diff --git a/skins/classic/images/icons/dot.png b/skins/classic/images/icons/dot.png
new file mode 100644
index 000000000..99f736516
Binary files /dev/null and b/skins/classic/images/icons/dot.png differ
diff --git a/skins/classic/images/icons/down_small.gif b/skins/classic/images/icons/down_small.gif
new file mode 100644
index 000000000..f865893f4
Binary files /dev/null and b/skins/classic/images/icons/down_small.gif differ
diff --git a/skins/classic/images/icons/expanded.png b/skins/classic/images/icons/expanded.png
new file mode 100644
index 000000000..87e77a477
Binary files /dev/null and b/skins/classic/images/icons/expanded.png differ
diff --git a/skins/classic/images/icons/extwin.png b/skins/classic/images/icons/extwin.png
new file mode 100644
index 000000000..1ab4d7703
Binary files /dev/null and b/skins/classic/images/icons/extwin.png differ
diff --git a/skins/classic/images/icons/flagged.png b/skins/classic/images/icons/flagged.png
new file mode 100644
index 000000000..98215f68c
Binary files /dev/null and b/skins/classic/images/icons/flagged.png differ
diff --git a/skins/classic/images/icons/folders.gif b/skins/classic/images/icons/folders.gif
new file mode 100644
index 000000000..eb06bd8c1
Binary files /dev/null and b/skins/classic/images/icons/folders.gif differ
diff --git a/skins/classic/images/icons/folders.png b/skins/classic/images/icons/folders.png
new file mode 100644
index 000000000..2580fd1be
Binary files /dev/null and b/skins/classic/images/icons/folders.png differ
diff --git a/skins/classic/images/icons/forwarded.png b/skins/classic/images/icons/forwarded.png
new file mode 100644
index 000000000..1ea246f8e
Binary files /dev/null and b/skins/classic/images/icons/forwarded.png differ
diff --git a/skins/classic/images/icons/forwarded_replied.png b/skins/classic/images/icons/forwarded_replied.png
new file mode 100644
index 000000000..4830ecf40
Binary files /dev/null and b/skins/classic/images/icons/forwarded_replied.png differ
diff --git a/skins/classic/images/icons/glass.gif b/skins/classic/images/icons/glass.gif
new file mode 100644
index 000000000..9a705b410
Binary files /dev/null and b/skins/classic/images/icons/glass.gif differ
diff --git a/skins/classic/images/icons/glass.png b/skins/classic/images/icons/glass.png
new file mode 100644
index 000000000..eb1b1dc74
Binary files /dev/null and b/skins/classic/images/icons/glass.png differ
diff --git a/skins/classic/images/icons/glass_roll.png b/skins/classic/images/icons/glass_roll.png
new file mode 100644
index 000000000..b11b59854
Binary files /dev/null and b/skins/classic/images/icons/glass_roll.png differ
diff --git a/skins/classic/images/icons/groupactions.gif b/skins/classic/images/icons/groupactions.gif
new file mode 100644
index 000000000..913c83588
Binary files /dev/null and b/skins/classic/images/icons/groupactions.gif differ
diff --git a/skins/classic/images/icons/groupactions.png b/skins/classic/images/icons/groupactions.png
new file mode 100644
index 000000000..91f84bee9
Binary files /dev/null and b/skins/classic/images/icons/groupactions.png differ
diff --git a/skins/classic/images/icons/minus.gif b/skins/classic/images/icons/minus.gif
new file mode 100644
index 000000000..4ec02c87a
Binary files /dev/null and b/skins/classic/images/icons/minus.gif differ
diff --git a/skins/classic/images/icons/plus.gif b/skins/classic/images/icons/plus.gif
new file mode 100644
index 000000000..854b5eb34
Binary files /dev/null and b/skins/classic/images/icons/plus.gif differ
diff --git a/skins/classic/images/icons/rename.png b/skins/classic/images/icons/rename.png
new file mode 100644
index 000000000..7844b0081
Binary files /dev/null and b/skins/classic/images/icons/rename.png differ
diff --git a/skins/classic/images/icons/replied.png b/skins/classic/images/icons/replied.png
new file mode 100644
index 000000000..4a5213262
Binary files /dev/null and b/skins/classic/images/icons/replied.png differ
diff --git a/skins/classic/images/icons/reset.gif b/skins/classic/images/icons/reset.gif
new file mode 100644
index 000000000..a9a53d569
Binary files /dev/null and b/skins/classic/images/icons/reset.gif differ
diff --git a/skins/classic/images/icons/silhouette.png b/skins/classic/images/icons/silhouette.png
new file mode 100644
index 000000000..ac0773514
Binary files /dev/null and b/skins/classic/images/icons/silhouette.png differ
diff --git a/skins/classic/images/icons/sort.gif b/skins/classic/images/icons/sort.gif
new file mode 100644
index 000000000..f8f275690
Binary files /dev/null and b/skins/classic/images/icons/sort.gif differ
diff --git a/skins/classic/images/icons/unflagged.png b/skins/classic/images/icons/unflagged.png
new file mode 100644
index 000000000..12023f057
Binary files /dev/null and b/skins/classic/images/icons/unflagged.png differ
diff --git a/skins/classic/images/icons/unread.png b/skins/classic/images/icons/unread.png
new file mode 100644
index 000000000..31f640632
Binary files /dev/null and b/skins/classic/images/icons/unread.png differ
diff --git a/skins/classic/images/icons/unread_children.png b/skins/classic/images/icons/unread_children.png
new file mode 100644
index 000000000..45e671dcc
Binary files /dev/null and b/skins/classic/images/icons/unread_children.png differ
diff --git a/skins/classic/images/icons/up_small.gif b/skins/classic/images/icons/up_small.gif
new file mode 100644
index 000000000..40deb891f
Binary files /dev/null and b/skins/classic/images/icons/up_small.gif differ
diff --git a/skins/classic/images/listheader.gif b/skins/classic/images/listheader.gif
new file mode 100644
index 000000000..bf77a11c1
Binary files /dev/null and b/skins/classic/images/listheader.gif differ
diff --git a/skins/classic/images/mail_footer.gif b/skins/classic/images/mail_footer.gif
new file mode 100644
index 000000000..302b55870
Binary files /dev/null and b/skins/classic/images/mail_footer.gif differ
diff --git a/skins/classic/images/mail_footer.png b/skins/classic/images/mail_footer.png
new file mode 100644
index 000000000..e2f24b28c
Binary files /dev/null and b/skins/classic/images/mail_footer.png differ
diff --git a/skins/classic/images/mail_toolbar.gif b/skins/classic/images/mail_toolbar.gif
new file mode 100644
index 000000000..9856b4265
Binary files /dev/null and b/skins/classic/images/mail_toolbar.gif differ
diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
new file mode 100644
index 000000000..6ccc9bd9e
Binary files /dev/null and b/skins/classic/images/mail_toolbar.png differ
diff --git a/skins/classic/images/messageactions.gif b/skins/classic/images/messageactions.gif
new file mode 100644
index 000000000..b73fbb354
Binary files /dev/null and b/skins/classic/images/messageactions.gif differ
diff --git a/skins/classic/images/messageactions.png b/skins/classic/images/messageactions.png
new file mode 100644
index 000000000..c09f60fe6
Binary files /dev/null and b/skins/classic/images/messageactions.png differ
diff --git a/skins/classic/images/messageicons.gif b/skins/classic/images/messageicons.gif
new file mode 100644
index 000000000..a914a955a
Binary files /dev/null and b/skins/classic/images/messageicons.gif differ
diff --git a/skins/classic/images/messageicons.png b/skins/classic/images/messageicons.png
new file mode 100644
index 000000000..ca7b23075
Binary files /dev/null and b/skins/classic/images/messageicons.png differ
diff --git a/skins/classic/images/pagenav.gif b/skins/classic/images/pagenav.gif
new file mode 100644
index 000000000..a4644a4e4
Binary files /dev/null and b/skins/classic/images/pagenav.gif differ
diff --git a/skins/classic/images/quota-colors.png b/skins/classic/images/quota-colors.png
new file mode 100644
index 000000000..4c1f17edd
Binary files /dev/null and b/skins/classic/images/quota-colors.png differ
diff --git a/skins/classic/images/quota.gif b/skins/classic/images/quota.gif
new file mode 100644
index 000000000..9896d4cae
Binary files /dev/null and b/skins/classic/images/quota.gif differ
diff --git a/skins/classic/images/quota.png b/skins/classic/images/quota.png
new file mode 100644
index 000000000..e729d3248
Binary files /dev/null and b/skins/classic/images/quota.png differ
diff --git a/skins/classic/images/roundcube_logo.png b/skins/classic/images/roundcube_logo.png
new file mode 100644
index 000000000..4323c6b5f
Binary files /dev/null and b/skins/classic/images/roundcube_logo.png differ
diff --git a/skins/classic/images/searchfield.gif b/skins/classic/images/searchfield.gif
new file mode 100644
index 000000000..969f277b3
Binary files /dev/null and b/skins/classic/images/searchfield.gif differ
diff --git a/skins/classic/images/tabs-left.gif b/skins/classic/images/tabs-left.gif
new file mode 100644
index 000000000..c1bf45aa8
Binary files /dev/null and b/skins/classic/images/tabs-left.gif differ
diff --git a/skins/classic/images/tabs-right.gif b/skins/classic/images/tabs-right.gif
new file mode 100644
index 000000000..9eba9a342
Binary files /dev/null and b/skins/classic/images/tabs-right.gif differ
diff --git a/skins/classic/images/taskbar.gif b/skins/classic/images/taskbar.gif
new file mode 100644
index 000000000..b6fc91ce4
Binary files /dev/null and b/skins/classic/images/taskbar.gif differ
diff --git a/skins/classic/images/taskbar.png b/skins/classic/images/taskbar.png
new file mode 100644
index 000000000..5fa366023
Binary files /dev/null and b/skins/classic/images/taskbar.png differ
diff --git a/skins/classic/images/taskicons.gif b/skins/classic/images/taskicons.gif
new file mode 100644
index 000000000..feaa9a14e
Binary files /dev/null and b/skins/classic/images/taskicons.gif differ
diff --git a/skins/classic/images/taskicons.png b/skins/classic/images/taskicons.png
new file mode 100644
index 000000000..feaa9a14e
Binary files /dev/null and b/skins/classic/images/taskicons.png differ
diff --git a/skins/classic/images/tree.gif b/skins/classic/images/tree.gif
new file mode 100644
index 000000000..c78f15ef5
Binary files /dev/null and b/skins/classic/images/tree.gif differ
diff --git a/skins/classic/images/watermark.gif b/skins/classic/images/watermark.gif
new file mode 100644
index 000000000..d235d0306
Binary files /dev/null and b/skins/classic/images/watermark.gif differ
diff --git a/skins/classic/includes/header.html b/skins/classic/includes/header.html
new file mode 100644
index 000000000..08d777af0
--- /dev/null
+++ b/skins/classic/includes/header.html
@@ -0,0 +1,2 @@
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" onclick="location.href='./?_page=1'" />
+<roundcube:object name="message" id="message" />
diff --git a/skins/classic/includes/links.html b/skins/classic/includes/links.html
new file mode 100644
index 000000000..82673220a
--- /dev/null
+++ b/skins/classic/includes/links.html
@@ -0,0 +1,13 @@
+<link rel="index" href="$__comm_path" />
+<link rel="shortcut icon" href="/images/favicon.ico"/>
+<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:if condition="in_array(env:task, array('mail', 'addressbook', 'settings'))" />
+<link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
+<roundcube:endif />
+<roundcube:if condition="browser:ie" />
+<!--[if lte IE 8]><link rel="stylesheet" type="text/css" href="/iehacks.css" /><![endif]-->
+<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="/ie6hacks.css" /><![endif]-->
+<roundcube:endif />
+<roundcube:if condition="browser:safari" />
+<link rel="stylesheet" type="text/css" href="/safari.css" />
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
new file mode 100644
index 000000000..3f4995b83
--- /dev/null
+++ b/skins/classic/includes/messagetoolbar.html
@@ -0,0 +1,65 @@
+<div id="messagetoolbar">
+<roundcube:if condition="template:name == 'message'" />
+<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
+<roundcube:else />
+<roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
+<roundcube:endif />
+<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
+<roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
+<span class="dropbutton">
+<roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
+<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span>
+</span>
+<span class="dropbutton">
+<roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
+<span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
+</span>
+<roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
+<roundcube:container name="toolbar" id="messagetoolbar" />
+<roundcube:if condition="template:name == 'mail'" />
+<roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />                                                                   
+<roundcube:endif />
+<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
+<roundcube:if condition="template:name == 'message'" />
+<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" />
+<roundcube:endif />
+</div>
+
+<div id="forwardmenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
+        <li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
+        <roundcube:container name="forwardmenu" id="forwardmenu" />
+    </ul>
+</div>
+
+<div id="replyallmenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="reply-all" label="replyall" prop="sub" classAct="replyalllink active" class="replyalllink" /></li>
+        <li><roundcube:button command="reply-list" label="replylist" prop="sub" classAct="replylistlink active" class="replylistlink" /></li>
+        <roundcube:container name="replyallmenu" id="replyallmenu" />
+    </ul>
+</div>
+
+<div id="messagemenu" class="popupmenu">
+  <ul class="toolbarmenu">
+    <li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
+    <li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
+    <li><roundcube:button class="editlink" command="edit" label="editasnew" classAct="editlink active" /></li>
+    <li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
+    <li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
+    <roundcube:container name="messagemenu" id="messagemenu" />
+  </ul>
+</div>
+
+<roundcube:if condition="template:name == 'mail'" />
+<div id="markmessagemenu" class="popupmenu">
+  <ul class="toolbarmenu">
+    <li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li>
+    <li><roundcube:button command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /></li>
+    <li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li>
+    <li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li>
+    <roundcube:container name="markmenu" id="markmessagemenu" />
+  </ul>
+</div>
+<roundcube:endif />
diff --git a/skins/classic/includes/settingstabs.html b/skins/classic/includes/settingstabs.html
new file mode 100644
index 000000000..0aea80b67
--- /dev/null
+++ b/skins/classic/includes/settingstabs.html
@@ -0,0 +1,8 @@
+<div id="tabsbar">
+<span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
+<span id="settingstabfolders" class="tablink"><roundcube:button command="folders" type="link" label="folders" title="managefolders" class="tablink" /></span>
+<span id="settingstabidentities" class="tablink"><roundcube:button command="identities" type="link" label="identities" title="manageidentities" class="tablink" /></span>
+<span id="settingstababout" class="tablink"><roundcube:button command="about" type="link" label="about" title="about" class="tablink" /></span>
+<roundcube:container name="tabs" id="tabsbar" />
+<script type="text/javascript"> if (window.rcmail) rcmail.add_onload(rcube_init_settings_tabs); </script>
+</div>
diff --git a/skins/classic/includes/taskbar.html b/skins/classic/includes/taskbar.html
new file mode 100644
index 000000000..dfb547b88
--- /dev/null
+++ b/skins/classic/includes/taskbar.html
@@ -0,0 +1,7 @@
+<div id="taskbar">
+<roundcube:button command="mail" label="mail" class="button-mail" />
+<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" />
+<roundcube:container name="taskbar" id="taskbar" />
+<roundcube:button command="settings" label="settings" class="button-settings" />
+<roundcube:button command="logout" label="logout" class="button-logout" />
+</div>
\ No newline at end of file
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
new file mode 100644
index 000000000..cf7b69a38
--- /dev/null
+++ b/skins/classic/mail.css
@@ -0,0 +1,1539 @@
+/***** Roundcube|Mail mail task styles *****/
+
+
+#messagetoolbar
+{
+  position: absolute;
+  top: 47px;
+  left: 205px;
+  right: 10px;
+  height: 35px;
+  min-width: 650px;
+  white-space: nowrap;
+/*  border: 1px solid #cccccc; */
+}
+
+#messagetoolbar a,
+#messagetoolbar select
+{
+  display: block;
+  float: left;
+  padding-right: 10px;
+}
+
+#messagetoolbar a.button,
+#messagetoolbar a.buttonPas {
+  display: block;
+  float: left;
+  width: 32px;
+  height: 32px;
+  padding: 0;
+  margin: 0 5px;
+  overflow: hidden;
+  background: url(images/mail_toolbar.png) 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+#messagetoolbar a.buttonPas {
+  opacity: 0.35;
+}
+
+#messagetoolbar a.button.selected {
+  background-color: #ddd;
+  margin-left: 4px;
+  margin-right: 4px;
+  margin-top: -1px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+}
+
+#messagetoolbar a.checkmailSel {
+  background-position: 0 -32px;
+}
+
+#messagetoolbar a.back {
+  background-position: -32px 0;
+}
+
+#messagetoolbar a.backSel {
+  background-position: -32px -32px;
+}
+
+#messagetoolbar a.compose {
+  background-position: -64px 0;
+}
+
+#messagetoolbar a.composeSel {
+  background-position: -64px -32px;
+}
+
+#messagetoolbar a.reply {
+  background-position: -96px 0;
+}
+
+#messagetoolbar a.replySel {
+  background-position: -96px -32px;
+}
+
+#messagetoolbar a.replyAll {
+  background-position: -128px 0;
+}
+
+#messagetoolbar a.replyAllSel {
+  background-position: -128px -32px;
+}
+
+#messagetoolbar a.forward {
+  background-position: -160px 0;
+}
+
+#messagetoolbar a.forwardSel {
+  background-position: -160px -32px;
+}
+
+#messagetoolbar a.delete {
+  background-position: -192px 0;
+}
+
+#messagetoolbar a.deleteSel {
+  background-position: -192px -32px;
+}
+
+#messagetoolbar a.markmessage {
+  background-position: -256px 0;
+}
+
+#messagetoolbar a.messagemenu {
+  background-position: -288px 0;
+}
+
+#messagetoolbar a.spellcheck {
+  background-position: -384px 0;
+}
+
+#messagetoolbar a.spellcheckSel {
+  background-position: -384px -32px;
+}
+
+#messagetoolbar a.attach {
+  background-position: -352px 0;
+}
+
+#messagetoolbar a.attachSel {
+  background-position: -352px -32px;
+}
+
+#messagetoolbar a.insertsig {
+  background-position: -448px 0;
+}
+
+#messagetoolbar a.insertsigSel {
+  background-position: -448px -32px;
+}
+
+#messagetoolbar a.savedraft {
+  background-position: -322px 0;
+}
+
+#messagetoolbar a.savedraftSel {
+  background-position: -322px -32px;
+}
+
+#messagetoolbar a.send {
+  background-position: -416px 0;
+}
+
+#messagetoolbar a.sendSel {
+  background-position: -416px -32px;
+}
+
+#messagetoolbar select.mboxlist
+{
+  position: relative;
+  margin: 0 8px;
+  top: 7px;
+}
+
+#messagetoolbar select.mboxlist option
+{
+  padding-left: 15px;
+}
+
+#messagetoolbar select.mboxlist option[value=""]
+{
+  padding-left: 2px;
+}
+
+#messagemenu li a.active:hover,
+#markmessagemenu li a.active:hover
+{
+  color: #fff;
+  background-color: #c00;
+}
+
+#messagemenu li a
+{
+  background: url(images/messageactions.png) no-repeat 7px 0;
+  background-position: 7px 20px;
+}
+
+#messagemenu li a.printlink
+{
+  background-position: 7px 1px;
+}
+
+#messagemenu li a.downloadlink
+{
+  background-position: 7px -17px;
+}
+
+#messagemenu li a.sourcelink
+{
+  background-position: 7px -35px;
+}
+
+#messagemenu li a.openlink
+{
+  background-position: 7px -53px;
+}
+
+#messagemenu li a.editlink
+{
+  background-position: 7px -71px;
+}
+
+#markmessagemenu li a,
+#compose-attachments li a
+{
+  background: url(images/messageicons.png) no-repeat;
+}
+
+#markmessagemenu li a.readlink
+{
+  background-position: 7px -51px;
+}
+
+#markmessagemenu li a.unreadlink
+{
+  background-position: 7px -119px;
+}
+
+#markmessagemenu li a.flaggedlink
+{
+  background-position: 7px -153px;
+}
+
+#markmessagemenu li a.unflaggedlink
+{
+  background-position: 7px -136px;
+}
+
+#searchfilter
+{
+  white-space: nowrap;
+  position: absolute;
+  right: 198px;
+  vertical-align: middle;
+}
+
+#searchfilter label
+{
+  font-size: 11px;
+}
+
+#mailleftcontainer
+{
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 195px;
+}
+
+#mailrightcontainer
+{
+  position: absolute;
+  top: 0;
+  left: 170px;
+  bottom: 0;
+  right: 0;
+  min-width: 600px;
+}
+
+#mailrightcontent
+{
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+#messagepartcontainer
+{
+  position: absolute;
+  top: 80px;
+  left: 20px;
+  right: 20px;
+  bottom: 20px;
+}
+
+#mailcontframe
+{
+  position: absolute;
+  width: 100%;
+  top: 0;
+  bottom: 0;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  overflow: hidden;
+}
+
+#mailpreviewframe
+{
+  position: absolute;
+  width: 100%;
+  top: 205px;
+  bottom: 0px;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  overflow: hidden;
+}
+
+#messagecontframe
+{
+  position: relative;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  width: 100%;
+  height: 100%;
+  min-height: 100%; /* Chrome 14 bug */
+}
+
+#messagepartframe
+{
+  width: 100%;
+  height: 100%;
+  min-height: 100%; /* Chrome 14 bug */
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+}
+
+
+#partheader
+{
+  position: absolute;
+  top: 10px;
+  left: 220px;
+  right: 20px;
+  height: 40px;
+}
+
+#partheader table td
+{
+  padding-left: 2px;
+  padding-right: 4px;
+  vertical-align: middle;
+  font-size: 11px;
+}
+
+#partheader table td.title
+{
+  color: #666666;
+  font-weight: bold;
+}
+
+
+/** mailbox list styles */
+
+#mailboxlist-container
+{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  bottom: 0;
+  border: 1px solid #999;
+  background-color: #F9F9F9;
+  overflow: hidden;
+}
+
+#mailboxlist
+{
+  position:relative;
+  height: auto;
+  margin: 0px;
+  padding: 0px;
+  list-style-image: none;
+  list-style-type: none;
+  overflow: hidden;
+  white-space: nowrap;
+  background-color: #FFF;
+}
+
+#mailboxlist li
+{
+  display: block;
+  position: relative;
+  font-size: 11px;
+  background: url(images/icons/folders.png) 5px 0 no-repeat;
+  border-bottom: 1px solid #EBEBEB;
+}
+
+#mailboxlist li ul li:last-child
+{
+  border-bottom: none;
+}
+
+#mailboxlist li div
+{
+  position: absolute;
+  left: 8px !important;
+  left: -16px;
+  top: 1px;
+  width: 14px;
+  height: 16px;
+}
+
+#mailboxlist li div.collapsed,
+#mailboxlist li div.expanded
+{
+  cursor: pointer;
+}
+
+#mailboxlist li div.collapsed
+{
+  background: url(images/icons/collapsed.png) bottom right no-repeat;
+}
+
+#mailboxlist li div.expanded
+{
+  background: url(images/icons/expanded.png) bottom right no-repeat;
+}
+
+#mailboxlist li.inbox
+{
+  background-position: 5px -18px;
+}
+
+#mailboxlist li.drafts
+{
+  background-position: 5px -37px;
+}
+
+#mailboxlist li.sent
+{
+  background-position: 5px -54px;
+}
+
+#mailboxlist li.junk
+{
+  background-position: 5px -73px;
+}
+
+#mailboxlist li.trash
+{
+  background-position: 5px -91px;
+}
+
+#mailboxlist li a
+{
+  cursor: default;
+  display: block;
+  position: relative;
+  padding-left: 25px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  text-decoration: none;
+  height: 15px;
+}
+
+#mailboxlist li.unread
+{
+  font-weight: bold;
+}
+
+#mailboxlist li.virtual > a
+{
+  color: #666;
+}
+
+#mailboxlist li.recent > a
+{
+  color: #0066FF;
+}
+
+#mailboxlist li.selected,
+#mailboxlist li.droptarget li.selected
+{
+  background-color: #929292;
+}
+
+#mailboxlist li.selected > a,
+#mailboxlist li.droptarget li.selected a
+{
+  color: #FFF;
+  font-weight: bold;
+}
+
+#mailboxlist li.droptarget
+{
+  background-color: #FFFFA6;
+}
+
+/* styles for nested folders */
+#mailboxlist ul {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  border-top: 1px solid #EBEBEB;
+  padding-left: 15px;
+  background-position: 25px 1px;
+  background-color: #FFF;
+  color: blue;
+  font-weight: normal;
+}
+
+#listcontrols
+{
+  position: relative;
+  white-space: nowrap;
+  line-height: 22px;
+  padding: 0 4px;
+  width: auto;
+  min-width: 300px;
+}
+
+#listcontrols a,
+#listcontrols span
+{
+  display: block;
+  float: left;
+  font-size: 11px;
+}
+
+#listcontrols span input
+{
+  vertical-align: middle;
+}
+
+#listcontrols a.button,
+#listcontrols a.buttonPas
+{
+  display: block;
+  float: left;
+  width: 15px;
+  height: 15px;
+  padding: 0;
+  margin-top: 4px;
+  margin-right: 2px;
+  overflow: hidden;
+  background: url(images/mail_footer.png) 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+#listcontrols a.buttonPas
+{
+  opacity: 0.35;
+}
+
+#listcontrols a.all {
+  background-position: -30px 0;
+}
+
+#listcontrols a.allsel {
+  background-position: -30px -15px;
+}
+
+#listcontrols a.page {
+  background-position: -135px 0;
+}
+
+#listcontrols a.pagesel {
+  background-position: -135px -15px;
+}
+
+#listcontrols a.unread {
+  background-position: -45px 0;
+}
+
+#listcontrols a.unreadsel {
+  background-position: -45px -15px;
+}
+
+#listcontrols a.invert {
+  background-position: -60px 0;
+}
+
+#listcontrols a.invertsel {
+  background-position: -60px -15px;
+}
+
+#listcontrols a.none {
+  background-position: -75px 0;
+}
+
+#listcontrols a.nonesel {
+  background-position: -75px -15px;
+}
+
+#listcontrols a.expand-all {
+  background-position: -90px 0;
+}
+
+#listcontrols a.expand-allsel {
+  background-position: -90px -15px;
+}
+
+#listcontrols a.collapse-all {
+  background-position: -105px 0;
+}
+
+#listcontrols a.collapse-allsel {
+  background-position: -105px -15px;
+}
+
+#listcontrols a.expand-unread {
+  background-position: -120px 0;
+}
+
+#listcontrols a.expand-unreadsel {
+  background-position: -120px -15px;
+}
+
+#countcontrols
+{
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  white-space: nowrap;
+  font-size: 11px;
+}
+
+#countcontrols a.button,
+#countcontrols a.buttonPas
+{
+  float: right;
+}
+
+
+/** message list styles */
+
+body.messagelist
+{
+  margin: 0px;
+  background-color: #F9F9F9;
+}
+
+#messagelist
+{
+  width: 100%;
+  display: table;
+  table-layout: fixed;
+}
+
+#messagelist thead tr td
+{
+  height: 20px;
+  padding: 0 4px 0 2px;
+  vertical-align: middle;
+  border-bottom: 1px solid #999999;
+  color: #333333;
+  background: url(images/listheader.gif) top left repeat-x #CCC;
+  font-size: 11px;
+  font-weight: bold;
+}
+
+#messagelist thead tr td.sortedASC,
+#messagelist thead tr td.sortedDESC
+{
+  background-position: 0 -26px;
+}
+
+#messagelist thead tr td.sortedASC a
+{
+  background: url(images/icons/sort.gif) right 0 no-repeat;
+}
+
+#messagelist thead tr td.sortedDESC a
+{
+  background: url(images/icons/sort.gif) right -14px no-repeat;
+}
+
+#messagelist thead tr td a
+{
+  display: block;
+  width: auto !important;
+  width: 100%;
+  color: #333333;
+  text-decoration: none;
+}
+
+#messagelist thead tr td.size
+{
+  text-align: left;
+}
+
+#messagelist thead tr td.subject
+{
+  padding-left: 18px;
+  width: 99%;
+}
+
+#messagelist tbody tr td
+{
+  height: 20px;
+  padding: 0;
+  font-size: 11px;
+  overflow: hidden;
+  vertical-align: middle;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  border-bottom: 1px solid #EBEBEB;
+  cursor: default;
+}
+
+#messagelist tbody tr td a
+{
+  color: #000;
+  text-decoration: none;
+  white-space: nowrap;
+  cursor: inherit;
+}
+
+#messagelist td img
+{
+  vertical-align: middle;
+  display: inline-block;
+}
+
+#messagelist tbody tr td.flag,
+#messagelist tbody tr td.status,
+#messagelist tbody tr td.subject span.status
+{
+  cursor: pointer;
+}
+
+#messagelist tr td.flag span,
+#messagelist tr td.status span,
+#messagelist tr td.attachment span,
+#messagelist tr td.priority span
+{
+  display: block;
+  width: 15px;
+}
+
+#messagelist tr td div.collapsed,
+#messagelist tr td div.expanded,
+#messagelist tr td.threads div.listmenu,
+#messagelist tr td.attachment span.attachment,
+#messagelist tr td.attachment span.report,
+#messagelist tr td.priority span.priority,
+#messagelist tr td.priority span.prio1,
+#messagelist tr td.priority span.prio2,
+#messagelist tr td.priority span.prio3,
+#messagelist tr td.priority span.prio4,
+#messagelist tr td.priority span.prio5,
+#messagelist tr td.flag span.flagged,
+#messagelist tr td.flag span.unflagged,
+#messagelist tr td.flag span.unflagged:hover,
+#messagelist tr td.status span.status,
+#messagelist tr td.status span.msgicon,
+#messagelist tr td.status span.deleted,
+#messagelist tr td.status span.unread,
+#messagelist tr td.status span.unreadchildren,
+#messagelist tr td.subject span.msgicon,
+#messagelist tr td.subject span.deleted,
+#messagelist tr td.subject span.unread,
+#messagelist tr td.subject span.replied,
+#messagelist tr td.subject span.forwarded,
+#messagelist tr td.subject span.unreadchildren
+{
+  display: inline-block;
+  vertical-align: middle;
+  height: 17px;
+  width: 15px;
+  background: url(images/messageicons.png) center no-repeat;
+}
+
+#messagelist tr td.attachment span.attachment
+{
+  background-position: 0 -170px;
+}
+
+#messagelist tr td.attachment span.report
+{
+  background-position: 0 -255px;
+}
+
+#messagelist tr td.priority span.priority
+{
+  background-position: 0 -309px;
+}
+
+#messagelist tr td.priority span.prio5
+{
+  background-position: 0 -358px;
+}
+
+#messagelist tr td.priority span.prio4
+{
+  background-position: 0 -340px;
+}
+
+#messagelist tr td.priority span.prio3
+{
+  background-position: 0 -324px;
+}
+
+#messagelist tr td.priority span.prio2
+{
+  background-position: 0 -309px;
+}
+
+#messagelist tr td.priority span.prio1
+{
+  background-position: 0 -290px;
+}
+
+#messagelist tr td.flag span.flagged
+{
+  background-position: 0 -153px;
+}
+
+#messagelist tr td.flag span.unflagged:hover
+{
+  background-position: 0 -136px;
+}
+
+#messagelist tr td.subject span.msgicon,
+#messagelist tr td.subject span.unreadchildren
+{
+  background-position: 0 -51px;
+  margin: 0 2px;
+}
+
+#messagelist tr td.subject span.replied
+{
+  background-position: 0 -85px;
+}
+
+#messagelist tr td.subject span.forwarded
+{
+  background-position: 0 -68px;
+}
+
+#messagelist tr td.subject span.replied.forwarded
+{
+  background-position: 0 -102px;
+}
+
+#messagelist tr td.status span.msgicon,
+#messagelist tr td.flag span.unflagged,
+#messagelist tr td.status span.unreadchildren
+{
+  background-position: 0 17px; /* no icon */
+}
+
+#messagelist tr td.status span.msgicon:hover
+{
+  background-position: 0 -272px;
+}
+
+#messagelist tr td.status span.deleted,
+#messagelist tr td.subject span.deleted
+{
+  background-position: 0 -187px;
+}
+
+#messagelist tr td.status span.status,
+#messagelist tr td.status span.unread,
+#messagelist tr td.subject span.unread
+{
+  background-position: 0 -119px;
+}
+
+#messagelist tr td div.collapsed
+{
+  background-position: 0 -221px;
+  cursor: pointer;
+}
+
+#messagelist tr td div.expanded
+{
+  background-position: 0 -204px;
+  cursor: pointer;
+}
+
+#messagelist tr td.threads div.listmenu
+{
+  background-position: 0 -238px;
+  cursor: pointer;
+}
+
+#messagelist tbody tr td.subject
+{
+  width: 99%;
+}
+
+#messagelist tbody tr td.subject a
+{
+  cursor: default;
+  vertical-align: middle; /* #1487091 */
+}
+
+/* thread parent message with unread children */
+#messagelist tbody tr.unroot td.subject a
+{
+  text-decoration: underline;
+}
+
+#messagelist tr td.attachment,
+#messagelist tr td.threads,
+#messagelist tr td.status,
+#messagelist tr td.flag,
+#messagelist tr td.priority
+{
+  width: 17px;
+  padding: 0 0 0 2px;
+}
+
+#messagelist tr td.size
+{
+  width: 60px;
+  text-align: right;
+  padding: 0 2px;
+}
+
+#messagelist tr td.from,
+#messagelist tr td.to,
+#messagelist tr td.cc,
+#messagelist tr td.replyto
+{
+  width: 180px;
+  padding: 0 2px;
+}
+
+#messagelist tr td.date
+{
+  width: 118px;
+  padding: 0 2px;
+}
+
+#messagelist tr.message
+{
+  background-color: #FFF;
+}
+
+#messagelist tr.unread
+{
+  font-weight: bold;
+  background-color: #FFFFFF;
+}
+
+#messagelist tr.flagged td,
+#messagelist tr.flagged td a
+{
+  color: #CC0000;
+}
+
+#messagelist tr.selected td
+{
+  color: #FFFFFF;
+  background-color: #CC3333;
+}
+
+#messagelist tr.unfocused td
+{
+  color: #FFFFFF;
+  background-color: #929292;
+}
+
+#messagelist tr.selected td a
+{
+  color: #FFFFFF;
+}
+
+#messagelist tr.unfocused td a
+{
+  color: #FFFFFF;
+}
+
+#messagelist tr.deleted td,
+#messagelist tr.deleted td a
+{
+  color: #CCCCCC;
+}
+
+#listmenu
+{
+  padding: 6px;
+}
+
+#listmenu legend
+{
+  color: #999999;
+}
+
+#listmenu fieldset
+{
+  border: 1px solid #999999;
+  margin: 0 5px;
+  float: left;
+}
+
+#listmenu div
+{
+  padding: 8px 0 3px 0;
+  text-align: center;
+  clear: both;
+}
+
+/***** tree indicators *****/
+
+td span.branch div
+{
+  float: left;
+  height: 16px;
+}
+
+td span.branch div.tree
+{
+  height: 17px;
+  width: 15px;
+  background: url(images/tree.gif) 0px 0px no-repeat;
+}
+
+td span.branch div.l1
+{
+  background-position: 0px 0px; /* L */
+}
+
+td span.branch div.l2
+{
+  background-position: -30px 0px; /* | */
+}
+
+td span.branch div.l3
+{
+  background-position: -15px 0px; /* |- */
+}
+
+
+/** message view styles */
+
+#messageframe
+{
+  position: absolute;
+  top: 0;
+  left: 180px;
+  right: 0;
+  bottom: 0;
+  border: 1px solid #999;
+  background-color: #FFF;
+  overflow: auto;
+  z-index: 1;
+}
+
+div.messageheaderbox
+{
+  margin: -14px 8px 0px 8px;
+  border: 1px solid #ccc;
+}
+
+table.headers-table
+{
+  width: 100%;
+  background-color: #EBEBEB;
+}
+
+#messagebody #full-headers,
+#messagebody table.headers-table
+{
+  width: auto;
+  margin: 6px 8px;
+  background-color: #F4F4F4;
+}
+
+table.headers-table tr td
+{
+  font-size: 11px;
+  border-bottom:1px solid #FFFFFF;
+}
+
+table.headers-table tr td.header-title
+{
+  width: 1%;
+  color: #666666;
+  font-weight: bold;
+  text-align: right;
+  white-space: nowrap;
+  padding: 0 4px 0 8px;
+}
+
+table.headers-table tr td.header
+{
+  width: 99%;
+}
+
+table.headers-table tr td.subject
+{
+  font-weight: bold;
+}
+
+table.headers-table tr td.header span
+{
+  white-space: nowrap;
+}
+
+#attachment-list
+{
+  margin: 0;
+  padding: 0 4px 0 8px;
+  min-height: 16px;
+  list-style-image: none;
+  list-style-type: none;
+  background: url(images/icons/attachment.png) 4px 2px no-repeat #DFDFDF;
+}
+
+#messageframe #attachment-list
+{
+  border-bottom: 1px solid #ccc;
+}
+
+.messageheaderbox #attachment-list
+{
+  border-top: 1px solid #ccc;
+}
+
+#attachment-list:after
+{
+  content: ".";
+  display: block;
+  height: 0;
+  font-size: 0;
+  clear: both;
+  visibility: hidden;
+}
+
+#attachment-list li
+{
+  float: left;
+  height: 18px;
+  font-size: 11px;
+  padding: 2px 0px 0px 15px;
+  white-space: nowrap;
+}
+
+#attachment-list li a
+{
+  text-decoration: none;
+}
+
+#attachment-list li a:hover
+{
+  text-decoration: underline;
+}
+
+#messagebody
+{
+  position:relative;
+  padding-bottom: 10px;
+  background-color: #FFFFFF;
+}
+
+div.message-part,
+div.message-htmlpart
+{
+  padding: 10px 8px;
+  border-top: 1px solid #ccc;
+/*  overflow: hidden; */
+}
+
+#messagebody div:first-child
+{
+  border-top: 0;
+}
+
+div.message-part a,
+div.message-htmlpart a
+{
+  color: #0000CC;
+}
+
+div.message-part pre,
+div.message-htmlpart pre,
+div.message-part div.pre
+{
+  margin: 0px;
+  padding: 0px;
+  font-family: monospace;
+  font-size: 12px;
+  white-space: -moz-pre-wrap !important;
+  white-space: pre-wrap !important;
+  white-space: pre;
+}
+
+div.message-part span.sig
+{
+  color: #666666;
+}
+
+div.message-part blockquote
+{
+  color: blue;
+  border-left: 2px solid blue;
+  border-right: 2px solid blue;
+  background-color: #F6F6F6;
+  margin: 2px 0px;
+  padding: 1px 8px 1px 10px;
+}
+
+div.message-part blockquote blockquote
+{
+  color: green;
+  border-left: 2px solid green;
+  border-right: 2px solid green;
+}
+
+div.message-part blockquote blockquote blockquote
+{
+  color: #990000;
+  border-left: 2px solid #bb0000;
+  border-right: 2px solid #bb0000;
+}
+
+body.iframe div.message-htmlpart
+{
+  margin: 8px;
+}
+
+div.message-htmlpart div.rcmBody
+{
+  margin: 8px;
+}
+
+#messagebody span.part-notice
+{
+  display: block;
+}
+
+#message-objects div,
+#messagebody span.part-notice
+{
+  margin: 8px;
+  min-height: 20px;
+  padding: 10px 10px 6px 46px;
+}
+
+#message-objects div a,
+#messagebody span.part-notice a
+{
+  color: #666666;
+  padding-left: 10px;
+}
+
+#message-objects div a:hover,
+#messagebody span.part-notice a:hover
+{
+  color: #333333;
+}
+
+#messageviewlink
+{
+  position: absolute;
+  top: 8px;
+  right: 10px;
+  width: 15px;
+  height: 15px;
+  border: 0;
+}
+
+#full-headers
+{
+  color: #666666;
+  text-align: center;
+  padding: 2px 6px;
+  border-bottom: 1px solid #ccc;
+  background-color: #EBEBEB;
+}
+
+.messageheaderbox #full-headers
+{
+  border-bottom: 0;
+}
+
+div.more-headers
+{
+  cursor: pointer;
+  height: 8px;
+  border-bottom: 0;
+}
+
+div.show-headers
+{
+  background: url(images/icons/down_small.gif) no-repeat center;
+}
+
+div.hide-headers
+{
+  background: url(images/icons/up_small.gif) no-repeat center;
+}
+
+#headers-source
+{
+  margin: 2px 0;
+  padding: 0.5em;
+  height: 145px;
+  background: white;
+  overflow: auto;
+  font-size: 11px;
+  border: 1px solid #CCC;
+  display: none;
+  text-align: left;
+  color: #333;
+}
+
+
+/** message compose styles */
+
+#compose-container
+{
+  position: absolute;
+  top: 0;
+  left: 185px;
+  right: 0;
+  bottom: 0;
+  margin: 0;
+}
+
+#compose-div
+{
+  position: absolute;
+  top: 85px;
+  bottom: 0;
+  margin: 0;
+  width: 100%;
+}
+
+#compose-div .boxfooter
+{
+  height: 22px;
+  background: none;
+  border-top: 0;
+}
+
+#compose-div .boxlistcontent
+{
+  bottom: 23px;
+}
+
+#compose-body
+{
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: 0;
+  font-size: 9pt;
+  font-family: monospace;
+  border: 1px solid #999;
+  resize: none;
+}
+
+#compose-body_tbl
+{
+  border: 1px solid #999;
+}
+
+#compose-body_tbl td
+{
+  border: none;
+}
+
+#compose-body_tbl tr.mceFirst td.mceToolbar
+{
+  border-bottom: 1px solid #ccc;
+}
+
+#compose-headers
+{
+  width: 100%;
+}
+
+#compose-headers td.editfield
+{
+  padding-right: 8px;
+  width: 95%;
+}
+
+#compose-headers td.top
+{
+  vertical-align: top;
+}
+
+#compose-headers td.title,
+#compose-subject td.title
+{
+  width: 80px !important;
+  font-size: 11px;
+  font-weight: bold;
+  padding-right: 10px;
+  white-space: nowrap;
+  color: #666;
+}
+
+#compose-headers td textarea,
+#compose-headers td input
+{
+  resize: none;
+  width: 100%;
+  border: 1px solid #999;
+}
+
+#compose-headers td textarea
+{
+  height: 32px;
+}
+
+input.from_address
+{
+  width: 80% !important;
+}
+
+#compose-cc,
+#compose-bcc,
+#compose-replyto,
+#compose-followupto
+{
+  display: none;
+}
+
+#compose-editorfooter
+{
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  text-align: right;
+}
+
+#compose-editorfooter label
+{
+  font-size: 11px;
+  font-weight: bold;
+  color: #666;
+}
+
+#compose-buttons
+{
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: auto;
+}
+
+#compose-attachments
+{
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 175px;
+  border: 1px solid #999;
+  background-color: #F9F9F9;
+}
+
+#compose-attachments.droptarget.hover
+{
+  background-color: #F0F0EE;
+  box-shadow: 0 0 5px 0 #999;
+  -moz-box-shadow: 0 0 5px 0 #999;
+  -o-box-shadow: 0 0 5px 0 #999;
+}
+
+#compose-attachments ul
+{
+  margin: 0px;
+  padding: 0px;
+  background-color: #FFF;
+  list-style-image: none;
+  list-style-type: none;
+}
+
+#compose-attachments ul li
+{
+  height: 18px;
+  font-size: 11px;
+  padding-left: 2px;
+  padding-top: 2px;
+  padding-right: 4px;
+  border-bottom: 1px solid #EBEBEB;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
+
+#compose-attachments li a
+{
+  text-indent: -5000px;
+  width: 17px;
+  height: 16px;
+  display: block;
+  float: left;
+  text-decoration: none;
+}
+
+#compose-attachments li img
+{
+  vertical-align: middle;
+}
+
+#compose-attachments li a.delete,
+#compose-attachments li a.cancelupload
+{
+  background-position: 0px -392px;
+}
+
+#compose-attachments li span
+{
+  line-height: 18px;
+  vertical-align: middle;
+}
+
+#attachment-form
+{
+  padding: 6px;
+}
+
+#attachment-form div
+{
+  padding: 2px;
+}
+
+#attachment-form div.buttons
+{
+  margin-top: 4px;
+}
+
+#quota
+{
+  position: absolute;
+  top: 3px;
+  right: 8px;
+  width: 100px;
+}
+
+#quotaimg
+{
+  position: absolute;
+  top: 3px;
+  right: 6px;
+  z-index: 101;
+}
diff --git a/skins/classic/pngbehavior.htc b/skins/classic/pngbehavior.htc
new file mode 100644
index 000000000..fb5f1c8d4
--- /dev/null
+++ b/skins/classic/pngbehavior.htc
@@ -0,0 +1,84 @@
+<public:component lightWeight="true">
+<public:attach event="onpropertychange" onevent="propertyChanged()" />
+<public:attach event="onbeforeprint" onevent="beforePrint()" for="window"/>
+<public:attach event="onafterprint" onevent="afterPrint()" for="window"/>
+<script>
+
+/*
+ * PNG Behavior
+ *
+ * This script was created by Erik Arvidsson (http://webfx.eae.net/contact.html#erik)
+ * for WebFX (http://webfx.eae.net)
+ * Copyright 2002-2004
+ *
+ * For usage see license at http://webfx.eae.net/license.html
+ *
+ * Version: 1.02
+ * Created: 2001-??-??	First working version
+ * Updated: 2002-03-28	Fixed issue when starting with a non png image and
+ *                      switching between non png images
+ *          2003-01-06	Fixed RegExp to correctly work with IE 5.0x
+ *          2004-05-09  When printing revert to original
+ *
+ */
+
+var supported = /MSIE ((5\.5)|6)/.test(navigator.userAgent) && navigator.platform == "Win32",
+  realSrc,
+  blankSrc = "skins/default/images/blank.gif",
+  isPrinting = false;
+
+if (supported) fixImage();
+
+function propertyChanged() {
+	if (!supported || isPrinting) return;
+
+	var pName = event.propertyName;
+	if (pName != "src") return;
+	// if not set to blank
+	if (!new RegExp(blankSrc).test(src))
+		fixImage();
+};
+
+function fixImage() {
+	// get src
+	var src = element.src;
+
+	// check for real change
+	if (src == realSrc && /\.png$/i.test(src)) {
+		element.src = blankSrc;
+		return;
+	}
+
+	if ( ! new RegExp(blankSrc).test(src)) {
+		// backup old src
+		realSrc = src;
+	}
+
+	// test for png
+	if (/\.png$/i.test(realSrc)) {
+		// set blank image
+		element.src = blankSrc;
+		// set filter
+		element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft." +
+					"AlphaImageLoader(src='" + src + "',sizingMethod='scale')";
+	}
+	else {
+		// remove filter
+		element.runtimeStyle.filter = "";
+	}
+}
+
+function beforePrint() {
+	isPrinting = true;
+	element.src = realSrc;
+	element.runtimeStyle.filter = "";
+	realSrc = null;
+}
+
+function afterPrint() {
+	isPrinting = false;
+	fixImage();
+}
+
+</script>
+</public:component>
diff --git a/skins/classic/print.css b/skins/classic/print.css
new file mode 100644
index 000000000..129770d25
--- /dev/null
+++ b/skins/classic/print.css
@@ -0,0 +1,137 @@
+/***** Roundcube|Mail message print styles *****/
+
+body
+{
+  font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+  background-color: #ffffff;
+  color: #000000;
+  margin: 2mm;
+}
+
+body, td, th, span, div, p
+{
+  font-size: 9pt;
+  color: #000000;
+}
+
+h3
+{
+  font-size: 18px;
+  color: #000000;
+}
+
+a, a:active, a:visited
+{
+  color: #000000;
+}
+
+body > #logo
+{
+  float: right;
+  margin: 0 5mm 3mm 5mm;
+}
+
+table.headers-table
+{
+  table-layout: fixed;
+  margin-top: 14px;
+}
+
+table.headers-table tr td
+{
+  font-size: 9pt;
+}
+
+table.headers-table td.header-title
+{
+  color: #666666;
+  font-weight: bold;
+  text-align: right;
+  vertical-align: top;
+  padding-right: 4mm;
+  white-space: nowrap;
+}
+
+table.headers-table tr td.subject
+{
+  width: 90%;
+  font-weight: bold;
+}
+
+#attachment-list
+{
+  margin-top: 3mm;
+  padding-top: 3mm;
+  border-top: 1pt solid #cccccc;
+}
+
+#attachment-list li
+{
+  font-size: 9pt;
+}
+
+#attachment-list li a
+{
+  text-decoration: none;
+}
+
+#attachment-list li a:hover
+{
+  text-decoration: underline;
+}
+
+#messagebody
+{
+  margin-top: 5mm;
+  border-top: none;
+}
+
+div.message-part
+{
+  padding: 2mm;
+  margin-top: 5mm;
+  margin-bottom: 5mm;
+  border-top: 1pt solid #cccccc;
+}
+
+div.message-part a
+{
+  color: #0000CC;
+}
+
+div.message-part pre,
+div.message-htmlpart pre,
+div.message-part div.pre
+{
+  margin: 0;
+  padding: 0;
+  font-family: monospace;
+  white-space: -moz-pre-wrap !important;
+  white-space: pre-wrap !important;
+  white-space: pre;
+  word-wrap: break-word; /* IE (and Safari) */
+}
+
+div.message-part blockquote
+{
+  color: blue;
+  border-left: 2px solid blue;
+  border-right: 2px solid blue;
+  background-color: #F6F6F6;
+  margin: 2px 0px;
+  padding: 1px 8px 1px 10px;
+}
+
+div.message-part blockquote blockquote
+{
+  color: green;
+  border-left: 2px solid green;
+  border-right: 2px solid green;
+}
+
+div.message-part blockquote blockquote blockquote
+{
+  color: #990000;
+  border-left: 2px solid #bb0000;
+  border-right: 2px solid #bb0000;
+}
diff --git a/skins/classic/safari.css b/skins/classic/safari.css
new file mode 100644
index 000000000..a1be85ab4
--- /dev/null
+++ b/skins/classic/safari.css
@@ -0,0 +1,22 @@
+body
+{
+  height: 100%;
+}
+
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) { width: 99.8%; }
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.flag,
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.icon { width: 20px; }
+html>body*input[type$="file"]:not([class="none"]) { background-color: transparent; border: 0; }
+
+div.message-part pre,
+div.message-htmlpart pre,
+div.message-part div.pre
+{
+  word-wrap: break-word;
+}
+
+#messagelist thead tr td,
+#messagelist tbody tr td
+{
+  height: 18px;
+}
diff --git a/skins/classic/settings.css b/skins/classic/settings.css
new file mode 100644
index 000000000..24c4382b5
--- /dev/null
+++ b/skins/classic/settings.css
@@ -0,0 +1,215 @@
+/***** Roundcube|Mail settings task styles *****/
+
+#rcmfd_timezone
+{
+  width: 300px;
+}
+
+#folder-manager.droptarget
+{
+  border: 1px solid #CC3333;
+  background-color: #FFFFA6;
+}
+
+#identities-table,
+#subscription-table,
+#sections-table
+{
+  width: 100%;
+  table-layout: fixed;
+}
+
+#subscription-table input
+{
+  font: inherit;
+}
+
+#subscription-table tbody td,
+#identities-table tbody td,
+#sections-table tbody td
+{
+  cursor: default;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  height: 18px;
+}
+
+#subscription-table tr.virtual td
+{
+  color: #666;
+}
+
+#subscription-table tr.root td
+{
+  font-size: 10%;
+  height: 5px;
+}
+
+#subscription-table tr.selected td
+{
+  color: #FFFFFF;
+  background-color: #CC3333;
+}
+
+#subscription-table tr.droptarget td
+{
+  background-color: #FFFFA6;
+}
+
+#subscription-table td.name
+{
+  width: auto;
+}
+
+#subscription-table td.subscribed
+{
+  text-align: right;
+  padding-right: 12px;
+}
+
+#folder-box,
+#prefs-box,
+#identity-box
+{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  border: 1px solid #999999;
+  overflow: hidden;
+  background-color: #F2F2F2;
+}
+
+#identity-details table td.title,
+#folder-details table td.title
+{
+  font-weight: bold;
+  text-align: right;
+}
+
+#bottomboxes
+{
+  position: absolute;
+  width: 600px;
+  height: 95px;
+  left: 0;
+  bottom: 0;
+}
+
+#identities-list,
+#folder-manager,
+#sectionslist
+{
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  overflow: hidden;
+}
+
+body.iframe,
+#prefs-frame,
+#folder-frame,
+#identity-frame
+{
+  background-color: #F2F2F2;
+  border: none;
+  min-height: 100%; /* Chrome 14 bug */
+}
+
+#prefs-title,
+#folder-title,
+#identity-title
+{
+  /* fixes issue where tabs were overlapping box title when scrolling */
+  z-index: 10;
+}
+
+#formfooter
+{
+  width: 100%;
+}
+
+#formfooter .footerleft
+{
+  padding: 0 2px 10px;
+  white-space: nowrap;
+  float: left;
+}
+
+#formfooter .footerright
+{
+  padding: 0 2px 10px;
+  white-space: nowrap;
+  text-align: right;
+  float: right;
+}
+
+#quota
+{
+  position: absolute;
+  top: 3px;
+  right: 8px;
+  width: 100px;
+}
+
+#quotaimg
+{
+  position: absolute;
+  top: 3px;
+  right: 6px;
+  z-index: 101;
+}
+
+#rcmfd_signature
+{
+  font-family: monospace;
+}
+
+div.readtext
+{
+  width: 42em;
+  padding: 20px;
+}
+
+#license
+{
+  min-height: 200px;
+  padding-bottom: 2em;
+  background: url(images/watermark.gif) no-repeat center;
+}
+
+#license .sysname
+{
+  font-size: 18px;
+  font-weight: bold;
+}
+
+#license .copyright
+{
+  font-weight: bold;
+}
+
+#license .license,
+#license .links
+{
+  margin-top: 1.5em;
+}
+
+#pluginlist
+{
+  border: 1px solid #999;
+  width: 100%;
+}
+
+#pluginlist td.version
+{
+  text-align: center;
+}
+
+div.crop
+{
+  overflow: auto;
+}
diff --git a/skins/classic/splitter.js b/skins/classic/splitter.js
new file mode 100644
index 000000000..59ebb5151
--- /dev/null
+++ b/skins/classic/splitter.js
@@ -0,0 +1,203 @@
+
+/**
+ * Roundcube splitter GUI class
+ *
+ * @constructor
+ */
+function rcube_splitter(attrib)
+{
+  this.p1id = attrib.p1;
+  this.p2id = attrib.p2;
+  this.id = attrib.id ? attrib.id : this.p1id + '_' + this.p2id + '_splitter';
+  this.orientation = attrib.orientation;
+  this.horizontal = (this.orientation == 'horizontal' || this.orientation == 'h');
+  this.offset = bw.ie6 ? 2 : 0;
+  this.pos = attrib.start ? attrib.start * 1 : 0;
+  this.relative = attrib.relative ? true : false;
+  this.drag_active = false;
+  this.callback = attrib.callback;
+
+  this.init = function()
+  {
+    this.p1 = document.getElementById(this.p1id);
+    this.p2 = document.getElementById(this.p2id);
+
+    // create and position the handle for this splitter
+    this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
+    this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
+
+    if (this.horizontal) {
+      var top = this.p1pos.top + this.p1.offsetHeight;
+      this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10, 
+    	    width: '100%', vis: 1, parent: this.p1.parentNode});
+    }
+    else {
+      var left = this.p1pos.left + this.p1.offsetWidth;
+      this.layer = new rcube_layer(this.id, {x: left, y: 0, width: 10, 
+    	    height: '100%', vis: 1,  parent: this.p1.parentNode});
+    }
+
+    this.elm = this.layer.elm;
+    this.elm.className = 'splitter '+(this.horizontal ? 'splitter-h' : 'splitter-v');
+    this.elm.unselectable = 'on';
+
+    // add the mouse event listeners
+    rcube_event.add_listener({element: this.elm, event:'mousedown', object:this, method:'onDragStart'});
+    if (bw.ie)
+      rcube_event.add_listener({element: window, event:'resize', object:this, method:'onResize'});
+
+    // read saved position from cookie
+    var cookie = bw.get_cookie(this.id);
+    if (cookie && !isNaN(cookie)) {
+      this.pos = parseFloat(cookie);
+      this.resize();
+    }
+    else if (this.pos) {
+      this.resize();
+      this.set_cookie();
+    }
+  };
+
+  /**
+   * Set size and position of all DOM objects
+   * according to the saved splitter position
+   */
+  this.resize = function()
+  {
+    if (this.horizontal) {
+      var lh = this.layer.height - this.offset * 2;
+      this.p1.style.height = Math.floor(this.pos - this.p1pos.top - lh / 2) + 'px';
+      this.p2.style.top = Math.ceil(this.pos + lh / 2) + 'px';
+      this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
+      if (bw.ie) {
+        var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
+        this.p2.style.height = (new_height > 0 ? new_height : 0) + 'px';
+      }
+    }
+    else {
+      this.p1.style.width = Math.floor(this.pos - this.p1pos.left - this.layer.width / 2) + 'px';
+      this.p2.style.left = Math.ceil(this.pos + this.layer.width / 2) + 'px';
+      this.layer.move(Math.round(this.pos - this.layer.width / 2 + 1), this.layer.y);
+      if (bw.ie) {
+        var new_width = parseInt(this.p2.parentNode.offsetWidth, 10) - parseInt(this.p2.style.left, 10) ;
+        this.p2.style.width = (new_width > 0 ? new_width : 0) + 'px';
+      }
+    }
+    $(this.p2).resize();
+    $(this.p1).resize();
+  };
+
+  /**
+   * Handler for mousedown events
+   */
+  this.onDragStart = function(e)
+  {
+    // disable text selection while dragging the splitter
+    if (bw.konq || bw.chrome || bw.safari)
+      document.body.style.webkitUserSelect = 'none';
+
+    this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
+    this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
+    this.drag_active = true;
+
+    // start listening to mousemove events
+    rcube_event.add_listener({element:document, event:'mousemove', object:this, method:'onDrag'});
+    rcube_event.add_listener({element:document, event:'mouseup', object:this, method:'onDragStop'});
+
+    // enable dragging above iframes
+    $('iframe').each(function() {
+      $('<div class="iframe-splitter-fix"></div>')
+        .css({background: '#fff',
+          width: this.offsetWidth+'px', height: this.offsetHeight+'px',
+          position: 'absolute', opacity: '0.001', zIndex: 1000
+        })
+        .css($(this).offset())
+        .appendTo('body');
+      });
+  };
+
+  /**
+   * Handler for mousemove events
+   */
+  this.onDrag = function(e)
+  {
+    if (!this.drag_active)
+      return false;
+
+    var pos = rcube_event.get_mouse_pos(e);
+
+    if (this.relative) {
+      var parent = $(this.p1.parentNode).offset();
+      pos.x -= parent.left;
+      pos.y -= parent.top;
+    }
+
+    if (this.horizontal) {
+      if (((pos.y - this.layer.height * 1.5) > this.p1pos.top) && ((pos.y + this.layer.height * 1.5) < (this.p2pos.top + this.p2.offsetHeight))) {
+        this.pos = pos.y;
+        this.resize();
+      }
+    }
+    else {
+      if (((pos.x - this.layer.width * 1.5) > this.p1pos.left) && ((pos.x + this.layer.width * 1.5) < (this.p2pos.left + this.p2.offsetWidth))) {
+        this.pos = pos.x;
+        this.resize();
+      }
+    }
+
+    this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
+    this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
+    return false;
+  };
+
+  /**
+   * Handler for mouseup events
+   */
+  this.onDragStop = function(e)
+  {
+    // resume the ability to highlight text
+    if (bw.konq || bw.chrome || bw.safari)
+      document.body.style.webkitUserSelect = 'auto';
+
+    // cancel the listening for drag events
+    rcube_event.remove_listener({element:document, event:'mousemove', object:this, method:'onDrag'});
+    rcube_event.remove_listener({element:document, event:'mouseup', object:this, method:'onDragStop'});
+    this.drag_active = false;
+
+    // remove temp divs
+    $('div.iframe-splitter-fix').each(function() { this.parentNode.removeChild(this); });
+
+    this.set_cookie();
+
+    if (typeof this.callback == 'function')
+      this.callback(this);
+
+    return bw.safari ? true : rcube_event.cancel(e);
+  };
+
+  /**
+   * Handler for window resize events
+   */
+  this.onResize = function(e)
+  {
+    if (this.horizontal) {
+      var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
+      this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
+    }
+    else {
+      var new_width = parseInt(this.p2.parentNode.offsetWidth, 10) - parseInt(this.p2.style.left, 10);
+      this.p2.style.width = (new_width > 0 ? new_width : 0) + 'px';
+    }
+  };
+
+  /**
+   * Saves splitter position in cookie
+   */
+  this.set_cookie = function()
+  {
+    var exp = new Date();
+    exp.setYear(exp.getFullYear() + 1);
+    bw.set_cookie(this.id, this.pos, exp);
+  };
+
+} // end class rcube_splitter
diff --git a/skins/classic/templates/about.html b/skins/classic/templates/about.html
new file mode 100644
index 000000000..f51180699
--- /dev/null
+++ b/skins/classic/templates/about.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="mainscreen" class="box darkbg crop">
+<div class="readtext">
+<div id="license">
+<roundcube:object name="aboutcontent" />
+<h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
+<p class="copyright">Copyright &copy; 2005-2012, The Roundcube Dev Team</p>
+<p class="license">This program is free software; you can redistribute it and/or modify
+it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a>
+as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/>
+Some <a href="http://roundcube.net/license">exceptions</a> for skins &amp; plugins apply.
+</p>
+<p class="links"><roundcube:object name="supportlink" label="support" target="_blank" /></p>
+</div>
+
+<h4>Installed plugins</h4>
+<roundcube:object name="pluginlist" id="pluginlist" class="records-table" cellspacing="0" />
+
+</div>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html
new file mode 100644
index 000000000..d77bb38d9
--- /dev/null
+++ b/skins/classic/templates/addressbook.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/splitter.js"></script>
+<script type="text/javascript" src="/functions.js"></script>
+<style type="text/css">
+#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
+#contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
+	<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255).')+\\'px\\');') : ''" />
+#directorylistbox { width: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd-5 : 195" />px; }
+#addressscreen { left: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205" />px;
+	<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205).')+\\'px\\');') : ''" />
+}
+</style>
+
+</head>
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+
+<div id="abooktoolbar">
+<roundcube:button command="add" type="link" class="buttonPas addcontact" classAct="button addcontact" classSel="button addcontactSel" title="newcontact" content=" " />
+<roundcube:button command="compose" type="link" class="buttonPas compose" classAct="button compose" classSel="button composeSel" title="composeto" content=" " />
+<roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletecontact" content=" " />
+<span class="separator">&nbsp;</span>
+<roundcube:button command="import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="importcontacts" content=" " />
+<roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="exportvcards" content=" " />
+<roundcube:button command="advanced-search" type="link" class="buttonPas search" classAct="button search" classSel="button searchSel" title="advsearch" content=" " />
+<roundcube:container name="toolbar" id="abooktoolbar" />
+</div>
+
+<div id="quicksearchbar">
+<roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass_roll.png" onclick="rcmail_ui.show_popup('searchmenu');return false" title="searchmod" width="16" height="16" />
+<roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
+</div>
+
+<div id="searchmenu" class="popupmenu">
+  <ul class="toolbarmenu">
+    <li><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_name"><roundcube:label name="name" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_firstname"><roundcube:label name="firstname" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_surname"><roundcube:label name="surname" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_email"><roundcube:label name="email" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_all"><roundcube:label name="allfields" /></label></li>
+  </ul>
+</div>
+
+<div id="mainscreen">
+
+<div id="directorylistbox">
+<div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div>
+<div id="directorylist-content" class="boxlistcontent">
+  <roundcube:object name="directorylist" id="directorylist" />
+  <roundcube:object name="groupslist" id="contactgroupslist" />
+</div>
+<div id="directorylist-footer" class="boxfooter">
+  <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
+  <roundcube:button name="groupmenulink" id="groupmenulink" type="link" title="moreactions" class="button groupactions" onclick="rcmail_ui.show_popup('groupmenu');return false" content=" " />
+</div>
+</div>
+
+<div id="addressscreen">
+
+<div id="addresslist">
+<div class="boxtitle"><roundcube:label name="contacts" /></div>
+<div class="boxlistcontent">
+<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" noheader="true" />
+</div>
+<div class="boxfooter">
+<div id="abookcountbar" class="pagenav">
+  <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
+  <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
+  <roundcube:object name="recordsCountDisplay" style="padding:0 .5em; float:left" />
+  <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
+  <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
+</div>
+</div>
+</div>
+
+<script type="text/javascript">
+  var addrviewsplit = new rcube_splitter({id:'addressviewsplitter', p1: 'addresslist', p2: 'contacts-box', orientation: 'v', relative: true, start: 250});
+  rcmail.add_onload('addrviewsplit.init()');
+
+  var addrviewsplitd = new rcube_splitter({id:'addressviewsplitterd', p1: 'directorylistbox', p2: 'addressscreen', orientation: 'v', relative: true, start: 200});
+  rcmail.add_onload('addrviewsplitd.init()');
+</script>
+
+<div id="contacts-box">
+<roundcube:object name="addressframe" id="contact-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+</div>
+</div>
+
+<div id="groupoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="group-rename" label="grouprename" classAct="active" /></li>
+    <li><roundcube:button command="group-delete" label="groupdelete" classAct="active" /></li>
+    <li><roundcube:button command="group-remove-selected" label="groupremoveselected" classAct="active" /></li>
+    <li class="separator_above"><roundcube:button command="search-create" label="searchsave" classAct="active" /></li>
+    <li><roundcube:button command="search-delete" label="searchdelete" classAct="active" /></li>
+    <roundcube:container name="groupoptions" id="groupoptionsmenu" />
+  </ul>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
new file mode 100644
index 000000000..caebf31a0
--- /dev/null
+++ b/skins/classic/templates/compose.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="productname" /> :: <roundcube:label name="compose" /></title>
+<roundcube:include file="/includes/links.html" />
+<roundcube:if condition="config:enable_spellcheck" />
+<link rel="stylesheet" type="text/css" href="/googiespell.css" />
+<roundcube:endif />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+<style type="text/css">
+#compose-attachments { width: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv-5 : 175" />px; }
+#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 185" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 180).')+\\'px\\');') : ''" />
+}
+</style>
+</head>
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+
+<form name="form" action="./" method="post">
+
+<div id="messagetoolbar">
+    <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
+    <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " />
+<roundcube:if condition="config:enable_spellcheck" />
+    <span class="dropbutton">
+        <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " />
+        <span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span>
+    </span>
+<roundcube:endif />
+    <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
+    <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " />
+    <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
+    <roundcube:container name="toolbar" id="compose-toolbar" />
+    <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " />
+</div>
+
+<div id="mainscreen">
+
+<div id="compose-attachments">
+<div class="boxtitle"><roundcube:label name="attachments" /></div>
+<div class="boxlistcontent">
+    <roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
+</div>
+<div class="boxfooter">
+  <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
+</div>
+</div>
+<roundcube:object name="fileDropArea" id="compose-attachments" />
+
+<script type="text/javascript">
+  var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 175});
+  rcmail.add_onload('composesplitv.init()');
+</script>
+
+<div id="compose-container">
+    <div id="compose-headers-div" style="width: 100%;">
+        <table border="0" cellspacing="0" cellpadding="1" id="compose-headers">
+        <tr>
+            <td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
+            <td class="editfield formlinks">
+                <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
+                <a href="#identities" onclick="return rcmail.command('identities')"><roundcube:label name="editidents" /></a>
+            </td>
+        </tr><tr>
+            <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
+            <td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /></td>
+        </tr><tr id="compose-cc">
+            <td class="title top">
+                <a href="#cc" onclick="return rcmail_ui.hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
+                <label for="_cc"><roundcube:label name="cc" /></label>
+            </td>
+            <td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /></td>
+        </tr><tr id="compose-bcc">
+            <td class="title top">
+                <a href="#bcc" onclick="return rcmail_ui.hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
+                <label for="_bcc"><roundcube:label name="bcc" /></label>
+            </td>
+            <td colspan="2" class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /></td>
+        </tr><tr id="compose-replyto">
+            <td class="title top">
+                <a href="#replyto" onclick="return rcmail_ui.hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
+                <label for="_replyto"><roundcube:label name="replyto" /></label>
+            </td>
+            <td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
+        </tr><tr id="compose-followupto">
+            <td class="title top">
+                <a href="#followupto" onclick="return rcmail_ui.hide_header_form('followupto');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
+                <label for="_followupto"><roundcube:label name="followupto" /></label>
+            </td>
+            <td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
+        </tr><tr>
+            <td></td>
+            <td class="formlinks">
+                <a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
+                <span class="separator">|</span>
+                <a href="#bcc" onclick="return rcmail_ui.show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a>
+                <span class="separator">|</span>
+                <a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a>
+                <span class="separator">|</span>
+                <a href="#followup-to" onclick="return rcmail_ui.show_header_form('followupto')" id="followupto-link"><roundcube:label name="addfollowupto" /></a>
+            </td>
+        </tr><tr>
+            <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
+            <td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="8" /></td>
+        </tr>
+        </table>
+    </div>
+    <div id="compose-div">
+        <div class="boxlistcontent" style="overflow: hidden; top: 0">
+            <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="9" />
+        </div>
+        <div class="boxfooter">
+            <div id="compose-buttons">
+                <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
+                <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
+            </div>
+            <div id="compose-editorfooter">
+                <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
+                <span>
+                    <label><roundcube:label name="editortype" /></label>
+                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
+                </span>
+                <roundcube:endif />
+            </div>
+        </div>
+    </div>
+</div>
+
+</div>
+
+<div id="composeoptionsmenu" class="popupmenu">
+    <table>
+    <tr>
+        <td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
+        <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
+    </tr><tr>
+        <td><label for="rcmcomposedsn"><roundcube:label name="dsn" />:</label></td>
+        <td><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /></td>
+    </tr><tr>
+        <td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
+        <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
+    </tr><tr>
+        <td><label><roundcube:label name="savesentmessagein" />:</label></td>
+        <td><roundcube:object name="storetarget" maxlength="30" /></td>
+    </tr>
+    </table>
+</div>
+
+<div id="spellmenu" class="popupmenu selectable"></div>
+
+</form>
+
+<roundcube:object name="composeAttachmentForm" id="attachment-form" attachmentFieldSize="40" class="popupmenu" />
+
+</body>
+</html>
diff --git a/skins/classic/templates/contact.html b/skins/classic/templates/contact.html
new file mode 100644
index 000000000..d74a78b27
--- /dev/null
+++ b/skins/classic/templates/contact.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="contactproperties" /></div>
+<div id="contact-details" class="boxcontent">
+  <roundcube:if condition="strlen(env:sourcename)" />
+    <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
+  <roundcube:endif />
+
+  <div id="contactphoto"><roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" /></div>
+  <roundcube:object name="contacthead" id="contacthead" />
+  <div style="clear:both"></div>
+  <div id="contacttabs">
+    <roundcube:object name="contactdetails" />
+  </div>
+  <p>
+    <roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" />
+  </p>
+</div>
+<script type="text/javascript">rcube_init_tabs('contacttabs')</script>
+
+</body>
+</html>
diff --git a/skins/classic/templates/contactadd.html b/skins/classic/templates/contactadd.html
new file mode 100644
index 000000000..05cc8aa82
--- /dev/null
+++ b/skins/classic/templates/contactadd.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe" onload="rcube_init_mail_ui()">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
+<div id="contact-details" class="boxcontent">
+<form name="editform" method="post" action="./">
+  <roundcube:if condition="strlen(env:sourcename)" />
+    <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" /></div>
+  <roundcube:endif />
+  <div id="contactphoto">
+    <roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
+    <div class="formlinks">
+      <roundcube:button command="upload-photo" id="uploadformlink" type="link" label="addphoto" class="disabled" classAct="active" onclick="rcmail_ui.show_popup('uploadform', true);return false" condition="env:photocol" /><br/>
+      <roundcube:button command="delete-photo" type="link" label="delete" class="disabled" classAct="active" condition="env:photocol" />
+    </div>
+  </div>
+  <roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
+  <div style="clear:both"></div>
+  <div id="contacttabs">
+    <roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
+  </div>
+  <p>
+    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
+    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+  </p>
+</form>
+</div>
+
+<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
+<roundcube:object name="fileDropArea" id="contactpic" />
+
+<script type="text/javascript">rcube_init_tabs('contacttabs')</script>
+
+</body>
+</html>
diff --git a/skins/classic/templates/contactedit.html b/skins/classic/templates/contactedit.html
new file mode 100644
index 000000000..db8599ac6
--- /dev/null
+++ b/skins/classic/templates/contactedit.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe" onload="rcube_init_mail_ui()">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
+<div id="contact-details" class="boxcontent">
+<form name="editform" method="post" action="./">
+  <roundcube:if condition="strlen(env:sourcename)" />
+    <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
+  <roundcube:endif />
+  <div id="contactphoto">
+    <roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
+    <div class="formlinks">
+      <roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="disabled" classAct="active" onclick="rcmail_ui.show_popup('uploadform', true);return false" condition="env:photocol" /><br/>
+      <roundcube:button command="delete-photo" type="link" label="delete" class="disabled" classAct="active" condition="env:photocol" />
+    </div>
+  </div>
+  <roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
+  <div style="clear:both"></div>
+  <div id="contacttabs">
+    <roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
+  </div>
+  <p>
+    <roundcube:button command="show" type="input" class="button" label="cancel" />&nbsp;
+    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+  </p>
+</form>
+</div>
+
+<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
+<roundcube:object name="fileDropArea" id="contactpic" />
+
+<script type="text/javascript">rcube_init_tabs('contacttabs')</script>
+
+</body>
+</html>
diff --git a/skins/classic/templates/contactsearch.html b/skins/classic/templates/contactsearch.html
new file mode 100644
index 000000000..23cbec4cb
--- /dev/null
+++ b/skins/classic/templates/contactsearch.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="advsearch" /></div>
+<div id="contact-details" class="boxcontent">
+  <roundcube:object name="searchform" id="advsearchform" size=30 />
+  <p><roundcube:button command="save" type="input" class="button mainaction" label="search" /></p>
+</div>
+<script type="text/javascript">rcube_init_tabs('advsearchform')</script>
+
+</body>
+</html>
diff --git a/skins/classic/templates/error.html b/skins/classic/templates/error.html
new file mode 100644
index 000000000..fdd7c887b
--- /dev/null
+++ b/skins/classic/templates/error.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="productname" /> :: ERROR</title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body>
+
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />
+
+<div style="width:400px; margin:60px auto;">
+$__page_content
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/folderedit.html b/skins/classic/templates/folderedit.html
new file mode 100644
index 000000000..28b9a5507
--- /dev/null
+++ b/skins/classic/templates/folderedit.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="folder-title" class="boxtitle"><roundcube:label name="folderproperties" /></div>
+
+<div id="folder-details" class="boxcontent">
+  <roundcube:object name="folderdetails" />
+  <div id="formfooter">
+    <div class="footerleft">
+      <roundcube:if condition="!strlen(request:_mbox)" />
+        <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
+      <roundcube:endif />
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+    </div>
+  </div>
+</div>
+<script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
+
+</body>
+</html>
diff --git a/skins/classic/templates/folders.html b/skins/classic/templates/folders.html
new file mode 100644
index 000000000..1ae8809ec
--- /dev/null
+++ b/skins/classic/templates/folders.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+<style type="text/css">
+#folder-manager { width: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter-5 : 295" />px; }
+#folder-box { left: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305" />px;
+    <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305).')+\\'px\\');') : ''" />
+}
+</style>
+</head>
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="mainscreen">
+
+<div id="folder-manager">
+<div id="folderlist-title" class="boxtitle"><span class="rightalign"><roundcube:label name="subscribed" /></span><roundcube:label name="folders" /></div>
+<div id="folderlist-content" class="boxlistcontent">
+    <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" noheader="true"
+        cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table" />
+</div>
+<div id="folderlist-footer" class="boxfooter">
+    <roundcube:button command="create-folder" type="link" title="createfolder" class="buttonPas addgroup" classAct="button addgroup" content=" " />
+    <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
+
+    <roundcube:if condition="env:quota" />
+    <img id="quotaimg" src="/images/quota.<roundcube:exp expression="browser:ie && browser:ver < 7 ? 'gif' : 'png'" />" alt="" width="102" height="16" />
+    <div id="quota">
+        <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" />
+    </div>
+    <roundcube:endif />
+</div>
+</div>
+
+<script type="text/javascript">
+    var folderviewsplit = new rcube_splitter({id:'folderviewsplitter', p1: 'folder-manager', p2: 'folder-box', orientation: 'v', relative: true, start: 300 });
+    rcmail.add_onload('folderviewsplit.init()');
+</script>
+
+<div id="folder-box">
+    <roundcube:object name="folderframe" id="folder-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+</div>
+
+<div id="mailboxoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="delete-folder" label="delete" classAct="active" /></li>
+    <li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+  </ul>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/identities.html b/skins/classic/templates/identities.html
new file mode 100644
index 000000000..464afd545
--- /dev/null
+++ b/skins/classic/templates/identities.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+<style type="text/css">
+#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; }
+#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px;
+  <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" />
+}
+</style>
+
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="mainscreen">
+
+<div id="identities-list">
+<div id="identity-title" class="boxtitle"><roundcube:label name="identities" /></div>
+<div class="boxlistcontent">
+<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" noheader="true" editIcon="" />
+</div>
+<div class="boxfooter">
+<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="buttonPas delgroup" classAct="button delgroup" content=" " condition="config:identities_level:0<2" />
+</div>
+</div>
+
+<script type="text/javascript">
+  var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-box', orientation: 'v', relative: true, start: 300 });
+  rcmail.add_onload('identviewsplit.init()');
+</script>
+
+<div id="identity-box">
+  <roundcube:object name="identityframe" id="identity-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/identityedit.html b/skins/classic/templates/identityedit.html
new file mode 100644
index 000000000..3b33752ca
--- /dev/null
+++ b/skins/classic/templates/identityedit.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+<style type="text/css">
+#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; }
+#identity-details { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px;
+  <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" />
+}
+</style>
+
+</head>
+<body class="iframe">
+
+<div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
+
+<div id="identity-details" class="boxcontent">
+  <roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
+
+  <script type="text/javascript">rcube_init_tabs('identity-form')</script>
+
+  <div id="formfooter">
+    <div class="footerleft">
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/importcontacts.html b/skins/classic/templates/importcontacts.html
new file mode 100644
index 000000000..05c7eb7b7
--- /dev/null
+++ b/skins/classic/templates/importcontacts.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen" class="box darkbg">
+<div class="boxtitle"><roundcube:label name="importcontacts" /></div>
+
+<div class="boxcontent">
+<roundcube:object name="importstep" />
+
+<p><br />
+<roundcube:object name="importnav" class="button" />
+</p>
+
+</div>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html
new file mode 100644
index 000000000..db5771fb1
--- /dev/null
+++ b/skins/classic/templates/login.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<meta name="Robots" content="noindex,nofollow" />
+<roundcube:include file="/includes/links.html" />
+</head>
+<body>
+
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" style="margin:0 11px" />
+
+<roundcube:object name="message" id="message" />
+
+<div id="login-form">
+<div class="boxtitle"><roundcube:label name="welcome" /></div>
+<div class="boxcontent">
+
+<form name="form" action="./" method="post">
+<roundcube:object name="loginform" form="form" />
+
+<p style="text-align:center;"><input type="submit" class="button mainaction" value="<roundcube:label name='login' />" /></p>
+
+</form>
+</div>
+</div>
+
+<div id="login-bottomline">
+  Roundcube Webmail <roundcube:object name="version" />
+  <roundcube:if condition="config:support_url" />
+    &nbsp;&#9679;&nbsp; <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
+  <roundcube:endif />
+  <roundcube:container name="loginfooter" id="bottomline" />
+</div>
+
+<roundcube:object name="preloader" images="
+    /images/icons/folders.png
+    /images/mail_footer.png
+    /images/taskicons.gif
+    /images/display/loading.gif
+    /images/pagenav.gif
+    /images/mail_toolbar.png
+    /images/searchfield.gif
+    /images/messageicons.png
+    /images/icons/reset.gif
+    /images/abook_toolbar.png
+    /images/icons/groupactions.png
+    /images/watermark.gif
+" />
+
+</body>
+</html>
diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html
new file mode 100644
index 000000000..74e984719
--- /dev/null
+++ b/skins/classic/templates/mail.html
@@ -0,0 +1,203 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/splitter.js"></script>
+<script type="text/javascript" src="/functions.js"></script>
+<style type="text/css">
+<roundcube:if condition="config:preview_pane == true" />
+#mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; }
+#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
+<roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+25 : 245).')+\\'px\\');') : ''" />
+}
+<roundcube:endif />
+#mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 175" />px; }
+#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 185" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" />
+}
+</style>
+</head>
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen">
+<div id="mailleftcontainer">
+<div id="mailboxlist-container">
+<div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
+<div id="mailboxlist-content"  class="boxlistcontent">
+<roundcube:object name="mailboxlist" id="mailboxlist" folder_filter="mail" />
+</div>
+<div id="mailboxlist-footer" class="boxfooter">
+  <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
+
+<roundcube:if condition="env:quota" />
+<img id="quotaimg" src="/images/quota.<roundcube:exp expression="browser:ie && browser:ver < 7 ? 'gif' : 'png'" />" alt="" width="102" height="16" />
+<div id="quota">
+  <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" />
+</div>
+<roundcube:endif />
+</div>
+</div>
+
+<script type="text/javascript">
+  var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailleftcontainer', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165, callback: rcube_render_mailboxlist });
+  rcmail.add_onload('mailviewsplitv.init()');
+</script>
+
+</div>
+
+<div id="mailrightcontainer">
+<div id="mailrightcontent">
+<div id="mailcontframe">
+<div id="messagelistcontainer" class="boxlistcontent" style="top:0">
+<roundcube:object name="messages"
+  id="messagelist"
+  cellspacing="0"
+  columns=""
+  summary="Message list"
+  optionsmenuIcon="true" />
+</div>
+<div class="boxfooter">
+    <div id="listcontrols" class="pagenav">
+        <span><roundcube:label name="select" />:&nbsp;</span>
+        <roundcube:button command="select-all" type="link" title="all" class="buttonPas all" classAct="button all" classSel="button allsel" content=" " />
+        <roundcube:button command="select-all" type="link" prop="page" title="currpage" class="buttonPas page" classAct="button page" classSel="button pagesel" content=" " />
+        <roundcube:button command="select-all" type="link" prop="unread" title="unread" class="buttonPas unread" classAct="button unread" classSel="button unreadsel" content=" " />
+        <roundcube:button command="select-all" type="link" prop="invert" title="invert" class="buttonPas invert" classAct="button invert" classSel="button invertsel" content=" " />
+        <roundcube:button command="select-none" type="link" title="none" class="buttonPas none" classAct="button none" classSel="button nonesel" content=" " />
+        <roundcube:container name="listcontrols" id="listcontrols" />
+    <roundcube:if condition="env:threads" />
+        <span style="margin-left: 12px"><roundcube:label name="threads" />:&nbsp;</span>
+        <roundcube:button command="expand-all" type="link" title="expand-all" class="buttonPas expand-all" classAct="button expand-all" classSel="button expand-allsel" content=" "  />
+        <roundcube:button command="expand-unread" type="link" title="expand-unread" class="buttonPas expand-unread" classAct="button expand-unread" classSel="button expand-unreadsel" content=" " />
+        <roundcube:button command="collapse-all" type="link" title="collapse-all" class="buttonPas collapse-all" classAct="button collapse-all" classSel="button collapse-allsel" content=" " />
+    <roundcube:endif />
+    <roundcube:if condition="!in_array('preview_pane', (array)config:dont_override)" />
+        <span style="margin-left: 12px"><label for="prevpaneswitch"><roundcube:label name="previewpane" />:</label>
+            <input type="checkbox" id="prevpaneswitch" onclick="rcmail_ui.switch_preview_pane(this)"<roundcube:exp expression="config:preview_pane == true ? ' checked=checked' : ''" /> />
+        </span>
+    <roundcube:endif />
+    </div>
+    <div id="countcontrols" class="pagenav">
+        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
+        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
+        <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
+        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
+        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
+    </div>
+</div>
+</div>
+
+<script type="text/javascript">
+  var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 205});
+<roundcube:if condition="config:preview_pane == true" />
+  rcmail.add_onload('mailviewsplit.init()');
+<roundcube:endif />
+</script>
+
+<div id="mailpreviewframe"<roundcube:if condition="config:preview_pane != true" /> style="display:none"<roundcube:endif />>
+<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+</div>
+
+</div>
+</div>
+
+<roundcube:include file="/includes/messagetoolbar.html" />
+
+<div id="searchmenu" class="popupmenu">
+  <ul class="toolbarmenu">
+    <li><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_subject"><roundcube:label name="subject" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="from" id="s_mod_from" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_from"><roundcube:label name="from" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="to" id="s_mod_to" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_to"><roundcube:label name="to" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="cc" id="s_mod_cc" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_cc"><roundcube:label name="cc" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_bcc"><roundcube:label name="bcc" /></label></li>
+    <li><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_text"><roundcube:label name="msgtext" /></label></li>
+  </ul>
+</div>
+
+<div id="quicksearchbar">
+<div id="searchfilter">
+  <label for="rcmlistfilter"><roundcube:label name="filter" /></label>:
+  <roundcube:object name="searchfilter" class="searchfilter" />
+</div>
+<roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass_roll.png" onclick="rcmail_ui.show_popup('searchmenu');return false" title="searchmod" width="16" height="16" />
+<roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
+</div>
+
+<div id="dragmessagemenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="moveto" onclick="return rcmail.drag_menu_action('moveto')" label="move" classAct="active" /></li>
+    <li><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
+  </ul>
+</div>
+
+<div id="mailboxoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
+    <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+    <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+  </ul>
+</div>
+
+<div id="listmenu" class="popupmenu">
+<roundcube:if condition="env:threads" />
+<fieldset class="thinbordered"><legend><roundcube:label name="listmode" /></legend>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="view" value="list" id="view_default" /><label for="view_default"><roundcube:label name="list" /></label></li>
+    <li><input type="radio" name="view" value="thread" id="view_thread" /><label for="view_thread"><roundcube:label name="threads" /></label></li>
+  </ul>
+</fieldset>
+<roundcube:endif />
+<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
+<fieldset class="thinbordered"><legend><roundcube:label name="listcolumns" /></legend>
+  <ul class="toolbarmenu">
+    <li><input type="checkbox" name="list_col[]" value="threads" id="cols_threads" checked="checked" disabled="disabled" /><label for="cols_threads" class="disabled"><roundcube:label name="threads" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject" class="disabled"><roundcube:label name="subject" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="from" id="cols_fromto" /><label for="cols_fromto"><roundcube:label name="fromto" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="replyto" id="cols_replyto" /><label for="cols_replyto"><roundcube:label name="replyto" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="cc" id="cols_cc" /><label for="cols_cc"><roundcube:label name="cc" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="date" id="cols_date" /><label for="cols_date"><roundcube:label name="date" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="size" id="cols_size" /><label for="cols_size"><roundcube:label name="size" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="status" id="cols_status" /><label for="cols_status"><roundcube:label name="readstatus" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="priority" id="cols_priority" /><label for="cols_priority"><roundcube:label name="priority" /></label></li>
+  </ul>
+</fieldset>
+<roundcube:endif />
+<roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" />
+<fieldset class="thinbordered"><legend><roundcube:label name="listsorting" /></legend>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="sort_col" value="" id="sort_default" /><label for="sort_default"><roundcube:label name="nonesort" /></label></li>
+    <li><input type="radio" name="sort_col" value="arrival" id="sort_arrival" /><label for="sort_arrival"><roundcube:label name="arrival" /></label></li>
+    <li><input type="radio" name="sort_col" value="date" id="sort_date" /><label for="sort_date"><roundcube:label name="sentdate" /></label></li>
+    <li><input type="radio" name="sort_col" value="subject" id="sort_subject" /><label for="sort_subject"><roundcube:label name="subject" /></label></li>
+    <li><input type="radio" name="sort_col" value="from" id="sort_fromto" /><label for="sort_fromto"><roundcube:label name="fromto" /></label></li>
+    <li><input type="radio" name="sort_col" value="to" id="sort_replyto" /><label for="sort_replyto"><roundcube:label name="replyto" /></label></li>
+    <li><input type="radio" name="sort_col" value="cc" id="sort_cc" /><label for="sort_cc"><roundcube:label name="cc" /></label></li>
+    <li><input type="radio" name="sort_col" value="size" id="sort_size" /><label for="sort_size"><roundcube:label name="size" /></label></li>
+  </ul>
+</fieldset>
+<roundcube:endif />
+<roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" />
+<fieldset><legend><roundcube:label name="listorder" /></legend> 
+	  <ul class="toolbarmenu"> 
+	    <li><input type="radio" name="sort_ord" value="ASC" id="sort_asc" /><label for="sort_asc"><roundcube:label name="asc" /></label></li> 
+	    <li><input type="radio" name="sort_ord" value="DESC" id="sort_desc" /><label for="sort_desc"><roundcube:label name="desc" /></label></li> 
+	  </ul> 
+</fieldset>
+<roundcube:endif />
+<div>
+  <roundcube:button command="menu-open" id="listmenucancel" type="input" class="button" label="cancel" />
+  <roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" />
+</div>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
new file mode 100644
index 000000000..714540b78
--- /dev/null
+++ b/skins/classic/templates/message.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/splitter.js"></script>
+<script type="text/javascript" src="/functions.js"></script>
+<style type="text/css">
+#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; }
+#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" />
+}
+</style>
+</head>
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/messagetoolbar.html" />
+
+<div id="mainscreen">
+<div id="mailleftcontainer">
+<div id="mailboxlist-container">
+<div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
+<div class="boxlistcontent">
+<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
+</div>
+<div class="boxfooter">
+  <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
+</div>
+</div>
+</div>
+
+<div id="messageframe">
+<div class="boxlistcontent" style="top:0; overflow-x:auto">
+<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
+<roundcube:object name="messageFullHeaders" id="full-headers" />
+<roundcube:object name="messageAttachments" id="attachment-list" />
+<roundcube:object name="messageObjects" id="message-objects" />
+<roundcube:object name="messageBody" id="messagebody" />
+</div>
+<div class="boxfooter">
+<div id="countcontrols" class="pagenav">
+  <roundcube:button command="lastmessage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessage" content=" " />
+  <roundcube:button command="nextmessage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessage" content=" " />
+  <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
+  <roundcube:button command="previousmessage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessage" content=" " />
+  <roundcube:button command="firstmessage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessage" content=" " />
+</div>
+</div>
+</div>
+
+</div>
+
+<script type="text/javascript">
+    var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
+    rcmail.add_onload('mailviewsplitv.init()');
+</script>
+
+<div id="mailboxoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
+    <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+    <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+  </ul>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/messageerror.html b/skins/classic/templates/messageerror.html
new file mode 100644
index 000000000..9af45f432
--- /dev/null
+++ b/skins/classic/templates/messageerror.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name='productname' /> :: <roundcube:label name='servererror' /></title>
+<roundcube:include file="/includes/links.html" />
+
+<roundcube:if condition="env:action!='show'" />
+
+</head>
+<body class="iframe" style="background-color:#F2F2F2;">
+
+<div style="margin:20px auto; text-align:center">
+<img src="/images/watermark.gif" width="260" height="228" alt="" />
+</div>
+
+</body>
+
+<roundcube:else />
+
+<script type="text/javascript" src="/splitter.js"></script>
+<script type="text/javascript" src="/functions.js"></script>
+<style type="text/css">
+#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; }
+#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" />
+}
+</style>
+</head>
+
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+
+<div id="messagetoolbar">
+<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
+<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
+</div>
+
+<div id="mainscreen">
+<div id="mailleftcontainer">
+<div id="mailboxlist-container">
+<div class="boxtitle"><roundcube:label name="mailboxlist" /></div>
+<div class="boxlistcontent">
+<roundcube:object name="mailboxlist" id="mailboxlist" folder_filter="mail" />
+</div>
+<div class="boxfooter">
+  <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
+</div>
+</div>
+</div>
+
+<div id="messageframe" style="background-color:#F2F2F2;">
+<div style="margin:20px auto; text-align:center">
+<img src="/images/watermark.gif" width="260" height="228" alt="" />
+</div>
+</div>
+
+</div>
+
+<script type="text/javascript">
+    var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
+    rcmail.add_onload('mailviewsplitv.init()');
+</script>
+
+<div id="mailboxoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
+    <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+    <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+  </ul>
+</div>
+
+</body>
+<roundcube:endif />
+
+</html>
diff --git a/skins/classic/templates/messagepart.html b/skins/classic/templates/messagepart.html
new file mode 100644
index 000000000..ce7dbe2e1
--- /dev/null
+++ b/skins/classic/templates/messagepart.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="extwin">
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="partheader">
+<roundcube:object name="messagePartControls" cellpadding="2" cellspacing="0" />
+
+<div style="position:absolute; top:2px; right:0; width:12em; text-align:right">
+  [<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>]
+</div>
+</div>
+
+
+<div id="messagepartcontainer">
+<roundcube:object name="messagePartFrame" id="messagepartframe" width="100%" height="100%" />
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
new file mode 100644
index 000000000..a606311e1
--- /dev/null
+++ b/skins/classic/templates/messagepreview.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="iframe">
+
+<div class="messageheaderbox">
+<roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" />
+<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
+<roundcube:object name="messageFullHeaders" id="full-headers" />
+<roundcube:object name="messageAttachments" id="attachment-list" />
+</div>
+
+<roundcube:object name="messageObjects" id="message-objects" />
+<roundcube:object name="messageBody" id="messagebody" />
+
+</body>
+</html>
diff --git a/skins/classic/templates/messageprint.html b/skins/classic/templates/messageprint.html
new file mode 100644
index 000000000..fa7822ad5
--- /dev/null
+++ b/skins/classic/templates/messageprint.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<link rel="shortcut icon" href="/images/favicon.ico"/>
+<link rel="stylesheet" type="text/css" href="/print.css" />
+</head>
+<body>
+
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />
+
+<div id="printmessageframe">
+<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />
+<roundcube:object name="messageAttachments" id="attachment-list" />
+<roundcube:object name="messageBody" id="messagebody" showImages="false" />
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/plugin.html b/skins/classic/templates/plugin.html
new file mode 100644
index 000000000..cec701301
--- /dev/null
+++ b/skins/classic/templates/plugin.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:if condition="env:task == 'settings'" />
+  <roundcube:include file="/includes/settingstabs.html" />
+<roundcube:endif />
+
+<div id="mainscreen">
+<roundcube:object name="plugin.body" />
+</div>
+  
+<roundcube:object name="plugin.footer" />
+
+</body>
+</html>
diff --git a/skins/classic/templates/settings.html b/skins/classic/templates/settings.html
new file mode 100644
index 000000000..0cd623f75
--- /dev/null
+++ b/skins/classic/templates/settings.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+
+<style type="text/css">
+#sectionslist { width: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter-5 : 190" />px; }
+#prefs-box { left: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200" />px;
+<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200).')+\\'px\\');') : ''" />
+}
+</style>
+
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="mainscreen">
+
+<div id="sectionslist">
+<roundcube:object name="sectionslist" id="sections-table" class="records-table" cellspacing="0" />
+</div>
+
+<script type="text/javascript">
+  var prefviewsplit = new rcube_splitter({id:'prefsviewsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195});
+  rcmail.add_onload('prefviewsplit.init()');
+</script>
+
+<div id="prefs-box">
+<roundcube:object name="prefsframe" id="prefs-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/settingsedit.html b/skins/classic/templates/settingsedit.html
new file mode 100644
index 000000000..642eb094e
--- /dev/null
+++ b/skins/classic/templates/settingsedit.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="prefs-title" class="boxtitle"><roundcube:object name="sectionname" /></div>
+
+<div id="prefs-details" class="boxcontent">
+  <roundcube:object name="userprefs" form="form" />
+  <div id="formfooter">
+    <div class="footerleft">
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/watermark.html b/skins/classic/watermark.html
new file mode 100644
index 000000000..c16a50357
--- /dev/null
+++ b/skins/classic/watermark.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title></title>
+  <!--[if IE]>
+  <style type="text/css">
+    body { width: expression((parseInt(document.documentElement.clientWidth)-20)+'px'); }
+  </style>
+  <![endif]-->
+</head>
+
+<body style="background-color:#F2F2F2;">
+
+<div style="margin:20px auto; text-align:center">
+<img src="images/watermark.gif" width="260" height="228" alt="" />
+</div>
+
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3