Clean source code of Mail module