Added Mail plugin ebanbling stuff