- Make so addcontact icon doesn't jump alone to next line

git-svn-id: https://svn.roundcube.net/trunk@4505 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 10 insertions, 4 deletions

diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index fd00142d1..0ccc923d2 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -1261,7 +1261,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
     }
     else if (check_email($part['mailto'], false)) {
       if ($linked) {
-        $out .= html::a(array(
+        $address = html::a(array(
             'href' => 'mailto:'.$mailto,
             'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
             'title' => $mailto,
@@ -1270,12 +1270,12 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
         Q($name ? $name : $mailto));
       }
       else {
-        $out .= html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
+        $address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
           Q($name ? $name : $mailto));
       }
 
       if ($addicon && $got_writable_abook) {
-        $out .= ' ' . html::a(array(
+        $address = '<span>' . $address . html::a(array(
             'href' => "#add",
             'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)),
             'title' => rcube_label('addtoaddressbook'),
@@ -1283,8 +1283,9 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
           html::img(array(
             'src' => $CONFIG['skin_path'] . $addicon,
             'alt' => "Add contact",
-          )));
+          ))) . '</span>';
       }
+      $out .= $address;
     }
     else {
       if ($name)
diff --git a/roundcubemail/skins/default/mail.css b/roundcubemail/skins/default/mail.css
index 1eb82cb08..0ac7aa03a 100644
--- a/roundcubemail/skins/default/mail.css
+++ b/roundcubemail/skins/default/mail.css
@@ -1046,6 +1046,11 @@ table.headers-table tr td.subject
   font-weight: bold;
 }
 
+table.headers-table tr td.header span
+{
+  white-space: nowrap;
+}
+
 #attachment-list
 {
   margin: 0;