Reverted to storing roster entries by e-mail closes #605