146 files changed, 442 insertions, 193 deletions

diff --git a/skins/default/README b/skins/classic/README
index ba690d733..ba690d733 100644
--- a/skins/default/README
+++ b/skins/classic/README
diff --git a/skins/default/addressbook.css b/skins/classic/addressbook.css
index ad7aeffd8..a398325b4 100644
--- a/skins/default/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -310,6 +310,13 @@ body.iframe,
 	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;
diff --git a/skins/default/common.css b/skins/classic/common.css
index 7f13a858e..735a73614 100644
--- a/skins/default/common.css
+++ b/skins/classic/common.css
@@ -370,6 +370,10 @@ body.iframe .boxtitle
   background-position: 0 -26px;
 }
 
+.boxfooter a.delgroup {
+  background-position: 0 -49px;
+}
+
 .boxfooter a.buttonPas
 {
   opacity: 0.35;
@@ -770,7 +774,7 @@ a.rcmContactAddress:hover
 	margin: 5em auto;
 	font-size: 85%;
 	text-align: center;
-	color: #333;
+	color: #666;
 }
 
 #console
diff --git a/skins/default/editor_content.css b/skins/classic/editor_content.css
index aabed07b5..aabed07b5 100644
--- a/skins/default/editor_content.css
+++ b/skins/classic/editor_content.css
diff --git a/skins/default/functions.js b/skins/classic/functions.js
index 48f9acd75..48f9acd75 100644
--- a/skins/default/functions.js
+++ b/skins/classic/functions.js
diff --git a/skins/default/googiespell.css b/skins/classic/googiespell.css
index 8adadc256..8adadc256 100644
--- a/skins/default/googiespell.css
+++ b/skins/classic/googiespell.css
diff --git a/skins/default/ie6hacks.css b/skins/classic/ie6hacks.css
index 53a2e5e1d..53a2e5e1d 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/classic/ie6hacks.css
diff --git a/skins/default/iehacks.css b/skins/classic/iehacks.css
index d09be3d80..2bd3ce865 100644
--- a/skins/default/iehacks.css
+++ b/skins/classic/iehacks.css
@@ -150,6 +150,16 @@ body.iframe div.messageheaderbox
   height: expression((parseInt(this.parentNode.offsetHeight)-1-parseInt(document.getElementById('compose-headers').offsetHeight))+'px');
 }
 
