diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index bca725ed..23a335ad 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -198,6 +198,8 @@ class calendar_ui
 
       $html_id = html_identifier($id);
       $class = 'cal-'  . asciiwords($id, true);
+      $listname = html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET);
+      $title = strlen($listname) > 25 ? $listname : '';
 
       if ($prop['readonly'])
         $class .= ' readonly';
@@ -207,7 +209,7 @@ class calendar_ui
       $li .= html::tag('li', array('id' => 'rcmlical' . $html_id, 'class' => $class),
         html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active']), '') .
         html::span('handle', ' ') .
-        html::span('calname', $prop['name']));
+        html::span(array('class' => 'calname', 'title' => $title), $prop['name']));
     }
 
     $this->rc->output->set_env('calendars', $jsenv);
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 7df8bcc3..66a7ab06 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -104,6 +104,8 @@ class tasklist_ui
 
             $html_id = html_identifier($id);
             $class = 'tasks-'  . asciiwords($id, true);
+            $listname = html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET);
+            $title = strlen($listname) > 25 ? $listname : '';
 
             if (!$prop['editable'])
                 $class .= ' readonly';
@@ -113,7 +115,7 @@ class tasklist_ui
             $li .= html::tag('li', array('id' => 'rcmlitasklist' . $html_id, 'class' => $class),
                 html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'])) .
                 html::span('handle', ' ') .
-                html::span('listname', $prop['name']));
+                html::span(array('class' => 'listname', 'title' => $title), $prop['name']));
         }
 
         $this->rc->output->set_env('tasklists', $jsenv);