Decoupled mail
Added category test
Some docs
Rename method