Changed query for contacts in email compose
Merge branch 'hotfix/0.2.22.1' into develop