Fixes: #2204 mailbox update is back