5 files changed, 52 insertions, 5 deletions
diff --git a/skins/classic/common.css b/skins/classic/common.css
index 702077596..5265c5aed 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -179,6 +179,13 @@ label span
   vertical-align: middle;
 }
 
+ul.proplist
+{
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
 
 /** common user interface objects */
 
@@ -1084,6 +1091,20 @@ div.searchbox > input
   width: 97%;
 }
 
+.formcontainer
+{
+  background-color: #f2f2f2;
+}
+
+.formcontent table {
+  width: 100%;
+}
+
+.formcontent input,
+.formcontent textarea {
+  width: 95%;
+}
+
 .listsearchbox
 {
   border-bottom: solid 1px #ddd;
@@ -1627,13 +1648,13 @@ table.quota-info td.root {
   padding: 2px;
 }
 
-.pgpkeyimport div.key input.button.importkey {
+.pgpkeyimport div.key button.importkey {
   position: absolute;
   top: 0.8em;
   right: 0.8em;
   padding: 2px 6px;
 }
 
-.pgpkeyimport div.key input.button[disabled] {
+.pgpkeyimport div.key button[disabled] {
   display: none;
 }
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 73f2744bb..51012fe36 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -1106,6 +1106,9 @@ function rcube_init_mail_ui()
       if (rcmail.env.action == 'folders') {
         rcmail_ui.folder_search_init($('#folder-manager'));
       }
+
+      $('#mainscreen > #prefs-title').detach().prependTo($('#mainscreen > .box'));
     }
   });
 }
+
diff --git a/skins/classic/settings.css b/skins/classic/settings.css
index 673e145eb..c6bdb15c2 100644
--- a/skins/classic/settings.css
+++ b/skins/classic/settings.css
@@ -140,6 +140,11 @@ body.iframe,
   width: 100%;
 }
 
+.footerleft
+{
+  padding-left: 10px;
+}
+
 #formfooter .footerleft
 {
   padding: 0 2px 10px;
diff --git a/skins/classic/templates/plugin.html b/skins/classic/templates/plugin.html
index cec701301..b9b6ebe85 100644
--- a/skins/classic/templates/plugin.html
+++ b/skins/classic/templates/plugin.html
@@ -16,8 +16,12 @@
 <div id="mainscreen">
 <roundcube:object name="plugin.body" />
 </div>
-  
+
 <roundcube:object name="plugin.footer" />
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index d1d1b0e45..8b6835e60 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1692,6 +1692,11 @@ ul.proplist li {
 	width: auto;
 }
 
+ul.proplist.simplelist li {
+	border: 0;
+	background: transparent;
+}
+
 #pluginbody {
 	position: absolute;
 	top: 0;
@@ -1700,6 +1705,15 @@ ul.proplist li {
 	bottom: 0;
 }
 
+.formcontent input,
+.formcontent textarea {
+	width: 95%;
+}
+
+.formcontent .hint {
+	font-style: italic;
+	margin-bottom: 1em;
+}
 
 /*** Login form ***/
 
@@ -3083,13 +3097,13 @@ button.mce-close,
 	padding: 0.3em;
 }
 
-.pgpkeyimport div.key input.button.importkey {
+.pgpkeyimport div.key button.importkey {
 	position: absolute;
 	top: 0.8em;
 	right: 0.8em;
 	padding: 4px 6px;
 }
 
-.pgpkeyimport div.key input.button[disabled] {
+.pgpkeyimport div.key button[disabled] {
 	display: none;
 }