Android: Better Unread Searching

Fixes some of the obvious causes of #517.  Needs a bit more testing, since the bug happened rarely enough before these changes.