added fixes for mail