emails bugfix