diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 0fb5107ce..fb3517609 100644
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -3,7 +3,14 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= t ".my_inbox" %>/<%= link_to t(".outbox"), outbox_messages_path %></h2>
+  <ul class="nav nav-pills">
+    <li class="nav-item">
+      <a class="nav-link active"><%= t ".my_inbox" %></a>
+    </li>
+    <li class="nav-item">
+      <%= link_to t(".my_outbox"), outbox_messages_path, class: "nav-link" %>
+    </li>
+  </ul>
 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index 5ae9706b7..e61f85875 100644
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -3,7 +3,14 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= t(".my_inbox_html", :inbox_link => link_to(t(".inbox"), inbox_messages_path)) %>/<%= t ".outbox" %></h2>
+  <ul class="nav nav-pills">
+    <li class="nav-item">
+      <%= link_to t(".my_inbox"), inbox_messages_path, class: "nav-link" %>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link active"><%= t ".my_outbox" %></a>
+    </li>
+  </ul>
 <% end %>
 
 <h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>