fixed map and mail dismissal stuff