diff --git a/app/views/messages/_form.haml b/app/views/messages/_form.haml
index e32c879b0..bb6d05f4d 100644
--- a/app/views/messages/_form.haml
+++ b/app/views/messages/_form.haml
@@ -25,11 +25,11 @@
           = link_to @recipient, @recipient
           = render 'members/tiny', member: @recipient
         = f.hidden_field :recipient_id, value: @recipient.id
-        = f.text_field :subject, value: @subject, class: 'form-control', maxlength: 255
+        = f.text_field :subject, value: @subject, class: 'form-control', maxlength: 255, required: true
       - else
         TODO - add recipient field
 
-      = f.text_area :body, rows: 12, label: "Type your message here"
+      = f.text_area :body, rows: 12, label: "Type your message here", required: true
       %span.help-block= render partial: "shared/markdown_help"
     .card-footer
       = link_to 'cancel', conversations_path, class: 'btn'