Fixed mailcatcher

Redone the pull request because the other one was quite messy

edit: okay, some other commits got added let me know if there is something you really dont want in there.

edit2: Today I learned you should create a branch for every feature you intend to add ;) So, if there is something here you don't want in your repo, tell me and I will split it into a separate branch.