Fixed mailcatcher

Redone the pull request because the other one was quite messy