diff --git a/app/views/friends/invite.rhtml b/app/views/friends/invite.rhtml
index d37c166..1f7e265 100644
--- a/app/views/friends/invite.rhtml
+++ b/app/views/friends/invite.rhtml
@@ -61,13 +61,15 @@
         <%= link_to_function __('Check all'), "$$('input.friend_to_invite').each(function(checkbox) { checkbox.checked = true; });" %>
         <%= link_to_function __('Uncheck all'), "$$('input.friend_to_invite').each(function(checkbox) { checkbox.checked = false; });" %>
         <% friend_pos = 0 %>
-        <% @friends.each do |friend| %>
-          <% friend_pos += 1 %>
-          <p>
-            <%= hidden_field_tag("webmail_friends[]", friend.to_yaml)  %>
-            <%= check_box_tag("webmail_import_addresses[]", friend[2], (!@webmail_import_addresses || @webmail_import_addresses.include?(friend[2])), :id => "friends_to_invite_#{friend_pos}", :class => "friend_to_invite" ) %><label for="<%= "friends_to_invite_#{friend_pos}" %>"><%= "#{friend[0]} (#{friend[1]})" %></label>
-          </p>
-        <% end %>
+        <div id='friends-list'>
+          <% @friends.each do |friend| %>
+            <% friend_pos += 1 %>
+            <p>
+              <%= hidden_field_tag("webmail_friends[]", friend.to_yaml)  %>
+              <%= check_box_tag("webmail_import_addresses[]", friend[2], (!@webmail_import_addresses || @webmail_import_addresses.include?(friend[2])), :id => "friends_to_invite_#{friend_pos}", :class => "friend_to_invite" ) %><label for="<%= "friends_to_invite_#{friend_pos}" %>"><%= "#{friend[0]} (#{friend[1]})" %></label>
+            </p>
+          <% end %>
+        </div>
       </div>
     <% end -%>
 
diff --git a/public/stylesheets/controller_friends.css b/public/stylesheets/controller_friends.css
index 23f9918..9e90f16 100644
--- a/public/stylesheets/controller_friends.css
+++ b/public/stylesheets/controller_friends.css
@@ -11,3 +11,9 @@
   padding-top: 20px;
 }
 
+#friends-list {
+  overflow: auto;
+  height: 300px;
+  border: 1px solid #999;
+  margin: 5px 0px;
+}
--
libgit2 0.21.2