fixes #8331 - provide some tools for filtering mail
(cherry picked from commit a08e66ff1192e00d6dd8eafccd5bf5cd0e4183f9)
fixes #8331 - provide some tools for filtering mail
(cherry picked from commit a08e66ff1192e00d6dd8eafccd5bf5cd0e4183f9)