Fix some email bugs