added messaging(email) support