Improve mail UI until we have a proper state machine