first try to update the inbox, several improvements