Improve mail UI until we have a proper state machine
Merge remote-tracking branch 'chiiph/bug/improve_mail_ui' into develop