diff --git a/program/js/app.js b/program/js/app.js
index ee028b933..adfa82549 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7489,7 +7489,7 @@ function rcube_webmail()
     }
 
     // set folder name
-    $('a:first', row).text(display_name);
+    $('a:first', row).text(display_name).removeAttr('title');
 
     // update subscription checkbox
     $('input[name="_subscribed[]"]:first', row).val(id)
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 0745e8af0..2a0f4d4da 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -978,3 +978,9 @@ html.touch {
         content: @fa-var-file-alt;
     }
 }
+
+#subscription-table {
+    li.mailbox a {
+        padding-right: 2.5rem;
+    }
+}
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 26c5633fc..df37ac132 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -333,6 +333,11 @@ function rcube_elastic_ui()
                 (new MutationObserver(callback)).observe(list, {childList: true, subtree: true});
             }
             callback();
+
+            // Add title with full folder name on hover
+            // TODO: This should be done in another way, so if an entry is
+            // added after page load it also works there.
+            $('li.mailbox > a').on('mouseover', function() { rcube_webmail.long_subject_title_ex(this); });
         });
 
         // Store default logo path if not already set