fixes for emails