diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index c4eb18e..2463ae0 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -210,6 +210,48 @@ class ProfileController < PublicController
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
 
+  def more_comments
+    activity_id = params[:activity].to_i
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => activity_id, :user_id => @profile.id})
+    comments_count = activity.comments.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity], 
+        :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
+      
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity] 
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity], 
+          :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}  
+      end 
+    end
+  end
+
+  def more_replies
+    activity_id = params[:activity].to_i
+    activity = Scrap.find(:first, :conditions => {:id => activity_id, :receiver_id => @profile.id, :scrap_id => nil})
+    comments_count = activity.replies.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity], 
+        :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
+      
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity] 
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity], 
+          :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}  
+      end 
+    end
+  end
+
   def remove_scrap
     begin
       scrap = current_user.person.scraps(params[:scrap_id])
@@ -343,6 +385,7 @@ class ProfileController < PublicController
     end
   end
 
+
   protected
 
   def check_access_to_profile
@@ -393,4 +436,5 @@ class ProfileController < PublicController
   def relations_to_include
     [:image, :domains, :preferred_domain, :environment]
   end
+  
 end
diff --git a/app/views/profile/_more_comments.rhtml b/app/views/profile/_more_comments.rhtml
new file mode 100644
index 0000000..875c1e9
--- /dev/null
+++ b/app/views/profile/_more_comments.rhtml
@@ -0,0 +1,3 @@
+<div class='view-more-comments'>
+	<%= link_to_remote(_('More'), :url => { :profile => @profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (comment_page + 1)}) %>
+</div>
diff --git a/app/views/profile/_more_replies.rhtml b/app/views/profile/_more_replies.rhtml
new file mode 100644
index 0000000..800b608
--- /dev/null
+++ b/app/views/profile/_more_replies.rhtml
@@ -0,0 +1,3 @@
+<div class='view-more-replies'>
+	<%= link_to_remote(_('More'), :url => { :profile => @profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (comment_page + 1)}) %>
+</div>
diff --git a/app/views/profile/_profile_activities_list.rhtml b/app/views/profile/_profile_activities_list.rhtml
index 462cc1d..2f59ab8 100644
--- a/app/views/profile/_profile_activities_list.rhtml
+++ b/app/views/profile/_profile_activities_list.rhtml
@@ -4,7 +4,7 @@
     <% if activity.kind_of?(ActionTracker::Record) %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
-      <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+      <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
     <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/profile/_profile_comments.rhtml b/app/views/profile/_profile_comments.rhtml
index 40496c7..c4a4db1 100644
--- a/app/views/profile/_profile_comments.rhtml
+++ b/app/views/profile/_profile_comments.rhtml
@@ -1,13 +1,12 @@
 <hr />
 
-<% if activity.comments_count > 2 %>
+<ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments"  >
+</ul>
+<% if activity.comments_count > 0 %>
+<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
   <div class='view-all-comments icon-chat'>
-    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+	  <%= link_to_remote(_("View all %s comments") % activity.comments_count, :url => { :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)}) %>
   </div>
+</div>
 <% end %>
-
-<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
-  <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
-</ul>
-
 <%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index 670e33a..ef6231c 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -16,13 +16,7 @@
     </div>
   </div>
 
-  <% if scrap.replies.count > 2 %>
-    <div class='view-all-comments icon-chat'>
-      <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
-    </div>
-  <% end %>
-
-  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
diff --git a/app/views/profile/_profile_scraps.rhtml b/app/views/profile/_profile_scraps.rhtml
index e4630da..2f9564f 100644
--- a/app/views/profile/_profile_scraps.rhtml
+++ b/app/views/profile/_profile_scraps.rhtml
@@ -1 +1,32 @@
-NÃO DEVE APARECER
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <div class='profile-wall-actions'>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-activity-send-reply'>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+      </span>
+    <% end %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
+    </div>
+  </div>
+
+
+  <ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
+  </ul>
+
+  <% if scrap.replies.count > 0 %>
+	<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
+    	<div class='view-all-comments icon-chat'>
+		  <%= link_to_remote(_("View all %s comments") % scrap.replies.count, :url => { :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)}) %>
+    	</div>
+	</div>
+  <% end %>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
+  <hr />  
+</li>
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 07d075b..c76c29c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5681,6 +5681,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   padding-left: 20px;
 }
 
+.view-more-comments, .view-more-replies {
+  border-bottom: 1px solid #d2d2d2 !important;
+  border-top: 1px solid #fff;
+  margin-bottom: 0;
+  text-align: center;
+}
+
 /* Profile activity relative dimensions */
 
 #leave_scrap {
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 5178911..21e262a 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -1170,6 +1170,58 @@ class ProfileControllerTest < ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
 
+  should "not index display activities comments" do
+    login_as(profile.identifier)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software')
+    ActionTracker::Record.destroy_all
+    activity = ActionTracker::Record.create!(:user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})
+    20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
+    article.reload
+    get :index, :profile => profile.identifier
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments'}, :children => {:count => 0 } 
+  end
+
+  should "view more comments paginated" do
+    login_as(profile.identifier)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software')
+    ActionTracker::Record.destroy_all
+    activity = ActionTracker::Record.create!(:user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})
+    20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
+    article.reload
+    assert_equal 20, article.comments.count
+    get :more_comments, :activity => activity.id, :comment_page => 2
+    assert_response :success
+    assert_template '_comment'
+    assert_select_rjs :insert_html do
+      assert_select 'li', 5 # 5 comments per page
+    end
+  end
+
+  should "not index display scraps replies" do
+    login_as(profile.identifier)
+    Scrap.destroy_all
+    scrap = fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id)
+    20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
+    profile.reload
+    get :index, :profile => profile.identifier
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments scrap-replies'}, :children => {:count => 0 } 
+  end
+
+  should "view more replies paginated" do
+    login_as(profile.identifier)
+    Scrap.destroy_all
+    scrap = fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id)
+    20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
+    profile.reload
+    assert_equal 20, scrap.replies.count
+    get :more_replies, :activity => scrap.id, :comment_page => 2
+    assert_response :success
+    assert_template '_profile_scrap'
+    assert_select_rjs :insert_html do
+      assert_select 'li', 5 # 5 replies per page
+    end
+  end
+
   should 'render empty response for not logged in users in check_membership' do
     get :check_membership
     assert_equal '', @response.body
diff --git a/vendor/plugins/action_tracker_has_comments/init.rb b/vendor/plugins/action_tracker_has_comments/init.rb
index 07985db..b325f1a 100644
--- a/vendor/plugins/action_tracker_has_comments/init.rb
+++ b/vendor/plugins/action_tracker_has_comments/init.rb
@@ -3,22 +3,13 @@
 Rails.configuration.to_prepare do
   ActionTracker::Record.module_eval do
 
-    has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :finder_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC', :counter_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments}'
+    has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, 
+      :finder_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC', 
+      :counter_sql => 'SELECT COUNT(*) FROM comments WHERE #{conditions_for_comments}'
 
     def conditions_for_comments
       type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
-      "source_type = '#{type}' AND source_id = '#{id}'"
-    end
-
-    def comments_as_thread
-      result = {}
-      root = []
-      self.comments.each do |c|
-        c.replies = []
-        result[c.id] ||= c
-        c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c
-      end
-      root
+      "source_type = '#{type}' AND source_id = '#{id}' AND reply_of_id IS NULL"
     end
 
   end
--
libgit2 0.21.2