diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index 8e2b061..e25277b 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -179,7 +179,7 @@ class ProfileController < PublicController
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
     @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
-    render :partial => 'leave_scrap'
+    render :partial => 'profile_activities_list'
   end
 
   def leave_comment_on_activity
@@ -192,7 +192,7 @@ class ProfileController < PublicController
     @tab_action = params[:tab_action]
     @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
     @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
-    render :partial => 'leave_comment_on_activity'
+    render :partial => 'profile_activities_list'
   end
 
   def view_more_scraps
diff --git a/app/views/profile/_profile_activity.rhtml b/app/views/profile/_profile_activity.rhtml
index 034ab32..bccdbd9 100644
--- a/app/views/profile/_profile_activity.rhtml
+++ b/app/views/profile/_profile_activity.rhtml
@@ -3,7 +3,7 @@
   <hr />
 
   <% if logged_in? && current_person.follows?(activity.user) %>
-    <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span>
+    <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('reply_content_#{activity.id}').focus();$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span>
   <% end %>
 
   <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
diff --git a/app/views/profile/_profile_comment_form.rhtml b/app/views/profile/_profile_comment_form.rhtml
index 1ee10b8..92c297b 100644
--- a/app/views/profile/_profile_comment_form.rhtml
+++ b/app/views/profile/_profile_comment_form.rhtml
@@ -1,7 +1,7 @@
 <div id='profile-wall-reply-<%= activity.id%>'>
   <div id='profile-wall-reply-form-<%= activity.id%>'>
     <p class='profile-wall-reply'>
-      <% form_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities' do %>
+      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities' do %>
         <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress'} %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
       <% end %>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index ae8e06b..4cb556a 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -10,8 +10,8 @@
     <p class='profile-wall-text'><%= txt2html scrap.content %></p>
     <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
     <div class='profile-wall-actions'>
-    <% if logged_in? && current_person.follows?(scrap.sender) && scrap.root.nil? %>
-      <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
     <% end %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
   <% end %>
@@ -34,17 +34,6 @@
     </div>
     <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
   </div>
-  <div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-wall-reply'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
-          <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}", :cols => 50, :rows => 2, :class => 'submit-with-keypress' } %>
-          <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>
-          <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
-  </div>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
   <hr />  
 </li>
--
libgit2 0.21.2