Changing the behavior of quitting if a filter is applied?

[Tim Chase]

For some reason, the way my brain works, when I have a filter in
place

  l myfilter

my lizard-brain wants to use "q" instead of

  l .

to turn off the filter.  The lizard-brain wins over the conscious
brain (that knows to use `l .`) about half the time.

mutt is fast enough that accidentally quitting is easy to (mostly)
remedy by just hitting control+p to recall the previous invocation
and hitting enter.  However, that loses my command/folder/search/pipe
histories.

Is there a way to make "q" behave selectively, depending on whether
a filter is in place, clearing the filter if so, and doing the
normal ask-yes quit behavior otherwise?

Alternatively, if there's a way to preserve those histories over
mutt invocations, that would ease some of the pain.

Thanks!

-tkc