diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb
index 115a489..216bef9 100644
--- a/app/models/link_list_block.rb
+++ b/app/models/link_list_block.rb
@@ -63,7 +63,7 @@ class LinkListBlock < Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
     )
   end
 
diff --git a/app/views/box_organizer/_link_list_block.rhtml b/app/views/box_organizer/_link_list_block.rhtml
index 20b06f0..d1e0251 100644
--- a/app/views/box_organizer/_link_list_block.rhtml
+++ b/app/views/box_organizer/_link_list_block.rhtml
@@ -1,18 +1,21 @@
 <strong><%= _('Links') %></strong>
-<div id='edit-link-list-block' style='width:450px'>
-<table id='links' class='noborder'>
-  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th><th><%= _('Target') %></th></tr>
+<div id='edit-link-list-block' style='width: 820px;'>
+<table id='links' class='noborder' style="width:auto;">
+  <tr>
+    <th><%= _('Icon') %></th>
+    <th><%= _('Name') %></th>
+    <th><%= _('Address') %></th>
+    <th><%= _('Title') %></th>
+    <th><%= _('Target') %></th>
+  </tr>
   <% for link in @block.links do %>
-    <tr>
-      <td>
-         <%= icon_selector(link['icon']) %>
-      </td>
-      <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
-      <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
-      <td>
-        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
-      </td>
-    </tr>
+  <tr>
+    <td><%= icon_selector(link['icon']) %></td>
+    <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
+    <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
+    <td><%= text_field_tag 'block[links][][title]', link[:title], :class => 'link-title' %></td>
+    <td><%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %></td>
+  </tr>
   <% end %>
 </table>
 </div>
@@ -22,8 +25,8 @@
       content_tag('td', icon_selector('ok')) +
       content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
       content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
-      content_tag('td', select_tag('block[links][][target]',
-options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
+      content_tag('td', text_field_tag('block[links][][title]', '', :class => 'link-title'), :class => 'cel-address' ) +
+      content_tag('td', select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS)))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6227f85..641341e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1832,6 +1832,7 @@ a.button.disabled, input.disabled {
 
 #edit-link-list-block table {
   width: 100%;
+  margin-bottom: 10px;
 }
 #edit-link-list-block table .cel-address {
   width: 220px;
diff --git a/test/unit/link_list_block_test.rb b/test/unit/link_list_block_test.rb
index a897f57..cbc52df 100644
--- a/test/unit/link_list_block_test.rb
+++ b/test/unit/link_list_block_test.rb
@@ -86,4 +86,9 @@ class LinkListBlockTest < ActiveSupport::TestCase
     assert_equivalent LinkListBlock::TARGET_OPTIONS.map {|t|t[1]}, ['_self', '_blank', '_new']
   end
 
+  should 'link with title' do
+    l = LinkListBlock.new
+    assert_match /title="mytitle"/, l.link_html({:name => 'mylink', :address => '/myaddress', :title => 'mytitle'})
+  end
+
 end
--
libgit2 0.21.2