+#compose-attachments ul li
+{
+  width: 1000px; /* for IE7 */
+}
+
+#compose-attachments li a
+{
+  float: left; /* for IE7 */
+}
+
 #messagelist
 {
   width: inherit;
diff --git a/skins/default/images/abook_toolbar.gif b/skins/classic/images/abook_toolbar.gif
index 2e8f4e259..2e8f4e259 100644
--- a/skins/default/images/abook_toolbar.gif
+++ b/skins/classic/images/abook_toolbar.gif
diff --git a/skins/default/images/abook_toolbar.png b/skins/classic/images/abook_toolbar.png
index feb95c026..feb95c026 100644
--- a/skins/default/images/abook_toolbar.png
+++ b/skins/classic/images/abook_toolbar.png
diff --git a/skins/default/images/buttons/add_act.png b/skins/classic/images/buttons/add_act.png
index e94fcd6a0..e94fcd6a0 100644
--- a/skins/default/images/buttons/add_act.png
+++ b/skins/classic/images/buttons/add_act.png
diff --git a/skins/default/images/buttons/add_pas.png b/skins/classic/images/buttons/add_pas.png
index 9f67c5202..9f67c5202 100644
--- a/skins/default/images/buttons/add_pas.png
+++ b/skins/classic/images/buttons/add_pas.png
diff --git a/skins/default/images/buttons/add_sel.png b/skins/classic/images/buttons/add_sel.png
index 2a3719fba..2a3719fba 100644
--- a/skins/default/images/buttons/add_sel.png
+++ b/skins/classic/images/buttons/add_sel.png
diff --git a/skins/default/images/buttons/bg.gif b/skins/classic/images/buttons/bg.gif
index be39f4a35..be39f4a35 100644
--- a/skins/default/images/buttons/bg.gif
+++ b/skins/classic/images/buttons/bg.gif
diff --git a/skins/default/images/cleardot.png b/skins/classic/images/cleardot.png
index 98c3bfcca..98c3bfcca 100644
--- a/skins/default/images/cleardot.png
+++ b/skins/classic/images/cleardot.png
diff --git a/skins/default/images/contactpic.png b/skins/classic/images/contactpic.png
index bdb6cdcc0..bdb6cdcc0 100644
--- a/skins/default/images/contactpic.png
+++ b/skins/classic/images/contactpic.png
diff --git a/skins/default/images/dbutton.png b/skins/classic/images/dbutton.png
index 7a85e3c5d..7a85e3c5d 100644
--- a/skins/default/images/dbutton.png
+++ b/skins/classic/images/dbutton.png
diff --git a/skins/default/images/dimple.png b/skins/classic/images/dimple.png
index 4de496c87..4de496c87 100644
--- a/skins/default/images/dimple.png
+++ b/skins/classic/images/dimple.png
diff --git a/skins/default/images/display/icons.gif b/skins/classic/images/display/icons.gif
index e6dfb1bc6..e6dfb1bc6 100644
--- a/skins/default/images/display/icons.gif
+++ b/skins/classic/images/display/icons.gif
diff --git a/skins/default/images/display/icons.png b/skins/classic/images/display/icons.png
index 7bf4278bf..7bf4278bf 100644
--- a/skins/default/images/display/icons.png
+++ b/skins/classic/images/display/icons.png
diff --git a/skins/default/images/display/loading.gif b/skins/classic/images/display/loading.gif
index 747c65661..747c65661 100644
--- a/skins/default/images/display/loading.gif
+++ b/skins/classic/images/display/loading.gif
diff --git a/skins/default/images/display/loading_blue.gif b/skins/classic/images/display/loading_blue.gif
index 2ea6b19ae..2ea6b19ae 100644
--- a/skins/default/images/display/loading_blue.gif
+++ b/skins/classic/images/display/loading_blue.gif
diff --git a/skins/default/images/favicon.ico b/skins/classic/images/favicon.ico
index b3bd18c12..b3bd18c12 100644
--- a/skins/default/images/favicon.ico
+++ b/skins/classic/images/favicon.ico
diff --git a/skins/default/images/googiespell/change_lang.gif b/skins/classic/images/googiespell/change_lang.gif
index 81451832c..81451832c 100644
--- a/skins/default/images/googiespell/change_lang.gif
+++ b/skins/classic/images/googiespell/change_lang.gif
diff --git a/skins/default/images/googiespell/indicator.gif b/skins/classic/images/googiespell/indicator.gif
index b556bb00f..b556bb00f 100644
--- a/skins/default/images/googiespell/indicator.gif
+++ b/skins/classic/images/googiespell/indicator.gif
diff --git a/skins/default/images/googiespell/ok.gif b/skins/classic/images/googiespell/ok.gif
index 04727e28d..04727e28d 100644
--- a/skins/default/images/googiespell/ok.gif
+++ b/skins/classic/images/googiespell/ok.gif
diff --git a/skins/default/images/googiespell/spellc.gif b/skins/classic/images/googiespell/spellc.gif
index 6ed936090..6ed936090 100644
--- a/skins/default/images/googiespell/spellc.gif
+++ b/skins/classic/images/googiespell/spellc.gif
diff --git a/skins/default/images/icons/attachment.png b/skins/classic/images/icons/attachment.png
index 0fcf46499..0fcf46499 100644
--- a/skins/default/images/icons/attachment.png
+++ b/skins/classic/images/icons/attachment.png
diff --git a/skins/default/images/blank.gif b/skins/classic/images/icons/blank.gif
index 7dd464ea3..7dd464ea3 100644
--- a/skins/default/images/blank.gif
+++ b/skins/classic/images/icons/blank.gif
diff --git a/skins/default/images/icons/collapsed.png b/skins/classic/images/icons/collapsed.png
index 07cc1ec7d..07cc1ec7d 100644
--- a/skins/default/images/icons/collapsed.png
+++ b/skins/classic/images/icons/collapsed.png
diff --git a/skins/default/images/icons/columnpicker.gif b/skins/classic/images/icons/columnpicker.gif
index e776519b3..e776519b3 100644
--- a/skins/default/images/icons/columnpicker.gif
+++ b/skins/classic/images/icons/columnpicker.gif
diff --git a/skins/default/images/icons/delete.png b/skins/classic/images/icons/delete.png
index f1cf0aee7..f1cf0aee7 100644
--- a/skins/default/images/icons/delete.png
+++ b/skins/classic/images/icons/delete.png
diff --git a/skins/default/images/icons/deleted.png b/skins/classic/images/icons/deleted.png
index cffb7f507..cffb7f507 100644
--- a/skins/default/images/icons/deleted.png
+++ b/skins/classic/images/icons/deleted.png
diff --git a/skins/default/images/icons/dot.png b/skins/classic/images/icons/dot.png
index 99f736516..99f736516 100644
--- a/skins/default/images/icons/dot.png
+++ b/skins/classic/images/icons/dot.png
diff --git a/skins/default/images/icons/down_small.gif b/skins/classic/images/icons/down_small.gif
index f865893f4..f865893f4 100644
--- a/skins/default/images/icons/down_small.gif
+++ b/skins/classic/images/icons/down_small.gif
diff --git a/skins/default/images/icons/expanded.png b/skins/classic/images/icons/expanded.png
index 87e77a477..87e77a477 100644
--- a/skins/default/images/icons/expanded.png
+++ b/skins/classic/images/icons/expanded.png
diff --git a/skins/default/images/icons/extwin.png b/skins/classic/images/icons/extwin.png
index 1ab4d7703..1ab4d7703 100644
--- a/skins/default/images/icons/extwin.png
+++ b/skins/classic/images/icons/extwin.png
diff --git a/skins/default/images/icons/flagged.png b/skins/classic/images/icons/flagged.png
index 98215f68c..98215f68c 100644
--- a/skins/default/images/icons/flagged.png
+++ b/skins/classic/images/icons/flagged.png
diff --git a/skins/default/images/icons/folders.gif b/skins/classic/images/icons/folders.gif
index eb06bd8c1..eb06bd8c1 100644
--- a/skins/default/images/icons/folders.gif
+++ b/skins/classic/images/icons/folders.gif
diff --git a/skins/default/images/icons/folders.png b/skins/classic/images/icons/folders.png
index 2580fd1be..2580fd1be 100644
--- a/skins/default/images/icons/folders.png
+++ b/skins/classic/images/icons/folders.png
diff --git a/skins/default/images/icons/forwarded.png b/skins/classic/images/icons/forwarded.png
index 1ea246f8e..1ea246f8e 100644
--- a/skins/default/images/icons/forwarded.png
+++ b/skins/classic/images/icons/forwarded.png
diff --git a/skins/default/images/icons/forwarded_replied.png b/skins/classic/images/icons/forwarded_replied.png
index 4830ecf40..4830ecf40 100644
--- a/skins/default/images/icons/forwarded_replied.png
+++ b/skins/classic/images/icons/forwarded_replied.png
diff --git a/skins/default/images/icons/glass.gif b/skins/classic/images/icons/glass.gif
index 9a705b410..9a705b410 100644
--- a/skins/default/images/icons/glass.gif
+++ b/skins/classic/images/icons/glass.gif
diff --git a/skins/default/images/icons/glass.png b/skins/classic/images/icons/glass.png
index eb1b1dc74..eb1b1dc74 100644
--- a/skins/default/images/icons/glass.png
+++ b/skins/classic/images/icons/glass.png
diff --git a/skins/default/images/icons/glass_roll.png b/skins/classic/images/icons/glass_roll.png
index b11b59854..b11b59854 100644
--- a/skins/default/images/icons/glass_roll.png
+++ b/skins/classic/images/icons/glass_roll.png
diff --git a/skins/classic/images/icons/groupactions.gif b/skins/classic/images/icons/groupactions.gif
new file mode 100644
index 000000000..913c83588
--- /dev/null
+++ b/skins/classic/images/icons/groupactions.gif
diff --git a/skins/classic/images/icons/groupactions.png b/skins/classic/images/icons/groupactions.png
new file mode 100644
index 000000000..91f84bee9
--- /dev/null
+++ b/skins/classic/images/icons/groupactions.png
diff --git a/skins/default/images/icons/minus.gif b/skins/classic/images/icons/minus.gif
index 4ec02c87a..4ec02c87a 100644
--- a/skins/default/images/icons/minus.gif
+++ b/skins/classic/images/icons/minus.gif
diff --git a/skins/default/images/icons/plus.gif b/skins/classic/images/icons/plus.gif
index 854b5eb34..854b5eb34 100644
--- a/skins/default/images/icons/plus.gif
+++ b/skins/classic/images/icons/plus.gif
diff --git a/skins/default/images/icons/rename.png b/skins/classic/images/icons/rename.png
index 7844b0081..7844b0081 100644
--- a/skins/default/images/icons/rename.png
+++ b/skins/classic/images/icons/rename.png
diff --git a/skins/default/images/icons/replied.png b/skins/classic/images/icons/replied.png
index 4a5213262..4a5213262 100644
--- a/skins/default/images/icons/replied.png
+++ b/skins/classic/images/icons/replied.png
diff --git a/skins/default/images/icons/reset.gif b/skins/classic/images/icons/reset.gif
index a9a53d569..a9a53d569 100644
--- a/skins/default/images/icons/reset.gif
+++ b/skins/classic/images/icons/reset.gif
diff --git a/skins/default/images/icons/silhouette.png b/skins/classic/images/icons/silhouette.png
index ac0773514..ac0773514 100644
--- a/skins/default/images/icons/silhouette.png
+++ b/skins/classic/images/icons/silhouette.png
diff --git a/skins/default/images/icons/sort.gif b/skins/classic/images/icons/sort.gif
index f8f275690..f8f275690 100644
--- a/skins/default/images/icons/sort.gif
+++ b/skins/classic/images/icons/sort.gif
diff --git a/skins/default/images/icons/unflagged.png b/skins/classic/images/icons/unflagged.png
index 12023f057..12023f057 100644
--- a/skins/default/images/icons/unflagged.png
+++ b/skins/classic/images/icons/unflagged.png
diff --git a/skins/default/images/icons/unread.png b/skins/classic/images/icons/unread.png
index 31f640632..31f640632 100644
--- a/skins/default/images/icons/unread.png
+++ b/skins/classic/images/icons/unread.png
diff --git a/skins/default/images/icons/unread_children.png b/skins/classic/images/icons/unread_children.png
index 45e671dcc..45e671dcc 100644
--- a/skins/default/images/icons/unread_children.png
+++ b/skins/classic/images/icons/unread_children.png
diff --git a/skins/default/images/icons/up_small.gif b/skins/classic/images/icons/up_small.gif
index 40deb891f..40deb891f 100644
--- a/skins/default/images/icons/up_small.gif
+++ b/skins/classic/images/icons/up_small.gif
diff --git a/skins/default/images/listheader.gif b/skins/classic/images/listheader.gif
index bf77a11c1..bf77a11c1 100644
--- a/skins/default/images/listheader.gif
+++ b/skins/classic/images/listheader.gif
diff --git a/skins/default/images/mail_footer.gif b/skins/classic/images/mail_footer.gif
index 302b55870..302b55870 100644
--- a/skins/default/images/mail_footer.gif
+++ b/skins/classic/images/mail_footer.gif
diff --git a/skins/default/images/mail_footer.png b/skins/classic/images/mail_footer.png
index e2f24b28c..e2f24b28c 100644
--- a/skins/default/images/mail_footer.png
+++ b/skins/classic/images/mail_footer.png
diff --git a/skins/default/images/mail_toolbar.gif b/skins/classic/images/mail_toolbar.gif
index 9856b4265..9856b4265 100644
--- a/skins/default/images/mail_toolbar.gif
+++ b/skins/classic/images/mail_toolbar.gif
diff --git a/skins/default/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
index 6ccc9bd9e..6ccc9bd9e 100644
--- a/skins/default/images/mail_toolbar.png
+++ b/skins/classic/images/mail_toolbar.png
diff --git a/skins/default/images/messageactions.gif b/skins/classic/images/messageactions.gif
index b73fbb354..b73fbb354 100644
--- a/skins/default/images/messageactions.gif
+++ b/skins/classic/images/messageactions.gif
diff --git a/skins/default/images/messageactions.png b/skins/classic/images/messageactions.png
index c09f60fe6..c09f60fe6 100644
--- a/skins/default/images/messageactions.png
+++ b/skins/classic/images/messageactions.png
diff --git a/skins/default/images/messageicons.gif b/skins/classic/images/messageicons.gif
index a914a955a..a914a955a 100644
--- a/skins/default/images/messageicons.gif
+++ b/skins/classic/images/messageicons.gif
diff --git a/skins/default/images/messageicons.png b/skins/classic/images/messageicons.png
index ca7b23075..ca7b23075 100644
--- a/skins/default/images/messageicons.png
+++ b/skins/classic/images/messageicons.png
diff --git a/skins/default/images/pagenav.gif b/skins/classic/images/pagenav.gif
index a4644a4e4..a4644a4e4 100644
--- a/skins/default/images/pagenav.gif
+++ b/skins/classic/images/pagenav.gif
diff --git a/skins/default/images/quota-colors.png b/skins/classic/images/quota-colors.png
index 4c1f17edd..4c1f17edd 100644
--- a/skins/default/images/quota-colors.png
+++ b/skins/classic/images/quota-colors.png
diff --git a/skins/default/images/quota.gif b/skins/classic/images/quota.gif
index 9896d4cae..9896d4cae 100644
--- a/skins/default/images/quota.gif
+++ b/skins/classic/images/quota.gif
diff --git a/skins/default/images/quota.png b/skins/classic/images/quota.png
index e729d3248..e729d3248 100644
--- a/skins/default/images/quota.png
+++ b/skins/classic/images/quota.png
diff --git a/skins/default/images/roundcube_logo.png b/skins/classic/images/roundcube_logo.png
index 4323c6b5f..4323c6b5f 100644
--- a/skins/default/images/roundcube_logo.png
+++ b/skins/classic/images/roundcube_logo.png
diff --git a/skins/default/images/searchfield.gif b/skins/classic/images/searchfield.gif
index 969f277b3..969f277b3 100644
--- a/skins/default/images/searchfield.gif
+++ b/skins/classic/images/searchfield.gif
diff --git a/skins/default/images/tabs-left.gif b/skins/classic/images/tabs-left.gif
index c1bf45aa8..c1bf45aa8 100644
--- a/skins/default/images/tabs-left.gif
+++ b/skins/classic/images/tabs-left.gif
diff --git a/skins/default/images/tabs-right.gif b/skins/classic/images/tabs-right.gif
index 9eba9a342..9eba9a342 100644
--- a/skins/default/images/tabs-right.gif
+++ b/skins/classic/images/tabs-right.gif
diff --git a/skins/default/images/taskbar.gif b/skins/classic/images/taskbar.gif
index b6fc91ce4..b6fc91ce4 100644
--- a/skins/default/images/taskbar.gif
+++ b/skins/classic/images/taskbar.gif
diff --git a/skins/default/images/taskbar.png b/skins/classic/images/taskbar.png
index 5fa366023..5fa366023 100644
--- a/skins/default/images/taskbar.png
+++ b/skins/classic/images/taskbar.png
diff --git a/skins/default/images/taskicons.gif b/skins/classic/images/taskicons.gif
index feaa9a14e..feaa9a14e 100644
--- a/skins/default/images/taskicons.gif
+++ b/skins/classic/images/taskicons.gif
diff --git a/skins/default/images/taskicons.png b/skins/classic/images/taskicons.png
index feaa9a14e..feaa9a14e 100644
--- a/skins/default/images/taskicons.png
+++ b/skins/classic/images/taskicons.png
diff --git a/skins/default/images/tree.gif b/skins/classic/images/tree.gif
index c78f15ef5..c78f15ef5 100644
--- a/skins/default/images/tree.gif
+++ b/skins/classic/images/tree.gif
diff --git a/skins/default/images/watermark.gif b/skins/classic/images/watermark.gif
index d235d0306..d235d0306 100644
--- a/skins/default/images/watermark.gif
+++ b/skins/classic/images/watermark.gif
diff --git a/skins/default/includes/header.html b/skins/classic/includes/header.html
index 08d777af0..08d777af0 100644
--- a/skins/default/includes/header.html
+++ b/skins/classic/includes/header.html
diff --git a/skins/default/includes/links.html b/skins/classic/includes/links.html
index 82673220a..82673220a 100644
--- a/skins/default/includes/links.html
+++ b/skins/classic/includes/links.html
diff --git a/skins/default/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 3f4995b83..3f4995b83 100644
--- a/skins/default/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
diff --git a/skins/default/includes/settingstabs.html b/skins/classic/includes/settingstabs.html
index 0aea80b67..0aea80b67 100644
--- a/skins/default/includes/settingstabs.html
+++ b/skins/classic/includes/settingstabs.html
diff --git a/skins/default/includes/taskbar.html b/skins/classic/includes/taskbar.html
index dfb547b88..dfb547b88 100644
--- a/skins/default/includes/taskbar.html
+++ b/skins/classic/includes/taskbar.html
diff --git a/skins/default/mail.css b/skins/classic/mail.css
index 0e928f0e8..c38d7448c 100644
--- a/skins/default/mail.css
+++ b/skins/classic/mail.css
@@ -1173,6 +1173,7 @@ 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;
@@ -1481,11 +1482,10 @@ input.from_address
 
 #compose-attachments li a
 {
-  text-indent: -1000px;
+  text-indent: -5000px;
   width: 17px;
   height: 16px;
-  display: block;
-  float: left;
+  display: inline-block;
   text-decoration: none;
 }
 
diff --git a/skins/default/pngbehavior.htc b/skins/classic/pngbehavior.htc
index fb5f1c8d4..6f892df64 100644
--- a/skins/default/pngbehavior.htc
+++ b/skins/classic/pngbehavior.htc
@@ -24,7 +24,7 @@
 
 var supported = /MSIE ((5\.5)|6)/.test(navigator.userAgent) && navigator.platform == "Win32",
   realSrc,
-  blankSrc = "skins/default/images/blank.gif",
+  blankSrc = "program/resources/blank.gif",
   isPrinting = false;
 
 if (supported) fixImage();
diff --git a/skins/default/print.css b/skins/classic/print.css
index 129770d25..129770d25 100644
--- a/skins/default/print.css
+++ b/skins/classic/print.css
diff --git a/skins/default/safari.css b/skins/classic/safari.css
index a1be85ab4..a1be85ab4 100644
--- a/skins/default/safari.css
+++ b/skins/classic/safari.css
diff --git a/skins/default/settings.css b/skins/classic/settings.css
index c6d4628f9..24c4382b5 100644
--- a/skins/default/settings.css
+++ b/skins/classic/settings.css
@@ -134,14 +134,14 @@ body.iframe,
 
 #formfooter .footerleft
 {
-  padding-left: 15px;
+  padding: 0 2px 10px;
   white-space: nowrap;
   float: left;
 }
 
 #formfooter .footerright
 {
-  padding-right: 15px;
+  padding: 0 2px 10px;
   white-space: nowrap;
   text-align: right;
   float: right;
diff --git a/skins/default/splitter.js b/skins/classic/splitter.js
index 59ebb5151..59ebb5151 100644
--- a/skins/default/splitter.js
+++ b/skins/classic/splitter.js
diff --git a/skins/default/templates/about.html b/skins/classic/templates/about.html
index f51180699..f51180699 100644
--- a/skins/default/templates/about.html
+++ b/skins/classic/templates/about.html
diff --git a/skins/default/templates/addressbook.html b/skins/classic/templates/addressbook.html
index d77bb38d9..d77bb38d9 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/classic/templates/addressbook.html
diff --git a/skins/default/templates/compose.html b/skins/classic/templates/compose.html
index caebf31a0..caebf31a0 100644
--- a/skins/default/templates/compose.html
+++ b/skins/classic/templates/compose.html
diff --git a/skins/default/templates/contact.html b/skins/classic/templates/contact.html
index d74a78b27..d74a78b27 100644
--- a/skins/default/templates/contact.html
+++ b/skins/classic/templates/contact.html
diff --git a/skins/default/templates/contactadd.html b/skins/classic/templates/contactadd.html
index 67b7bcd6e..05cc8aa82 100644
--- a/skins/default/templates/contactadd.html
+++ b/skins/classic/templates/contactadd.html
@@ -33,6 +33,7 @@
 </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>
 
diff --git a/skins/default/templates/contactedit.html b/skins/classic/templates/contactedit.html
index 77e466141..db8599ac6 100644
--- a/skins/default/templates/contactedit.html
+++ b/skins/classic/templates/contactedit.html
@@ -22,7 +22,6 @@
   </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>
@@ -34,6 +33,7 @@
 </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>
 
diff --git a/skins/default/templates/contactsearch.html b/skins/classic/templates/contactsearch.html
index 23cbec4cb..23cbec4cb 100644
--- a/skins/default/templates/contactsearch.html
+++ b/skins/classic/templates/contactsearch.html
diff --git a/skins/default/templates/error.html b/skins/classic/templates/error.html
index fdd7c887b..fdd7c887b 100644
--- a/skins/default/templates/error.html
+++ b/skins/classic/templates/error.html
diff --git a/skins/default/templates/folderedit.html b/skins/classic/templates/folderedit.html
index c5fa2490f..28b9a5507 100644
--- a/skins/default/templates/folderedit.html
+++ b/skins/classic/templates/folderedit.html
@@ -11,12 +11,14 @@
 
 <div id="folder-details" class="boxcontent">
   <roundcube:object name="folderdetails" />
-  <p>
-    <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" />
-  </p>
+  <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>
 
diff --git a/skins/default/templates/folders.html b/skins/classic/templates/folders.html
index 1ae8809ec..1ae8809ec 100644
--- a/skins/default/templates/folders.html
+++ b/skins/classic/templates/folders.html
diff --git a/skins/default/templates/identities.html b/skins/classic/templates/identities.html
index 70484ebe9..464afd545 100644
--- a/skins/default/templates/identities.html
+++ b/skins/classic/templates/identities.html
@@ -27,7 +27,7 @@
 <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="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>
 
diff --git a/skins/default/templates/identityedit.html b/skins/classic/templates/identityedit.html
index 3aaa7bc1d..3b33752ca 100644
--- a/skins/default/templates/identityedit.html
+++ b/skins/classic/templates/identityedit.html
@@ -18,14 +18,15 @@
 <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>
+  <roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
 
-<div id="formfooter">
-<div class="footerleft">
-  <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
-</div>
+  <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>
diff --git a/skins/default/templates/importcontacts.html b/skins/classic/templates/importcontacts.html
index 05c7eb7b7..05c7eb7b7 100644
--- a/skins/default/templates/importcontacts.html
+++ b/skins/classic/templates/importcontacts.html
diff --git a/skins/default/templates/login.html b/skins/classic/templates/login.html
index db5771fb1..63e09bb10 100644
--- a/skins/default/templates/login.html
+++ b/skins/classic/templates/login.html
@@ -25,7 +25,7 @@
 </div>
 
 <div id="login-bottomline">
-  Roundcube Webmail <roundcube:object name="version" />
+  <roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_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 />
diff --git a/skins/default/templates/mail.html b/skins/classic/templates/mail.html
index 74e984719..74e984719 100644
--- a/skins/default/templates/mail.html
+++ b/skins/classic/templates/mail.html
diff --git a/skins/default/templates/message.html b/skins/classic/templates/message.html
index 714540b78..714540b78 100644
--- a/skins/default/templates/message.html
+++ b/skins/classic/templates/message.html
diff --git a/skins/default/templates/messageerror.html b/skins/classic/templates/messageerror.html
index 9af45f432..9af45f432 100644
--- a/skins/default/templates/messageerror.html
+++ b/skins/classic/templates/messageerror.html
diff --git a/skins/default/templates/messagepart.html b/skins/classic/templates/messagepart.html
index ce7dbe2e1..ce7dbe2e1 100644
--- a/skins/default/templates/messagepart.html
+++ b/skins/classic/templates/messagepart.html
diff --git a/skins/default/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
index a606311e1..a606311e1 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/classic/templates/messagepreview.html
diff --git a/skins/default/templates/messageprint.html b/skins/classic/templates/messageprint.html
index fa7822ad5..fa7822ad5 100644
--- a/skins/default/templates/messageprint.html
+++ b/skins/classic/templates/messageprint.html
diff --git a/skins/default/templates/plugin.html b/skins/classic/templates/plugin.html
index cec701301..cec701301 100644
--- a/skins/default/templates/plugin.html
+++ b/skins/classic/templates/plugin.html
diff --git a/skins/default/templates/settings.html b/skins/classic/templates/settings.html
index 0cd623f75..0cd623f75 100644
--- a/skins/default/templates/settings.html
+++ b/skins/classic/templates/settings.html
diff --git a/skins/default/templates/settingsedit.html b/skins/classic/templates/settingsedit.html
index ec980a8f0..642eb094e 100644
--- a/skins/default/templates/settingsedit.html
+++ b/skins/classic/templates/settingsedit.html
@@ -10,13 +10,12 @@
 <div id="prefs-title" class="boxtitle"><roundcube:object name="sectionname" /></div>
 
 <div id="prefs-details" class="boxcontent">
-<roundcube:object name="userprefs" form="form" />
-</div>
-
-<div id="formfooter">
-<div class="footerleft">
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
+  <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>
diff --git a/skins/default/watermark.html b/skins/classic/watermark.html
index c16a50357..c16a50357 100644
--- a/skins/default/watermark.html
+++ b/skins/classic/watermark.html
diff --git a/skins/default/images/icons/blank.gif b/skins/default/images/icons/blank.gif
deleted file mode 100644
index 7dd464ea3..000000000
--- a/skins/default/images/icons/blank.gif
+++ /dev/null
diff --git a/skins/default/images/icons/groupactions.gif b/skins/default/images/icons/groupactions.gif
deleted file mode 100644
index 15649045e..000000000
--- a/skins/default/images/icons/groupactions.gif
+++ /dev/null
diff --git a/skins/default/images/icons/groupactions.png b/skins/default/images/icons/groupactions.png
deleted file mode 100644
index 9e39bca2e..000000000
--- a/skins/default/images/icons/groupactions.png
+++ /dev/null
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 46b4949da..fe087aece 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -18,6 +18,7 @@
 	left: 0;
 	width: 220px;
 	bottom: 0;
+	z-index: 2;
 }
 
 #addressview-right {
@@ -26,15 +27,17 @@
 	left: 232px;
 	right: 0;
 	bottom: 0;
+	z-index: 3;
 }
 
 #addressbooktoolbar {
 	position: absolute;
 	top: -6px;
 	left: 0;
