diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml
index 722387ac..3442bc80 100644
--- a/app/views/admin/events/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@@ -111,6 +111,10 @@
%td
%b Abstract
%td= markdown(@event.abstract)
+ %tr
+ %td
+ %b Submission Description
+ %td= markdown(@event.submission_text)
%tr
%td
%b Requirements
diff --git a/app/views/proposals/_proposal_form.html.haml b/app/views/proposals/_proposal_form.html.haml
index f385bdeb..e175df54 100644
--- a/app/views/proposals/_proposal_form.html.haml
+++ b/app/views/proposals/_proposal_form.html.haml
@@ -46,6 +46,20 @@
250
words.
+ = f.input :submission_text, input_html: { rows: 5, data: { provide: 'markdown' } },
+ hint: markdown_hint('[Tips to improve your presentations.](http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx)')
+
+ %p
+ You have used
+ %span#abstract-count #{@event.submission_word_count}
+ words. Submission descriptions must be between
+ %span#abstract-minimum-word-count
+ 0
+ and
+ %span#abstract-maximum-word-count
+ 250
+ words.
+
- if current_user.is_admin? or @program.cfp.enable_registrations?
= f.inputs 'Enable pre-registration' do
= f.input :require_registration, label: 'Require participants to register to your event'
diff --git a/app/views/proposals/new.html.haml b/app/views/proposals/new.html.haml
index b7fc22f5..eed58560 100644
--- a/app/views/proposals/new.html.haml
+++ b/app/views/proposals/new.html.haml
@@ -61,6 +61,22 @@
250
words.
+ = f.input :submission_text, input_html: { rows: 5, data: { provide: 'markdown' } },
+ hint: markdown_hint
+
+ %p
+ You have used
+ %span#abstract-count #{@event.submission_word_count}
+ words. Submission descriptions must be between
+ %span#abstract-minimum-word-count
+ 0
+ and
+ %span#abstract-maximum-word-count
+ 250
+ words.
+
+
+
- if @program.cfp.enable_registrations?
= f.input :require_registration, label: 'Require participants to register to your event'