[qmf] Add new folder matches for "Trash"
Merge branch 'master' of https://github.com/nemomobile-packages/messagingframework