diff --git a/app/views/profile/_create_article.rhtml b/app/views/profile/_create_article.rhtml
index 08a47ba..d5bba14 100644
--- a/app/views/profile/_create_article.rhtml
+++ b/app/views/profile/_create_article.rhtml
@@ -2,11 +2,15 @@
   <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
 </div>
 <div class='profile-activity-description profile-activity-article-<%= activity.target.class.icon_name %>'>
-  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %></p>
+  <p class='profile-activity-text'>
+    <%= link_to activity.user.short_name(20), activity.user.url %>
+    <%= _("on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url) if activity.target.profile.is_a?(Community) %>
+  </p>
   <div class='profile-activity-lead'>
-  <b><%= link_to(activity.params['name'], activity.params['url']) %></b>
-  <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span><br />
-  <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(activity.params['lead']).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small></div>
+    <b><%= link_to(activity.params['name'], activity.params['url']) %></b>
+    <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span><br />
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(activity.params['lead']).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
+  </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
@@ -15,9 +19,4 @@
   </div>
 </div>
 
-<hr />
-<ul class="profile-wall-activities-comments comments-count-<%= activity.comments_count %>" >
-  <%= render :partial => 'comment', :collection => activity.comments %>
-</ul>
-
-<%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
+<%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
diff --git a/app/views/profile/_default_activity.rhtml b/app/views/profile/_default_activity.rhtml
index b0a8190..054d3a8 100644
--- a/app/views/profile/_default_activity.rhtml
+++ b/app/views/profile/_default_activity.rhtml
@@ -10,9 +10,4 @@
   </div>
 </div>
 
-<hr />
-<ul class="profile-wall-activities-comments comments-count-<%= activity.comments_count %>" >
-  <%= render :partial => 'comment', :collection => activity.comments %>
-</ul>
-
-<%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
+<%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index bb59872..45fe0cd 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -15,7 +15,14 @@
     <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
     </div>
   </div>
-  <ul class="profile-wall-activities-comments scrap-replies" style='width: auto;'>
+
+  <% 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;padding-left:0px; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
diff --git a/app/views/profile/_upload_image.rhtml b/app/views/profile/_upload_image.rhtml
index c65a1ae..9b98d9f 100644
--- a/app/views/profile/_upload_image.rhtml
+++ b/app/views/profile/_upload_image.rhtml
@@ -14,12 +14,7 @@
 <div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
 
 <% if activity.get_view_url.size == 1 %>
-  <hr />
-  <ul class="profile-wall-activities-comments comments-count-<%= activity.comments_count %>" >
-    <%= render :partial => 'comment', :collection => activity.comments %>
-  </ul>
-
-  <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
+  <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
 <% end %>
 
 <br/>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index c22fb07..a64a8e0 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -731,4 +731,11 @@ jQuery(function($){
        return false;
      }
    });
+
+  $('.view-all-comments').live('click', function(e) {
+     var link = this;
+     $(link).parent().find('.profile-wall-activities-comments').show();
+     $(link).hide();
+     return false;
+  });
 });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7cbdfee..5ea4718 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6577,7 +6577,7 @@ h1#agenda-title {
   background: #f0f0f1;
   border-bottom: 1px solid #d2d2d2;
   border-top: 1px solid #fff;
-  margin-left: 50px;
+  Xmargin-left: 50px;
   padding: 0 5px;
 }
 
@@ -6590,6 +6590,12 @@ h1#agenda-title {
   margin-right: 2px;
 }
 
+.view-all-comments {
+  clear: both;
+  margin-left: 50px;
+  padding-left: 20px;
+}
+
 /* Profile activity relative dimensions */
 
 #leave_scrap {
--
libgit2 0.21.2