recover the merge error

Back to the original __mail__.py written by ssriptkiddi