diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 482837e..f7cd8e3 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -8,10 +8,10 @@
 
 <% unless replying %>
   <% if @message.safe_attribute? 'sticky' %>
-    <label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label>
+    <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %>
   <% end %>
   <% if @message.safe_attribute? 'locked' %>
-    <label><%= f.check_box :locked %><%= l(:label_board_locked) %></label>
+    <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %>
   <% end %>
 <% end %>
 </p>