diff --git a/emacs/mu4e.texi b/emacs/mu4e.texi
index d6a36746..8f3d32ef 100644
--- a/emacs/mu4e.texi
+++ b/emacs/mu4e.texi
@@ -518,11 +518,13 @@ n,p          go to next, previous message
 y            select the message view (if it's visible)
 
 s            search
-S            edit last query
+e            edit last query
 /            narrow the search
 b            search bookmark
-B            edit bookmark, then search
+B            edit bookmark before search
 j            jump to maildir
+M-left       previous query
+M-right      next query
 
 a            execute some action on header
 
@@ -682,12 +684,14 @@ n,p          go to next, previous message
 y            select the headers view (if it's visible)
 
 s            search
-S            edit last query
+e            edit last query
 /            narrow the search
 b            search bookmark
-B            edit bookmark, then search
+B            edit bookmark before search
 j            jump to maildir
 
+M-left       previous query
+M-right      next query 
 
 a            execute some action on the message
 
@@ -905,6 +909,7 @@ number of matches, the limit remains.
 * Queries::
 * Bookmarks::
 * Maildir searches::
+* Other search functionality::
 @end menu
 
 @node Queries
@@ -1062,6 +1067,42 @@ shortcut @key{m}); so, for example, if you want to move a message the
 @t{/archive} folder, you can do so by typing @key{ma}.
 
 
+@node Other search functionality
+@section Other search functionality
+
+@subsection Navigating through search queries
+
+You can navigate through previous/next queries using
+@code{mu4e-headers-query-prev} and @code{mu4e-headers-query-next}, which are
+bound to @key{M-left} and @key{M-right}, just like the way you can navigate to
+previous and next pages in many webbrowsers. 
+
+The functions try to be smart as to not record duplicate queries. Also, the
+numbers of queries remembered has a fixed limit, so long-running @t{mu4e}
+won't use too much memory.
+
+If you want to forget previous/next queries, you can use
+@code{mu4e-headers-forget-queries}.
+
+@subsection Narrowing search results
+
+Sometimes, it is useful to narrow existing search results, i.e., add some
+clauses to the current query to match fewer messages.
+
+As an example of this, suppose you're looking at the some mailing list,
+perhaps by jumping to a maildir (@code{mu4e-headers-jump-to-maildir},
+@key{j}) or because you followed some bookmark
+(@code{mu4e-headers-search-bookmark}, @key{b}). Now, of the messages in that
+search, you want to narrow things down to only those messages that have
+attachments.
+
+Now, @code{mu4e-headers-search-narrow} (@key{/}) comes in handy. That function
+as for an extra search query; if you now specify @t{flag:attach} you get the
+subset of the headers matching that expression.
+
+Technically, narrowing the results of query @t{x} with expression @t{y}
+implies doing a search @t{(x) AND y}. 
+
 @node Actions
 @chapter Actions
 
@@ -1577,7 +1618,7 @@ select ('mark' in emacs-speak) the messages; the actions you then take (e.g.,
 @emph{all} selected messages. You can also use functions like
 @code{mu4e-headers-mark-thread} (@key{T}), @code{mu4e-headers-mark-subthread}
 (@key{t}) to mark whole threads at the same time, and
-@code{mu4e-headers-mark-matches} (@key{%}) to mark all messages matching a
+@code{mu4e-headers-mark-pattern} (@key{%}) to mark all messages matching a
 certain regular expression.
 @item @emph{How can I use @t{BBDB}?} Currently, there is no built-in for
 address management with @t{BBDB}; instead, we recommend @ref{Maintaining an
@@ -1851,7 +1892,6 @@ When we receive such a @t{pong} (in @file{mu4e-proc.el}), the lambda function
 we registered will be called, and it check the version we got from the
 @t{pong} with the version we expected, and raises an error, if they differ.
 
-
 @node Logging and debugging
 @appendix Logging and debugging
 
@@ -1873,11 +1913,9 @@ all the time. By default, the log only maintains the most recent 1200 lines.
 Note, @t{mu} itself keeps a log as well, you can find this it in
 @t{<MUHOME>/log/mu.log}, typically @t{~/.mu/log/mu.log}.
 
-
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
 @include fdl.texi
 
-
 @bye