Hidden unused roles in compose
Merge branch 'master' into development
Some improvements searching messages with attachments