diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index c2f7fb569d..aa03550701 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -1,11 +1,12 @@
 <%= error_messages_for 'message' %>
+<% replying ||= false %>
 
 <div class="box">
 <!--[form:message]-->
 <p><label><%= l(:field_subject) %></label><br />
 <%= f.text_field :subject, :required => true, :size => 120 %>
 
-<% if User.current.allowed_to?(:edit_messages, @project) %>
+<% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
     <label><%= f.check_box :sticky %> Sticky</label>
     <label><%= f.check_box :locked %> Locked</label>
 <% end %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index bb7e2b7f3f..7d4c9989e3 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -32,7 +32,7 @@
 <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
 <div id="reply" style="display:none;">
 <% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %>
-    <%= render :partial => 'form', :locals => {:f => f} %>
+    <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
     <%= submit_tag l(:button_submit) %>
 <% end %>
 </div>