the mail queue modified
fix locate modified
fix locate modified new file
Merge pull request #6 from hmert/master

Modifications for style and some adds