diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index db3f245..057d0e4 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -108,17 +108,19 @@
   end
 
   def retry
-    if @message.queued_message
-      @message.queued_message.queue!
-      flash[:notice] = "This message will be retried shortly."
-    elsif @message.held?
-      @message.add_to_message_queue(:manual => true)
-      flash[:notice] = "This message has been released. Delivery will be attempted shortly."
-    elsif @server.mode == 'Development'
-      @message.add_to_message_queue(:manual => true)
-      flash[:notice] = "This message will be redelivered shortly."
+    if @message.raw_message?
+      if @message.queued_message
+        @message.queued_message.queue!
+        flash[:notice] = "This message will be retried shortly."
+      elsif @message.held?
+        @message.add_to_message_queue(:manual => true)
+        flash[:notice] = "This message has been released. Delivery will be attempted shortly."
+      else
+        @message.add_to_message_queue(:manual => true)
+        flash[:notice] = "This message will be redelivered shortly."
+      end
     else
-      flash[:alert] = "This message is no longer queued for sending."
+      flash[:alert] = "This message is no longer available."
     end
     redirect_to_with_json organization_server_message_path(organization, @server, @message.id)
   end
diff --git a/app/views/messages/_deliveries.html.haml b/app/views/messages/_deliveries.html.haml
index 12d4b26..cac94f3 100644
--- a/app/views/messages/_deliveries.html.haml
+++ b/app/views/messages/_deliveries.html.haml
@@ -19,6 +19,10 @@
     %li.deliveryList__item.deliveryList__item--header
       %p This server is in development mode so this message can be redelivered as if it had just been received.
       %p= link_to "Redeliver message", retry_organization_server_message_path(organization, @server, message.id), :class => "button button--small", :remote => true, :method => :post
+  - else
+    %li.deliveryList__item.deliveryList__item--header
+      %p This message can be redelivered as if it had just been received.
+      %p= link_to "Redeliver message", retry_organization_server_message_path(organization, @server, message.id), :class => "button button--small", :remote => true, :method => :post
 
   - if message.deliveries.empty?
     %li.deliveryList__item