Consolidate element deletion cleanup methods into single event handler
Fix adding submailboxes of a special mailbox