Fixes to mail app