Bug 905530 - Add user dictionary support