Mail: Fixes after API cahnges