Display full attachment name using title attribute when name is too long to display (#1489320)

1 files changed, 3 insertions, 2 deletions

diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 59f4d55e1..9d85f9c8f 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -175,9 +175,9 @@ function rcmail_message_attachments($attrib)
         $ol .= html::tag('li', null, Q(sprintf("%s (%s)", $filename, $size)));
       }
       else {
-        if (mb_strlen($filename) > 50) {
+        if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
           $title    = $filename;
-          $filename = abbreviate_string($filename, 50);
+          $filename = abbreviate_string($filename, $attrib['maxlength']);
         }
         else {
           $title = '';
@@ -190,6 +190,7 @@ function rcmail_message_attachments($attrib)
             'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
             'onclick' => sprintf('return %s.command(\'load-attachment\',\'%s\',this)',
               JS_OBJECT_NAME, $attach_prop->mime_id),
+            'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)',
             'title' => Q($title),
             ), Q($filename));
         $ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);