fixed issue with comments and mail