#501 better mailbox updating and feedback and small fixes