am 45507c52: am 07ce1624: Optimizing the email filter query.

Merge commit '45507c520937b8bd0d819ba0f075ba8d09123032'

* commit '45507c520937b8bd0d819ba0f075ba8d09123032':
  Optimizing the email filter query.