Improve UX of mailboxes management