Fixes: #2058 cleanup the zarafa plugin