FIXED-IN: 4.8.1 BUG: 284685 (cherry picked from commit b55df6bf) Conflicts: calendarsupport/mailclient.cpp