Mail suspension - Wrong SQL queries
(cherry picked from commit 468b726)
(cherry picked from commit 1ec4194)