FIXED-IN: 4.7.3 BUG: 261830 (cherry picked from commit b3843e9d) Conflicts: mailcommon/snippetsmanager.cpp