Conflicts: mailcommon/collectionpage/collectiongeneralpage.cpp mailcommon/kernel/mailkernel.cpp mailcommon/kernel/mailkernel.h pimcommon/util/imapresourcemanager.cpp