4 files changed, 32 insertions, 2 deletions
diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml
index fde1cdfa7..0b65024fd 100644
--- a/app/views/request/_describe_state.rhtml
+++ b/app/views/request/_describe_state.rhtml
@@ -97,7 +97,6 @@
 
         <p>
         <%= hidden_field_tag 'last_info_request_event_id', @last_info_request_event_id, :id => 'last_info_request_event_id' + id_suffix %>
-        <%= hidden_field_tag 'submitted_describe_state', 1, :id => 'submitted_describe_state' + id_suffix %>
         <%= submit_tag _("Submit status") %> (<%= _('and we\'ll suggest <strong>what to do next</strong>') %>)
         </p>
     <% end %>
diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml
index e274fe8c9..3a80823c6 100644
--- a/app/views/request/_other_describe_state.rhtml
+++ b/app/views/request/_other_describe_state.rhtml
@@ -75,7 +75,6 @@
 
     <p>
     <%= hidden_field_tag 'last_info_request_event_id', @last_info_request_event_id, :id => 'last_info_request_event_id' + id_suffix %>
-    <%= hidden_field_tag 'submitted_describe_state', 1, :id => 'submitted_describe_state' + id_suffix %>
     <%= submit_tag "Submit status" %>
     </p>
 <% end %>
diff --git a/app/views/request/describe_state_message.rhtml b/app/views/request/describe_state_message.rhtml
new file mode 100644
index 000000000..1427fea22
--- /dev/null
+++ b/app/views/request/describe_state_message.rhtml
@@ -0,0 +1,30 @@
+<h1><%= @title %></h1>
+
+
+<p>
+  <% if @described_state == "error_message" %>
+    <%= _("If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below.") %>
+  <% else %>
+    <%= _("Just one more thing") %>
+  <% end %>
+</p>
+
+<% form_for :incoming_message, :url => describe_state_url(:id => @info_request.id) do |f| %>
+
+    <p>
+        <label class="form_label" for="incoming_message_message">Please tell us more:</label>
+        <%= f.text_area :message, :rows => 10, :cols => 60 %>
+    </p>
+
+    <div>
+      <%= hidden_field_tag "incoming_message[described_state]", @described_state %>
+      <%= hidden_field_tag :last_info_request_event_id, @last_info_request_event_id %>
+    </div>
+
+    <div class="form_button">
+        <%= submit_tag _("Submit status and send message") %>
+    </div>
+
+<% end %>
+
+
diff --git a/app/views/request_mailer/requires_admin.rhtml b/app/views/request_mailer/requires_admin.rhtml
index e7ab53c59..b2e58295e 100644
--- a/app/views/request_mailer/requires_admin.rhtml
+++ b/app/views/request_mailer/requires_admin.rhtml
@@ -1,3 +1,5 @@
+<%= raw @message %>
+
 ---------------------------------------------------------------------
 <%= raw @reported_by.name %> <%= _('has reported an')%> <%= raw @info_request.law_used_short %>
 <%= _('response as needing administrator attention. Take a look, and reply to this