new diag
Merge branch 'master' of github.com:tarekziade/toxmail