Zarafa7 compat

Small changes which almost make this module working somehow with Zarafa 7 (no large testing done).