diff --git a/app/views/dmails/_secondary_links.html.erb b/app/views/dmails/_secondary_links.html.erb
index d96471e51..9f5610f57 100644
--- a/app/views/dmails/_secondary_links.html.erb
+++ b/app/views/dmails/_secondary_links.html.erb
@@ -1,7 +1,7 @@
 <% content_for(:secondary_links) do %>
   <menu>
-    <li><%= link_to "Received", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :to_id_eq => CurrentUser.id}) %></li>
-    <li><%= link_to "Sent", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :from_id_eq => CurrentUser.id}) %></li>
+    <li><%= link_to "Received", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :to_id_eq => CurrentUser.id}, :folder => "received") %></li>
+    <li><%= link_to "Sent", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :from_id_eq => CurrentUser.id}, :folder => "sent") %></li>
     <li><%= link_to "New", new_dmail_path %></li>
     <li><%= link_to "Search", search_dmails_path %></li>
   </menu>
diff --git a/app/views/dmails/index.html.erb b/app/views/dmails/index.html.erb
index a53b5b03c..1232e7d5f 100644
--- a/app/views/dmails/index.html.erb
+++ b/app/views/dmails/index.html.erb
@@ -1,6 +1,12 @@
 <div id="c-dmails">
   <div id="a-index">
-    <h1>Messages</h1>
+    <% if params[:folder] == "sent" %>
+      <h1>Sent Messages</h1>
+    <% elsif params[:folder] == "received" %>
+      <h1>Received Messages</h1>
+    <% else %>
+      <h1>Messages</h1>
+    <% end %>
 
     <table class="striped" width="100%">
       <thead>