-	right: 0;
+	right: 260px;
 	height: 40px;
 	white-space: nowrap;
+	z-index: 10;
 }
 
 #directorylistbox {
@@ -67,7 +70,9 @@
 
 #directorylist li a,
 #contacts-table .contact td.name {
-	background: url(images/listicons.png) -100px 0 no-repeat;
+	background-image: url(images/listicons.png);
+	background-position: -100px 0;
+	background-repeat: no-repeat;
 	overflow: hidden;
 	padding-left: 36px;
 	text-overflow: ellipsis;
@@ -158,6 +163,29 @@
 
 #contactpic img {
 	width: 112px;
+	visibility: inherit;
+}
+
+#contactpic.droptarget {
+	background-image: url(images/filedrop.png);
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+#contactpic.droptarget.hover {
+	background-color: #d9ecf4;
+	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+}
+
+#contactpic.droptarget.active img {
+	opacity: 0.15;
+}
+
+#contactpic.droptarget.hover img {
+	opacity: 0.05;
 }
 
 #contacthead {
@@ -289,6 +317,6 @@ a.deletebutton {
 	width: 24px;
 	height: 18px;
 	text-decoration: none;
-	text-indent: -1000px;
+	text-indent: -5000px;
 	background: url(images/buttons.png) -7px -377px no-repeat;
 }
