4 files changed, 15 insertions, 5 deletions
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 08d1266f1..7408d49f1 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -305,7 +305,6 @@
   bottom: 0px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
-  overflow: hidden;
 }
 
 #messagecontframe
@@ -365,7 +364,6 @@
   bottom: 0;
   border: 1px solid #999;
   background-color: #F9F9F9;
-  overflow: hidden;
 }
 
 #mailboxlist
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index 985e62e86..e2164659c 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -151,10 +151,10 @@
     </tr><tr>
         <td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
         <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
-    </tr><tr>
+    </tr><roundcube:if condition="!config:no_save_sent_messages" /><tr>
         <td><label><roundcube:label name="savesentmessagein" />:</label></td>
         <td><roundcube:object name="storetarget" maxlength="30" /></td>
-    </tr>
+    </tr><roundcube:endif />
     </table>
 </div>
 
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 6d350d714..20a13f62f 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -421,12 +421,15 @@ a.iconbutton.threadmode.selected {
 	border-left: 0;
 }
 
-
 #messagelist tr td.size {
 	width: 60px;
 	text-align: right;
 }
 
+#messagelist thead tr td.size {
+	text-align: left;
+}
+
 #messagelist tr td.fromto,
 #messagelist tr td.from,
 #messagelist tr td.to,
@@ -1110,6 +1113,13 @@ div.message-part blockquote blockquote blockquote {
 	display: block;
 }
 
+#contacts-table td span.email {
+	display: inline;
+	color: #69939e;
+	font-style: italic;
+	margin-left: 0.5em;
+}
+
 #compose-contacts li a, #contacts-table td {
 	background: url(images/listicons.png) -100px 0 no-repeat;
 	overflow: hidden;
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 2612685a9..de3b5bfff 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -136,9 +136,11 @@
 	<span class="composeoption">
 		<label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
 	</span>
+	<roundcube:if condition="!config:no_save_sent_messages" />
 	<span class="composeoption">
 		<label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>
 	</span>
+	<roundcube:endif />
 	<roundcube:container name="composeoptions" id="composeoptions" />
 </div>