Fix some email and keybinding issues