Syntax correction
Optimize mail system