From: Tom Hughes <tom@compton.nu>
Date: Wed, 4 Dec 2019 16:08:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2451'
X-Git-Tag: live~3624
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6a68e7676d950661edf24e572ee6ba302b9b3cc4?hp=f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d

Merge remote-tracking branch 'upstream/pull/2451'
---

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 8ad5af9dd..ea4f5e40d 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -17,6 +17,8 @@
     <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %>
     <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %>
     <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %>
+    <%= link_to t(".back"), inbox_messages_path, :class => "button deemphasize" %>
+  </div>
 
 <% else %>
 
@@ -33,8 +35,7 @@
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>
+    <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
+  </div>
 
 <% end %>
-
-  <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
-  </div>