Email updating

Fix #457