bugfixes on email shit