Email issues (3)

All sorts of email issues that are a easy fix :).