refactor restore-mbox label fixes and add Spam/Trash