ROBE-214 mail refactor and async queue
Merge remote-tracking branch 'origin/master'