diff --git a/skins/larry/ie7hacks.css b/skins/larry/ie7hacks.css
index f86cbe8aa..6161d03dd 100644
--- a/skins/larry/ie7hacks.css
+++ b/skins/larry/ie7hacks.css
@@ -44,6 +44,10 @@ a.deletebutton,
 	display: inline;
 }
 
+.pagenavbuttons {
+	top: 4px;
+}
+
 .dropbutton .dropbuttontip {
 	right: -2px;
 }
@@ -113,7 +117,7 @@ ul.toolbarmenu li label {
 
 #quicksearchbar input {
 	padding-top: 4px;
-	padding-bottom: 4px;
+	padding-bottom: 2px;
 }
 
 #messagelistfooter #listcontrols,
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 38d68acdd..288202111 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -131,6 +131,10 @@ ul.toolbarmenu li a.active:hover,
 
 /*** mail.css ***/
 
+#messagelistfooter {
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb', endColorstr='#c6c6c6', GradientType=0);
+}
+
 #mailboxlist li.mailbox .unreadcount {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#82acb5', endColorstr='#6a939f', GradientType=0);
 }
@@ -143,6 +147,10 @@ ul.toolbarmenu li a.active:hover,
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e9e9e9', GradientType=0);
 }
 
+#previewheaderstoggle {
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbfbfb', endColorstr='#e9e9e9', GradientType=1);
+}
+
 #composeoptionsbox {
 	border-top: 1px solid #999;
 }
