make html parser correctly handle email addresses. Closes #122
make provider only deletable through users
merges conflict