Email Count fix
Table name fix
Bug fix
Merge branch 'release-0-9-5-3' into release-0-9-6

* release-0-9-5-3:
  Bug fix
  Table name fix
  Email Count fix