diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 916f460e1..b3b0e130e 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -6,17 +6,13 @@
 <p><label for="message_subject"><%= l(:field_subject) %></label><br />
 <%= f.text_field :subject, :size => 120, :id => "message_subject" %>
 
-<% unless replying %>
-  <% if @message.safe_attribute? 'sticky' %>
+<% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
     <label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label>
-  <% end %>
-  <% if @message.safe_attribute? 'locked' %>
     <label><%= f.check_box :locked %><%= l(:label_board_locked) %></label>
-  <% end %>
 <% end %>
 </p>
 
-<% if !replying && !@message.new_record? && @message.safe_attribute?('board_id') %>
+<% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %>
   <p><label><%= l(:label_board) %></label><br />
   <%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]} %></p>
 <% end %>