mail and view fixes