diff --git a/skins/larry/images/contactpic_32px.png b/skins/larry/images/contactpic_32px.png
new file mode 100644
index 000000000..276f1974f
--- /dev/null
+++ b/skins/larry/images/contactpic_32px.png
diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png
index e1378878b..9554658b6 100644
--- a/skins/larry/images/listicons.png
+++ b/skins/larry/images/listicons.png
diff --git a/skins/larry/images/overflowshadow.png b/skins/larry/images/overflowshadow.png
new file mode 100644
index 000000000..54dfdafce
--- /dev/null
+++ b/skins/larry/images/overflowshadow.png
diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html
index 4a6f8f09c..ee93fcf57 100644
--- a/skins/larry/includes/footer.html
+++ b/skins/larry/includes/footer.html
@@ -3,7 +3,7 @@
 // UI startup
 var UI = new rcube_mail_ui();
 $(document).ready(function(){
-	UI.set('errortitle', '<roundcube:label name="errortitle" />');
+	UI.set('errortitle', '<roundcube:label name="errortitle" quoting="javascript" />');
 	UI.init();
 });
 
diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index 317ff15dd..f750e061a 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -1,18 +1,11 @@
-<div id="mailtoolbar" class="toolbar">
-<roundcube:if condition="template:name == 'message'" />
-<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
-<roundcube:else />
-<roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" />
-<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
-<roundcube:endif />
 <roundcube:button command="reply" type="link" class="button reply disabled" classAct="button reply" classSel="button reply pressed" label="reply" title="replytomessage" />
 <span class="dropbutton">
-<roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
-<span class="dropbuttontip" id="replyallmenulink" onclick="UI.show_popup('replyallmenu');return false"></span>
+	<roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
+	<span class="dropbuttontip" id="replyallmenulink" onclick="UI.show_popup('replyallmenu');return false"></span>
 </span>
 <span class="dropbutton">
-<roundcube:button command="forward" type="link" class="button forward disabled" classAct="button forward" classSel="button forward pressed" label="forward" title="forwardmessage" />
-<span class="dropbuttontip" id="forwardmenulink" onclick="UI.show_popup('forwardmenu');return false"></span>
+	<roundcube:button command="forward" type="link" class="button forward disabled" classAct="button forward" classSel="button forward pressed" label="forward" title="forwardmessage" />
+	<span class="dropbuttontip" id="forwardmenulink" onclick="UI.show_popup('forwardmenu');return false"></span>
 </span>
 <roundcube:button command="delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="deletemessage" />
 <roundcube:if condition="template:name == 'message'" />
@@ -23,7 +16,6 @@
 <roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="button markmessage" label="mark" title="markmessages" onclick="UI.show_popup('markmessagemenu');return false" />
 <roundcube:endif />
 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.show_popup('messagemenu');return false" />
-</div>
 
 <div id="forwardmenu" class="popupmenu">
 	<ul class="toolbarmenu">
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index ab87cd865..695697f6b 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -18,6 +18,7 @@
 	left: 0;
 	width: 220px;
 	bottom: 0;
+	z-index: 2;
 }
 
 #mailview-right {
@@ -26,6 +27,7 @@
 	left: 232px;
 	right: 0;
 	bottom: 0;
+	z-index: 3;
 }
 
 #mailview-top {
@@ -36,6 +38,10 @@
 	bottom: 28px;
 }
 
+#mailview-top.fullheight {
+	border-radius: 4px 4px 0 0;
+}
+
 #mailview-bottom {
 	position: absolute;
 	left: 0;
@@ -44,12 +50,6 @@
 	height: 26px;
 }
 
-#mailviewsplitter {
-	right: 30px;
-	width: 30px;
-	left: auto !important;
-}
-
 #folderlist-header {
 	width: 100%;
 	height: 12px;
@@ -67,7 +67,7 @@
 
 #messagelistcontainer {
 	top: 0;
-	bottom: 32px;
+	bottom: 30px;
 	overflow: auto;
 }
 
@@ -76,8 +76,20 @@
 	bottom: 0;
 	left: 0;
 	right: 0;
-	height: 26px;
-	padding: 2px;
+	height: 22px;
+	padding: 4px 6px;
+	border-top: 1px solid #ddd;
+	background: #ebebeb;
+	background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#c6c6c6));
+	background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
+	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
+	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
+	border-radius: 0 0 4px 4px;
+}
+
+#mailview-top.fullheight #messagelistfooter {
+	border-radius: 0;
 }
 
 #messagelistfooter.rightalign {
@@ -92,6 +104,11 @@
 #messagelistfooter #listselectors {
 	display: inline-block;
 	margin-right: 2em;
+	vertical-align: middle;
+}
+
+#messagelistfooter #listselectors .menuselector {
+	margin-top: -2px;
 }
 
 a.iconbutton.listmode {
@@ -301,7 +318,14 @@ a.iconbutton.threadmode.selected {
 }
 
 #searchfilter {
-	width: 16em;
+	position: absolute;
+	right: 256px;
+	width: auto;
+	top: 7px;
+}
+
+#searchfilter select {
+	height: 26px;
 }
 
 #mailview-left select.mailboxlist {
@@ -313,25 +337,35 @@ a.iconbutton.threadmode.selected {
 #messagetoolbar {
 	position: absolute;
 	top: -6px;
-	right: 0;
-	left: 15em;
+	right: 390px;
+	left: 0;
 	height: 40px;
 	white-space: nowrap;
+	z-index: 10;
 }
 
 #messagetoolbar.fullwidth {
-	left: 0;
+	right: 0;
 }
 
-#mailtoolbar {
-	text-align: right;
+#messagetoolbar .toolbarselect {
+	position: absolute;
+	bottom: 6px;
+	right: 3px;
+}
+
+#messagesearchtools {
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 240px;
 }
 
 #mailpreviewtoggle {
 	display: block;
 	position: absolute;
-	top: 4px;
-	right: 2px;
+	top: 6px;
+	right: 4px;
 	width: 20px;
 	height: 18px;
 	background: url(images/buttons.png) -3px -458px no-repeat;
@@ -344,6 +378,14 @@ a.iconbutton.threadmode.selected {
 
 /*** message list ***/
 
+#messagelist thead td:first-child {
+	border-radius: 4px 0 0 0;
+}
+
+#messagelist thead td:last-child {
+	border-radius: 0 4px 0 0;
+}
+
 #messagelist tr td.attachment,
 #messagelist tr td.threads,
 #messagelist tr td.status,
@@ -482,28 +524,29 @@ a.iconbutton.threadmode.selected {
 #messagelist tbody tr td.attachment span.attachment {
 	background-position: 0 -996px;
 }
+
 #messagelist thead tr td.attachment span.attachment {
 	background-position: -24px -997px;
 }
 
-#messagelist tr td.priority {
-	padding-right: 0;
+#messagelist tbody tr td.attachment span.report {
+	background-position: -24px -1116px;
 }
 
 #messagelist tr td.priority span.prio5 {
-	background-position: right -1905px;
+	background-position: 0 -1905px;
 }
 
 #messagelist tr td.priority span.prio4 {
-	background-position: right -1885px;
+	background-position: 0 -1885px;
 }
 
 #messagelist tr td.priority span.prio2 {
-	background-position: right -1865px;
+	background-position: 0 -1865px;
 }
 
 #messagelist tr td.priority span.prio1 {
-	background-position: right -1845px;
+	background-position: 0 -1845px;
 }
 
 #messagelist tbody tr td.flag span.flagged {
@@ -714,29 +757,47 @@ h3.subject {
 	display: none;
 }
 
+#preview-allheaders td.header-title,
 #preview-shortheaders td.header-title {
-	padding-right: 0;
+	padding-left: 0;
 }
 
 #preview-shortheaders td.header {
-	padding-right: 12px;
+	padding-right: 18px;
 }
 
 #previewheaderstoggle {
-    width: 16px;
-    height: 16px;
-    padding: 0;
-    margin-top: 5px;
-    position: absolute;
-    outline: none;
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	width: 18px;
+	padding: 0;
+	outline: none;
+	background: #f2f2f2;
+	background: -moz-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
+	background: -webkit-gradient(linear, left top, right top, color-stop(0,#fbfbfb), color-stop(100%,#e9e9e9));
+	background: -o-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
+	background: -ms-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
+	background: linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
+	border-right: 1px solid #dfdfdf;
 }
 
-#previewheaderstoggle.iconlink.add {
-	background-position: -32px -227px;
+#previewheaderstoggle .iconlink {
+	display: inline-block;
+	position: absolute;
+	top: 8px;
+	left: 0;
+	width: 18px;
+	height: 16px;
+	background: url(images/buttons.png) -27px -242px no-repeat;
 }
 
