Discard mailbox action done

This has required a nice refactoring for progress bar