more fixes for emails