Merge branch '6113-undo-delete-mailbox' into 'develop'

Safe delete for mailboxes

Closes #6113

See merge request !1454
1 job for develop in 9 seconds (queued for 3 seconds)