FIXED-IN: 4.8.2 BUG: 295868 (cherry picked from commit 536300b9) Conflicts: mailcommon/foldertreeview.cpp