Rework mailcatcher to fix #7