Email issues resolved