bug fixes - mail fixed