Move destroy link out the way slightly.

2 files changed, 10 insertions, 9 deletions

diff --git a/app/views/admin_request/_incoming_message_actions.rhtml b/app/views/admin_request/_incoming_message_actions.rhtml
index 790a25db6..e31b4e97a 100644
--- a/app/views/admin_request/_incoming_message_actions.rhtml
+++ b/app/views/admin_request/_incoming_message_actions.rhtml
@@ -1,10 +1,3 @@
-<% form_tag '../destroy_incoming' do %>
-  <div>
-      <%= hidden_field_tag 'incoming_message_id', incoming_message.id %>
-      <%= submit_tag "Destroy message" %>
-  </div>
-<% end %>
-
 <% form_tag '../redeliver_incoming' do %>
   <div>
       id or url_title of request:
@@ -13,7 +6,17 @@
       <%= submit_tag "Redeliver to another request" %>
   </div>
 <% end %>
+
 <p>
 <%= link_to 'FOI officer upload URL', '../generate_upload_url/' + incoming_message.info_request.id.to_s + "?incoming_message_id=" + incoming_message.id.to_s %>
 </p>
 
+<% form_tag '../destroy_incoming' do %>
+  <div>
+      <%= hidden_field_tag 'incoming_message_id', incoming_message.id %>
+      Warning, this is permanent! ---&gt; 
+      <%= submit_tag "Destroy message" %>
+  </div>
+<% end %>
+
+
diff --git a/todo.txt b/todo.txt
index f7b632eec..1bcffea89 100644
--- a/todo.txt
+++ b/todo.txt
@@ -16,8 +16,6 @@ Performance:
 
 Upload Julian's large Cambridgeshire contract
 
-Move "view raw email" further away from destroy message
-
 
 Internal review status/marker?
     Quote section 38 as per Julian's request