emails bugfix, at last