From 71952048650d004ea8fa6f56b8adf44bac6f0538 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Oct 2017 19:28:13 +0100
Subject: [PATCH 1/2] Use input-group for default_font and default_font_size

---
 program/steps/settings/func.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 00eb08666..133345b16 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -936,8 +936,8 @@ function rcmail_user_prefs($current = null)
 
                 $blocks['main']['options']['default_font'] = array(
                     'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultfont'))),
-                    'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
-                        $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
+                    'content' => html::div('input-group', $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
+                        $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1)))
                 );
             }
 

From 6be122352db81ea6e47e9d59d7361c3089143086 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Oct 2017 19:35:00 +0100
Subject: [PATCH 2/2] Support short-legend-labels in contact search form

---
 program/steps/addressbook/search.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index ca02fe67f..9f7a5501b 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -256,7 +256,8 @@ function rcmail_contact_search_form($attrib)
 {
     global $RCMAIL, $CONTACT_COLTYPES;
 
-    $i_size = $attrib['size'] ?: 30;
+    $i_size       = $attrib['size'] ?: 30;
+    $short_labels = rcube_utils::get_boolean($attrib['short-legend-labels']);
 
     $form = array(
         'main' => array(
@@ -265,7 +266,7 @@ function rcmail_contact_search_form($attrib)
             ),
         ),
         'personal' => array(
-            'name'    => $RCMAIL->gettext('personalinfo'),
+            'name'    => $RCMAIL->gettext($short_labels ? 'personal' : 'personalinfo'),
             'content' => array(
             ),
         ),