Merge change 24849 into eclair

* changes:
  Improve the checkMailbox loop query to get only the appropriate boxes