more emailfixes