Merge branch 'master' of github.com:roundcube/roundcubemail

4 files changed, 15 insertions, 3 deletions

diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 3a7fc1805..5561613db 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -767,9 +767,9 @@ class rcube_ldap extends rcube_addressbook
         }
 
         // use VLV pseudo-search for autocompletion
-        $rcmail = rcmail::get_instance();
+        $rcube = rcube::get_instance();
 
-        if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcmail->config->get('contactlist_fields')))
+        if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcube->config->get('contactlist_fields')))
         {
             // add general filter to query
             if (!empty($this->prop['filter']) && empty($this->filter))
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b2f81d73c..3d65eacb1 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1488,7 +1488,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
 function rcmail_wrap_and_quote($text, $length = 72)
 {
   // Rebuild the message body with a maximum of $max chars, while keeping quoted message.
-  $max = min(77, $length + 8);
+  $max = max(75, $length + 8);
   $lines = preg_split('/\r?\n/', trim($text));
   $out = '';
 
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 6e4e0cd7d..4fff24307 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -137,6 +137,10 @@ a.iconbutton.threadmode.selected {
 	background-position: 6px 2px;
 }
 
+#mailboxlist li:first-child {
+	border-radius: 4px 4px 0 0;
+}
+
 #mailboxlist li.mailbox a {
 	padding-left: 36px;
 	white-space: nowrap;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 1bdd30362..0a72c5048 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -824,6 +824,10 @@ table.layout td {
 	overflow: hidden;
 }
 
+.uibox .boxfooter {
+	border-radius: 0 0 4px 4px;
+}
+
 .boxfooter .listbutton {
 	display: inline-block;
 	text-decoration: none;
@@ -834,6 +838,10 @@ table.layout td {
 	margin-top: 1px;
 }
 
+.uibox .boxfooter .listbutton:first-child {
+	border-radius: 0 0 0 4px;
+}
+
 .boxfooter .listbutton .inner {
 	display: inline-block;
 	width: 48px;