-#previewheaderstoggle.iconlink.remove {
-	background-position: -32px -242px;
+#previewheaderstoggle.remove .iconlink {
+	top: auto;
+	bottom: 5px;
+	background-position: -5px -242px;
 }
 
 div.more-headers {
@@ -750,7 +811,7 @@ div.hide-headers {
 }
 
 #all-headers {
-    position: relative;
+	position: relative;
 	margin: 0 10px;
 	padding: 0;
 	height: 180px;
@@ -773,17 +834,50 @@ div.hide-headers {
 }
 
 #messagepreviewheader {
-	margin: 0 8px;
-	padding-bottom: 8px;
+	position: relative;
+	height: auto;
+	margin: 0 8px 0 0;
+	padding: 0 0 6px 72px;
 	border-bottom: 2px solid #f0f0f0;
 }
 
-#messagepreviewheader .headers-table {
-	margin-left: 8px;
+#messagepreviewheader h3.subject {
+	padding: 8px 8px 2px 0;
 }
 
-#messagepreviewheader h3.subject {
-	padding-left: 0;
+#messagepreviewheader #contactphoto {
+	display: block;
+	position: absolute;
+	top: 11px;
+	left: 30px;
+	width: 32px;
+	height: 32px;
+	overflow: hidden;
+	background: url(images/contactpic_32px.png) center center no-repeat #fff;
+	border-radius: 3px;
+}
+
+#messagepreviewheader #contactphoto img {
+	width: 32px;
+	height: auto;
+	border-radius: 3px;
+}
+
+#messageheader #contactphoto {
+	display: block;
+	position: absolute;
+	top: 40px;
+	right: 10px;
+	width: 48px;
+	height: 48px;
+	overflow: hidden;
+	border-radius: 4px;
+}
+
+#messageheader #contactphoto img {
+	width: 48px;
+	height: auto;
+	border-radius: 4px;
 }
 
 #messagepreviewheader #countcontrols,
@@ -791,7 +885,7 @@ div.hide-headers {
 	position: absolute;
 	top: 8px;
 	right: 8px;
-	width: 18em;
+	width: 20em;
 	text-align: right;
 	white-space: nowrap;
 }
@@ -865,6 +959,7 @@ 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;
@@ -1210,7 +1305,7 @@ div.message-part blockquote blockquote blockquote {
 
 #uploadform a.iconlink {
 	margin-left: 1em;
-	text-indent: -1000px;
+	text-indent: -5000px;
 }
 
 #uploadform form div {
diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index f962a8457..e0047f9da 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -54,7 +54,9 @@
 #settings-sections span.listitem a,
 #settings-sections span.tablink a {
 	padding-left: 36px;
