FIXED-IN: 4.8.1 BUG: 133252 (cherry picked from commit 80987158) Conflicts: mailcommon/expirejob.cpp mailcommon/expirejob.h