mostly reverted to old inbox behavior