-	background: url(images/listicons.png) -100px 0 no-repeat;
+	background-image: url(images/listicons.png);
+	background-position: -100px 0;
+	background-repeat: no-repeat;
 }
 
 /* note: support span.tablink because this is used by plugins */
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 7b321ed56..341de9008 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -266,6 +266,7 @@ input.button:active {
 	padding: 1px 3px;
 	height: 16px;
 	vertical-align: middle;
+	margin-bottom: 1px;
 }
 
 .pagenav a.button span.inner {
@@ -315,7 +316,7 @@ input.button:active {
 
 .pagenav .countdisplay {
 	display: inline-block;
-	padding:0 1em;
+	padding: 3px 1em 0 1em;
 	text-shadow: 0px 1px 1px #fff;
 	min-width: 16em;
 }
@@ -330,7 +331,7 @@ a.iconbutton {
 	width: 24px;
 	height: 18px;
 	text-decoration: none;
-	text-indent: -1000px;
+	text-indent: -5000px;
 	background: url(images/buttons.png) -1000px 0 no-repeat;
 }
 
@@ -653,6 +654,15 @@ a.iconlink.upload {
 	background: #fff;
 }
 
+.minwidth {
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	min-width: 1150px;
+}
+
 .scroller {
 	overflow: auto;
 }
@@ -769,6 +779,7 @@ a.iconlink.upload {
 .listing li.selected > a {
 	color: #004458;
 	font-weight: bold;
+	background-color: #c7e3ef;
 }
 
 ul.listing {
@@ -784,7 +795,7 @@ ul.listing li {
 
 ul.listing li.droptarget,
 table.listing tr.droptarget td {
-	background-color: #c7e3ef;
+	background-color: #e8e798;
 }
 
 table.listing,
@@ -827,7 +838,7 @@ table.layout td {
 	display: inline-block;
 	width: 48px;
 	height: 35px;
-	text-indent: -1000px;
+	text-indent: -5000px;
 	background: url(images/buttons.png) -1000px 0 no-repeat;
 }
 
@@ -1034,8 +1045,8 @@ body.iframe {
 	margin: 38px 0 10px 0;
 }
 
-body.iframe.footerbuttons {
-	margin-bottom: 42px;
+body.iframe.floatingbuttons {
+	margin-bottom: 40px;
 }
 
 body.iframe.fullheight {
@@ -1062,14 +1073,25 @@ body.iframe .boxtitle {
 	z-index: 100;
 }
 
-body.iframe .footerbuttons {
+body.iframe .footerleft.floating {
 	position: fixed;
 	left: 0;
 	bottom: 0;
 	width: 100%;
 	z-index: 110;
 	background: #fff;
-	padding: 8px;
+	padding-top: 8px;
+	padding-bottom: 12px;
+}
+
+body.iframe .footerleft.floating:before {
+	content: " ";
+	position: absolute;
+	top: -6px;
+	left: 0;
+	width: 100%;
+	height: 6px;
+	background: url(images/overflowshadow.png) top center no-repeat;
 }
 
 .boxcontent {
@@ -1085,8 +1107,16 @@ body.iframe .footerbuttons {
 	overflow: auto;
 }
 
+.iframebox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 28px;
+}
+
 .footerleft {
-	padding: 0 12px 10px 12px;
+	padding: 0 12px 4px 12px;
 }
 
 .propform fieldset {
@@ -1274,34 +1304,46 @@ ul.proplist li {
 /*** quicksearch **/
 
 #quicksearchbar {
-	width: 100%;
+	position: absolute;
+	right: 1px;
+	top: 0;
+	width: 240px;
 }
 
 #quicksearchbar input {
 	width: 176px;
 	margin: 0;
-	padding: 5px 26px 2px 38px;
+	margin-top: 7px;
+	padding: 3px 30px 3px 34px;
 	height: 18px;
 	background: #f1f1f1;
-	border-color: #a3a3a3;
+	border-color: #ababab;
 	font-weight: bold;
+	font-size: 11px;
 }
 
 #quicksearchbar #searchmenulink {
 	position: absolute;
-	top: 5px;
-	left: 8px;
+	top: 12px;
+	left: 6px;
 }
 
 #quicksearchbar #searchreset {
 	position: absolute;
-	top: 4px;
+	top: 11px;
 	right: 1px;
 }
 
 
 /*** toolbar ***/
 
+.toolbar .spacer {
+	display: inline-block;
+	width: 24px;
+	height: 40px;
+	padding: 0;
+}
+
 .toolbar a.button {
 	text-align: center;
 	font-size: 10px;
@@ -1455,12 +1497,14 @@ a.menuselector {
 	background: linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
 	text-decoration: none;
 	color: #333;
+	cursor: pointer;
 }
 
 a.menuselector .handle {
 	display: inline-block;
-	padding: 3px 32px 0 8px;
-	min-height: 18px;
+	padding: 0 32px 0 6px;
+	height: 20px;
+	line-height: 19px;
 	text-shadow: 0px 1px 1px #fff;
 	background: url(images/selector.png) right center no-repeat;
 	border-radius: 4px;
@@ -1476,18 +1520,6 @@ a.menuselector:active {
 	text-decoration: none;
 }
 
-a.dropdownselector {
-	position: absolute;
-	padding: 1px 0;
-	z-index: 1;
-}
-
-a.dropdownselector .handle {
-	margin: -1px 0;
-	padding-top: 5px;
-	min-height: 20px;
-}
-
 select.decorated {
 	position: relative;
 	z-index: 10;
@@ -1501,7 +1533,6 @@ select.decorated {
 
 html.opera select.decorated {
 	opacity: 1;
-	height: auto;
 }
 
 select.decorated option {
@@ -1511,7 +1542,7 @@ select.decorated option {
 	border-top: 1px solid #5a5a5a;
 	border-bottom: 1px solid #333;
 	text-shadow: 0px 1px 1px #333;
-	padding: 6px 10px;
+	padding: 4px 6px;
 	outline: none;
 }
 
@@ -1941,7 +1972,7 @@ ul.toolbarmenu li span.conversation {
 	height: 18px;
 	padding: 0;
 	text-decoration: none;
-	text-indent: -1000px;
+	text-indent: -5000px;
 	background: url(images/buttons.png) -7px -337px no-repeat;
 }
 
@@ -1956,6 +1987,7 @@ ul.toolbarmenu li span.conversation {
 	margin-bottom: 12px;
 	padding-top: 15px;
 	height: 27px;
+	white-space: nowrap;
 }
 
 .tabsbar .tablink {
diff --git a/skins/larry/svggradient.php b/skins/larry/svggradient.php
index 75705ed30..c54bdec17 100644
--- a/skins/larry/svggradient.php
+++ b/skins/larry/svggradient.php
@@ -18,6 +18,7 @@ header("Pragma: ");
 
 $svg_stops = '';
 $color_stops = explode(';', preg_replace('/[^a-f0-9,;%]/i', '', $_GET['c']));
+$gradient_coords = !empty($_GET['h']) ? 'x1="0%" y1="0%" x2="100%" y2="0%"' : 'x1="0%" y1="0%" x2="0%" y2="100%"';
 $last = count($color_stops) - 1;
 foreach ($color_stops as $i => $stop) {
 	list($color, $offset) = explode(',', $stop);
@@ -32,7 +33,7 @@ foreach ($color_stops as $i => $stop) {
 ?>
 <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" version="1.0" width="100%" height="100%">
 <defs>
-  <linearGradient id="LG1" x1="0%" y1="0%" x2="0%" y2="100%" spreadMethod="pad">
+  <linearGradient id="LG1" <?php echo $gradient_coords; ?> spreadMethod="pad">
     <?php echo $svg_stops; ?>
   </linearGradient>
 </defs>
diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css
index ba596e39f..143fb375f 100644
--- a/skins/larry/svggradients.css
+++ b/skins/larry/svggradients.css
@@ -137,6 +137,13 @@ ul.toolbarmenu li a.active:hover,
 	background-image: url(svggradient.php?c=ffffff;e9e9e9);
 }
 
+#previewheaderstoggle {
+	background-image: url(svggradient.php?c=fbfbfb;e9e9e9&h=1);
+}
+
+#messagelistfooter {
+	background-image: url(svggradient.php?c=ebebeb;c6c6c6);
+}
 
 /*** jqueryui theme ***/
 
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index cec1dcf20..c39c2fe87 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -10,15 +10,18 @@
 
 <div id="mainscreen">
 
-<div id="addressview-left">
-
-<!-- search box -->
-<div id="quicksearchbar">
-<roundcube:object name="searchform" id="quicksearchbox" />
-<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
-<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+<!-- toolbar -->
+<div id="addressbooktoolbar" class="toolbar">
+	<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" />
+	<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" />
+	<span class="spacer"></span>
+	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+	<roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
+	<roundcube:container name="toolbar" id="addressbooktoolbar" />
 </div>
 
+<div id="addressview-left">
+
 <!-- sources/groups list -->
 <div id="directorylistbox" class="uibox listbox">
 <h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2>
@@ -34,13 +37,11 @@
 
 <div id="addressview-right">
 
-<!-- toolbar -->
-<div id="addressbooktoolbar" class="toolbar">
-	<roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
-	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
-	<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" />
-	<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" />
-	<roundcube:container name="toolbar" id="addressbooktoolbar" />
+<!-- search box -->
+<div id="quicksearchbar">
+<roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
+<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
 </div>
 
 <!-- contacts list -->
@@ -63,7 +64,9 @@
 
 
 <div id="contacts-box" class="uibox">
-	<roundcube:object name="addressframe" id="contact-frame" style="width:100%; height:96%" frameborder="0" src="/watermark.html" />
+	<div class="iframebox">
+		<roundcube:object name="addressframe" id="contact-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
 	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 93e9703a4..ff0c833c6 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -7,8 +7,9 @@
 <link rel="stylesheet" type="text/css" href="/googiespell.css" />
 <roundcube:endif />
 </head>
-<body class="noscroll">
+<body>
 
+<div class="minwidth">
 <roundcube:include file="/includes/header.html" />
 
 <div id="mainscreen">
@@ -170,6 +171,8 @@
 
 </div><!-- end mainscreen -->
 
+</div><!-- end minwidth -->
+
 <div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
 	<roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" />
 	<div class="formbuttons">
diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html
index 39d48440b..f84936635 100644
--- a/skins/larry/templates/contactedit.html
+++ b/skins/larry/templates/contactedit.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="iframe footerbuttons">
+<body class="iframe">
 
 <h1 class="boxtitle">
 	<roundcube:if condition="env:action=='add'" /><roundcube:label name="addcontact" />
@@ -19,6 +19,7 @@
 	<div id="contactphoto">
 		<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
 		<roundcube:if condition="env:photocol" />
+		<roundcube:object name="fileDropArea" id="contactpic" />
 		<div class="formlinks">
 			<roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="iconlink upload disabled" classAct="iconlink upload active" onclick="UI.show_uploadform();return false" condition="env:photocol" /><br/>
 			<roundcube:button command="delete-photo" type="link" label="delete" class="iconlink delete disabled" classAct="iconlink delete active" condition="env:photocol" />
@@ -35,7 +36,7 @@
 
 </form>
 
-<div class="footerbuttons formbuttons">
+<div class="footerleft formbuttons">
 	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 	<roundcube:button command="show" type="input" class="button" label="cancel" condition="env:action=='edit'" />
 	<roundcube:button name="cancel" type="input" class="button" label="cancel" onclick="history.back()" condition="env:action=='add'" />
diff --git a/skins/larry/templates/folderedit.html b/skins/larry/templates/folderedit.html
index cfc8bc3d4..18d246942 100644
--- a/skins/larry/templates/folderedit.html
+++ b/skins/larry/templates/folderedit.html
@@ -12,14 +12,12 @@
 <roundcube:object name="folderdetails" class="propform" />
 </div>
 
-<div id="formfooter">
 <div class="footerleft formbuttons">
 	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 	<roundcube:if condition="!strlen(request:_mbox)" />
 	<input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
 	<roundcube:endif />
 </div>
-</div>
 
 <roundcube:include file="/includes/footer.html" />
 
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index ab4e46ce1..988ff952c 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -28,7 +28,9 @@
 </div>
 
 <div id="folder-details" class="uibox contentbox">
-	<roundcube:object name="folderframe" id="preferences-frame" style="width:100%; height:96%" frameborder="0" src="/watermark.html" />
+	<div class="iframebox">
+		<roundcube:object name="folderframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
 	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
index 061088ea5..d9270b68a 100644
--- a/skins/larry/templates/identities.html
+++ b/skins/larry/templates/identities.html
@@ -25,7 +25,9 @@
 </div>
 
 <div id="identity-details" class="uibox contentbox">
-	<roundcube:object name="identityframe" id="preferences-frame" style="width:100%; height:96%" frameborder="0" src="/watermark.html" />
+	<div class="iframebox">
+		<roundcube:object name="identityframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
 	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
diff --git a/skins/larry/templates/identityedit.html b/skins/larry/templates/identityedit.html
index 3ef41319a..8d5e62290 100644
--- a/skins/larry/templates/identityedit.html
+++ b/skins/larry/templates/identityedit.html
@@ -12,11 +12,9 @@
 <roundcube:object name="identityform" class="propform" size="40" textareacols="40" textarearows="6" />
 </div>
 
-<div id="formfooter">
 <div class="footerleft formbuttons">
 	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </div>
-</div>
 
 <roundcube:include file="/includes/footer.html" />
 
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index c0ceb5c88..8aac930ed 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -24,7 +24,7 @@
 </div>
 
 <div id="bottomline">
-	Roundcube Webmail <roundcube:object name="version" />
+	<roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_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 />
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 183129a98..32c64d929 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -5,27 +5,29 @@
 <roundcube:include file="/includes/links.html" />
 <style type="text/css">
 <roundcube:if condition="config:preview_pane == true" />
-	#mailview-top { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-38 : 300" />px; }
-	#mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 320" />px; height: auto; }
+	#mailview-top { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-48 : 276" />px; }
+	#mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+6 : 330" />px; height: auto; }
 	#mailpreviewframe { display: block; }
 <roundcube:endif />
 </style>
 </head>
-<body class="noscroll">
+<body>
 
+<div class="minwidth">
 <roundcube:include file="/includes/header.html" />
 
 <div id="mainscreen">
 
-<div id="mailview-left">
-
-<!-- search box -->
-<div id="quicksearchbar">
-<roundcube:object name="searchform" id="quicksearchbox" />
-<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
-<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+<!-- toolbar -->
+<div id="messagetoolbar" class="toolbar">
+	<roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" />
+	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+	<span class="spacer"></span>
+	<roundcube:include file="/includes/mailtoolbar.html" />
 </div>
 
+<div id="mailview-left">
+
 <!-- folders list -->
 <div id="folderlist-header"></div>
 <div id="mailboxcontainer" class="uibox listbox">
@@ -44,20 +46,30 @@
 
 <div id="mailview-right">
 
+<div id="messagesearchtools">
+
 <!-- search filter -->
 <div id="searchfilter">
 	<roundcube:object name="searchfilter" class="searchfilter decorated" />
 </div>
 
-<!-- toolbar -->
-<div id="messagetoolbar">
-<roundcube:include file="/includes/mailtoolbar.html" />
+<!-- search box -->
+<div id="quicksearchbar">
+<roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
+<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
 </div>
 
-<div id="mailview-top">
+</div>
+
+<roundcube:if condition="config:preview_pane == true" />
+<div id="mailview-top" class="uibox">
+<roundcube:else />
+<div id="mailview-top" class="uibox fullheight">
+<roundcube:endif />
 
 <!-- messagelist -->
-<div id="messagelistcontainer" class="uibox boxlistcontent">
+<div id="messagelistcontainer" class="boxlistcontent">
 <roundcube:object name="messages"
 	id="messagelist"
 	class="records-table sortheader"
@@ -114,6 +126,8 @@
 
 </div><!-- end mainscreen -->
 
+<div><!-- end minwidth -->
+
 <div id="searchmenu" class="popupmenu">
 	<ul class="toolbarmenu">
 		<li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <roundcube:label name="subject" /></label></li>
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 2509662fe..1becd711a 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -10,8 +10,17 @@
 
 <div id="mainscreen">
 
+<!-- toolbar -->
+<div id="messagetoolbar" class="toolbar fullwidth">
+	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
+	<span class="spacer"></span>
+	<roundcube:include file="/includes/mailtoolbar.html" />
+	<div class="toolbarselect">
+		<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
+	</div>
+</div>
+
 <div id="mailview-left">
-<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist" folder_filter="mail" />
 
 <!-- folders list -->
 <div id="mailboxcontainer" class="uibox listbox">
@@ -24,11 +33,6 @@
 
 <div id="mailview-right">
 
-<!-- toolbar -->
-<div id="messagetoolbar" class="fullwidth">
-<roundcube:include file="/includes/mailtoolbar.html" />
-</div>
-
 <div id="mailview-top">
 <div id="messageheader" class="uibox">
 <h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2>
@@ -42,6 +46,7 @@
 	<roundcube:button command="nextmessage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextmessage" content="&amp;gt;" />
 </div>
 
+<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
 </div>
 
 <div id="messagecontent" class="uibox">
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index cd9c2349a..b53683ec1 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -9,7 +9,8 @@
 <div id="messagepreviewheader">
 <h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>
 
-<a href="#details" id="previewheaderstoggle" class="iconlink add"></a>
+<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span></a>
+<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
 
 <table class="headers-table" id="preview-shortheaders"><tbody><tr>
 <roundcube:if condition="env:mailbox == config:drafts_mbox || env:mailbox == config:sent_mbox">
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 88b6b96b2..427e0a4f5 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -21,8 +21,10 @@
 </div>
 
 <div id="preferences-box" class="uibox contentbox">
-<roundcube:object name="prefsframe" id="preferences-frame" style="width:100%; height:96%" frameborder="0" src="/watermark.html" />
-<roundcube:object name="message" id="message" class="statusbar" />
+	<div class="iframebox">
+		<roundcube:object name="prefsframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
+	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/settingsedit.html b/skins/larry/templates/settingsedit.html
index ada5b57ee..1a80f58e9 100644
--- a/skins/larry/templates/settingsedit.html
+++ b/skins/larry/templates/settingsedit.html
@@ -12,10 +12,8 @@
 <roundcube:object name="userprefs" form="form" class="propform" />
 </div>
 
-<div id="formfooter">
 <div class="footerleft formbuttons">
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
+	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </div>
 
 <roundcube:include file="/includes/footer.html" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 675f61bc3..780ce7a62 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -108,7 +108,7 @@ function rcube_mail_ui()
         $('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
 
         mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
-          orientation:'h', relative:true, start:310, min:150, size:0, offset:-22 });
+          orientation:'h', relative:true, start:310, min:150, size:12, offset:4 });
         if (previewframe)
           mailviewsplit.init();
 
@@ -170,23 +170,32 @@ function rcube_mail_ui()
         return;
       }
 
-      var title = $('option', this).first().text();
+      var select = $(this),
+        height = Math.max(select.height(), 26) - 2,
+        width = select.width() - 22,
+        title = $('option', this).first().text();
+
       if ($('option:selected', this).val() != '')
         title = $('option:selected', this).text();
 
-      var select = $(this)
-        .change(function(){
+      var overlay = $('<a class="menuselector"><span class="handle">' + title + '</span></a>')
+        .css('position', 'absolute')
+        .offset(select.position())
+        .insertAfter(select);
+
+      overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px');
+
+      select.change(function() {
           var val = $('option:selected', this).text();
           $(this).next().children().html(val);
         });
 
-      $('<a class="menuselector dropdownselector"><span class="handle">' + title + '</span></a>')
-        .css('position', 'absolute')
-        .offset(select.position())
-        .insertAfter(select)
-        .children().width(select.outerWidth() - 40);
+      var parent = select.parent();
+      if (parent.css('position') != 'absolute')
+        parent.css('position', 'relative');
 
-      select.parent().css('position', 'relative');
+      // re-set original select width to fix click action and options width in some browsers
+      select.width(overlay.width());
     });
 
     $(document.body)
@@ -209,6 +218,7 @@ function rcube_mail_ui()
 
     // don't use $(window).resize() due to some unwanted side-effects
     window.onresize = resize;
+    resize();
   }
 
   /**
@@ -246,6 +256,20 @@ function rcube_mail_ui()
     if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
       layout_composeview();
     }
+
+    // make iframe footer buttons float if scrolling is active
+    $('body.iframe .footerleft').each(function(){
+      var footer = $(this),
+        body = $(document.body),
+        floating = footer.hasClass('floating'),
+        overflow = body.outerHeight(true) > $(window).height();
+      if (overflow != floating) {
+        var action = overflow ? 'addClass' : 'removeClass';
+        footer[action]('floating');
+        body[action]('floatingbuttons');
+      }
+    })
+
   }
 
   /**
@@ -254,7 +278,7 @@ function rcube_mail_ui()
   function message_displayed(p)
   {
     // show a popup dialog on errors
-    if (p.type == 'error') {
+    if (p.type == 'error' && rcmail.env.task != 'login') {
       if (!me.messagedialog) {
         me.messagedialog = $('<div>').addClass('popupdialog');
       }
@@ -305,8 +329,7 @@ function rcube_mail_ui()
 
   function resize_leftcol(splitter)
   {
-    if (splitter)
-      $('#quicksearchbar input').css('width', (splitter.pos - 70) + 'px');
+    // STUB
   }
 
 
@@ -334,7 +357,13 @@ function rcube_mail_ui()
 
   function update_quota(p)
   {
-    var y = p.total ? Math.ceil(p.percent / 100 * 20) * 24 : 0;
+    var step = 24, step_count = 20,
+      y = p.total ? Math.ceil(p.percent / 100 * step_count) * step : 0;
+
+    // never show full-circle if quota is close to 100% but below.
+    if (p.total && y == step * step_count && p.percent < 100)
+      y -= step;
+
     $('#quotadisplay').css('background-position', '0 -'+y+'px');
   }
 
@@ -435,7 +464,7 @@ function rcube_mail_ui()
     button.removeClass().addClass(visible ? 'enabled' : 'closed');
 
     if (visible) {
-      $('#mailview-top').css({ bottom:'auto' });
+      $('#mailview-top').removeClass('fullheight').css({ bottom:'auto' });
       $('#mailview-bottom').css({ height:'auto' });
 
       rcmail.env.contentframe = 'messagecontframe';
@@ -454,7 +483,7 @@ function rcube_mail_ui()
       rcmail.env.contentframe = null;
       rcmail.show_contentframe(false);
 
-      $('#mailview-top').css({ height:'auto', bottom:'28px' });
+      $('#mailview-top').addClass('fullheight').css({ height:'auto', bottom:'28px' });
       $('#mailview-bottom').css({ top:'auto', height:'26px' });
 
       if (mailviewsplit.handle)