Results sorted, mail state icons working
Merge remote-tracking branch 'origin/develop' into develop