diff --git a/app/views/shared/_stream.haml b/app/views/shared/_stream.haml
index 5595513c2..daed03bcb 100644
--- a/app/views/shared/_stream.haml
+++ b/app/views/shared/_stream.haml
@@ -6,6 +6,8 @@
 - if posts.length > 0
   - for post in posts
     = render 'shared/stream_element', :post => post, :all_aspects => @all_aspects, :commenting_disabled => defined?(@commenting_disabled)
+  %a.paginate
+    = t("more")
 
 - else
   = render 'aspects/no_posts_message', :post_count => posts.length
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 7a57510cf..3637a1cf4 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -28,6 +28,7 @@ en:
   new_notifications: "%{count} new notifications"
   no_new_notifications: "no new notifications"
   _home: "Home"
+  _more: "More"
   _comments: "Comments"
   next: 'next'
   previous: 'previous'
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 7d8cffb99..5a3534ee5 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -10,6 +10,18 @@ $(document).ready(function() {
     donetext: "no more.",
     loadingText: "",
     loadingImg: '/images/ajax-loader.gif'
+  }, function() {
+    $("a.paginate")
+      .detach()
+      .appendTo("#main_stream")
+      .css("display", "block");
+  });
+
+  $(window).unbind('.infscr');
+
+  $("a.paginate").live("click", function() {
+    $(this).css("display", "none");
+    $(document).trigger("retrieve.infscr");
   });
 });
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 11a730d22..75b7b87e9 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -626,9 +626,24 @@ ul.show_comments
       :margin
         :bottom 2em
 
+a.paginate
+  :border
+    :width 1px
+    :style solid
+    :color $blue
+  :display block
+  :margin
+    :top 10px
+  :padding 5px
+  :text-align center
+  :width 100%
+  :cursor pointer
+
+  &:hover
+    :border 1px solid #1C6D99
+
 .pagination
-  a
-    :padding 3px
+  :display none
 
 .stream_element
   .right