Add mail count and fix sound notifications