am 07ce1624: Optimizing the email filter query.

Merge commit '07ce1624de652aa8494630a071b051a1670c4e3d' into eclair-mr2-plus-aosp

* commit '07ce1624de652aa8494630a071b051a1670c4e3d':
  Optimizing the email filter query.