diff --git a/app/controllers/dmails_controller.rb b/app/controllers/dmails_controller.rb
index 6777b78de..3b7c478eb 100644
--- a/app/controllers/dmails_controller.rb
+++ b/app/controllers/dmails_controller.rb
@@ -14,7 +14,9 @@ class DmailsController < ApplicationController
   end
 
   def index
-    cookies.permanent[:dmail_folder] = params[:folder]
+    if params[:folder] && params[:set_default_folder]
+      cookies.permanent[:dmail_folder] = params[:folder]
+    end
     @search = Dmail.visible.search(params[:search])
     @dmails = @search.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit])
     respond_with(@dmails) do |format|
diff --git a/app/views/dmails/_secondary_links.html.erb b/app/views/dmails/_secondary_links.html.erb
index 2a46bc711..7fee8dc2f 100644
--- a/app/views/dmails/_secondary_links.html.erb
+++ b/app/views/dmails/_secondary_links.html.erb
@@ -1,8 +1,8 @@
 <% content_for(:secondary_links) do %>
   <menu>
-    <li><%= link_to "All", dmails_path(:search => {:owner_id => CurrentUser.id}, :folder => "all") %></li>
-    <li><%= link_to "Received", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received") %></li>
-    <li><%= link_to "Sent", dmails_path(:search => {:owner_id => CurrentUser.id, :from_id => CurrentUser.id}, :folder => "sent") %></li>
+    <li><%= link_to "All", dmails_path(:search => {:owner_id => CurrentUser.id}, :folder => "all", :set_default_folder => true) %></li>
+    <li><%= link_to "Received", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received", :set_default_folder => true) %></li>
+    <li><%= link_to "Sent", dmails_path(:search => {:owner_id => CurrentUser.id, :from_id => CurrentUser.id}, :folder => "sent", :set_default_folder => true) %></li>
     <li><%= link_to "New", new_dmail_path %></li>
     <li><%= link_to "Search", search_dmails_path %></li>
     <li><%= link_to "Mark all as read", {:controller => "dmails", :action => "mark_all_as_read"}, :method => :post, :remote => true %></li>