Lion Mail Searches Unreliable


Since moving to Lion a few months ago (MBP died and was given a replacement), I've noticed that Mail no longer has the option to manually select "Message", "From", "To" and "Subject": these appear as options as you type in a search query.

I use IMAP, so have been told that indexing isn't going to work correctly (fine, whatever - never was a problem before), but what I *am* finding a nuisance is that if I want to search a mail for a word or phrase in the message body itself, I often have to close and restart Mail if it has been open for a while before the "Message contains" option, otherwise I just get "People" and "Subject" appear.

Is there some way to overcome this or is that just the state of play with Lion Mail?