Started implementation of mail support