diff --git a/app/controllers/dmails_controller.rb b/app/controllers/dmails_controller.rb
index 3b7c478eb..b58d65b26 100644
--- a/app/controllers/dmails_controller.rb
+++ b/app/controllers/dmails_controller.rb
@@ -17,8 +17,8 @@ class DmailsController < ApplicationController
     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])
+    @query = Dmail.visible.search(params[:search])
+    @dmails = @query.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit])
     respond_with(@dmails) do |format|
       format.xml do
         render :xml => @dmails.to_xml(:root => "dmails")
diff --git a/app/views/dmails/_quick_search.html.erb b/app/views/dmails/_quick_search.html.erb
new file mode 100644
index 000000000..8d74ab9eb
--- /dev/null
+++ b/app/views/dmails/_quick_search.html.erb
@@ -0,0 +1,3 @@
+<%= form_tag(dmails_path, :method => :get) do %>
+  <%= text_field "search", "message_matches", :id => "quick_search_message_matches", :placeholder => "Search messages" %>
+<% end %>
diff --git a/app/views/dmails/_secondary_links.html.erb b/app/views/dmails/_secondary_links.html.erb
index 7fee8dc2f..7b7206f31 100644
--- a/app/views/dmails/_secondary_links.html.erb
+++ b/app/views/dmails/_secondary_links.html.erb
@@ -1,5 +1,6 @@
 <% content_for(:secondary_links) do %>
   <menu>
+    <li><%= render "quick_search" %></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>